@playwright/test 1.37.0-alpha-aug-4-2023 → 1.37.0-alpha-aug-5-2023

package/lib/cli.js

@@ -245,18 +245,15 @@ function restartWithExperimentalTsEsm(configFile) {
   if (nodeVersion < 16) return false;
   if (!configFile) return false;
   if (process.env.PW_DISABLE_TS_ESM) return false;
-  if (process.env.PW_TS_ESM_ON) {
-    // clear execArgv after restart, so that childProcess.fork in user code does not inherit our loader.
-    process.execArgv = (0, _util.execArgvWithoutExperimentalLoaderOptions)();
-    return false;
-  }
+  if (process.env.PW_TS_ESM_ON) return false;
   if (!(0, _util.fileIsModule)(configFile)) return false;
+  const NODE_OPTIONS = (process.env.NODE_OPTIONS || '') + (0, _util.experimentalLoaderOption)();
   const innerProcess = require('child_process').fork(require.resolve('./cli'), process.argv.slice(2), {
     env: {
       ...process.env,
+      NODE_OPTIONS,
       PW_TS_ESM_ON: '1'
-    },
-    execArgv: (0, _util.execArgvWithExperimentalLoaderOptions)()
+    }
   });
   innerProcess.on('close', code => {
     if (code !== 0 && code !== null) (0, _utils.gracefullyProcessExitDoNotHang)(code);

package/lib/common/process.js

@@ -43,9 +43,6 @@ sendMessageToParent({
 process.on('disconnect', gracefullyCloseAndExit);
 process.on('SIGINT', () => {});
 process.on('SIGTERM', () => {});
-
-// Clear execArgv immediately, so that the user-code does not inherit our loader.
-process.execArgv = (0, _util.execArgvWithoutExperimentalLoaderOptions)();
 let processRunner;
 let processName;
 const startingEnv = {

package/lib/isomorphic/stringInternPool.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StringInternPool = void 0;
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class StringInternPool {
+  constructor() {
+    this._stringCache = new Map();
+  }
+  internString(s) {
+    let result = this._stringCache.get(s);
+    if (!result) {
+      this._stringCache.set(s, s);
+      result = s;
+    }
+    return result;
+  }
+}
+exports.StringInternPool = StringInternPool;

package/lib/isomorphic/teleReceiver.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.baseFullConfig = exports.TeleTestCase = exports.TeleSuite = exports.TeleReporterReceiver = void 0;
 exports.parseRegexPatterns = parseRegexPatterns;
 exports.serializeRegexPatterns = serializeRegexPatterns;
+var _stringInternPool = require("./stringInternPool");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -34,6 +35,7 @@ class TeleReporterReceiver {
     this._reuseTestCases = void 0;
     this._reportConfig = void 0;
     this._config = void 0;
+    this._stringPool = new _stringInternPool.StringInternPool();
     this._rootSuite = new TeleSuite('', 'root');
     this._pathSeparator = pathSeparator;
     this._reporter = reporter;
@@ -129,7 +131,7 @@ class TeleReporterReceiver {
     testResult.retry = payload.retry;
     testResult.workerIndex = payload.workerIndex;
     testResult.parallelIndex = payload.parallelIndex;
-    testResult.startTime = new Date(payload.startTime);
+    testResult.setStartTimeNumber(payload.startTime);
     testResult.statusEx = 'running';
     (_this$_reporter$onTes = (_this$_reporter2 = this._reporter).onTestBegin) === null || _this$_reporter$onTes === void 0 ? void 0 : _this$_reporter$onTes.call(_this$_reporter2, test, testResult);
   }
@@ -147,25 +149,16 @@ class TeleReporterReceiver {
     result.error = (_result$errors = result.errors) === null || _result$errors === void 0 ? void 0 : _result$errors[0];
     result.attachments = this._parseAttachments(payload.attachments);
     (_this$_reporter$onTes2 = (_this$_reporter3 = this._reporter).onTestEnd) === null || _this$_reporter$onTes2 === void 0 ? void 0 : _this$_reporter$onTes2.call(_this$_reporter3, test, result);
+    // Free up the memory as won't see these step ids.
+    result.stepMap = new Map();
   }
   _onStepBegin(testId, resultId, payload) {
     var _this$_reporter$onSte, _this$_reporter4;
     const test = this._tests.get(testId);
     const result = test.resultsMap.get(resultId);
     const parentStep = payload.parentStepId ? result.stepMap.get(payload.parentStepId) : undefined;
-    const step = {
-      titlePath: () => {
-        const parentPath = (parentStep === null || parentStep === void 0 ? void 0 : parentStep.titlePath()) || [];
-        return [...parentPath, payload.title];
-      },
-      title: payload.title,
-      category: payload.category,
-      location: this._absoluteLocation(payload.location),
-      parent: parentStep,
-      startTime: new Date(payload.startTime),
-      duration: -1,
-      steps: []
-    };
+    const location = this._absoluteLocation(payload.location);
+    const step = new TeleTestStep(payload, parentStep, location);
     if (parentStep) parentStep.steps.push(step);else result.steps.push(step);
     result.stepMap.set(payload.id, step);
     (_this$_reporter$onSte = (_this$_reporter4 = this._reporter).onStepBegin) === null || _this$_reporter$onSte === void 0 ? void 0 : _this$_reporter$onSte.call(_this$_reporter4, test, result, step);
@@ -203,6 +196,8 @@ class TeleReporterReceiver {
   }
   _onExit() {
     var _this$_reporter$onExi, _this$_reporter10;
+    // Free up the memory from the string pool.
+    this._stringPool = new _stringInternPool.StringInternPool();
     return (_this$_reporter$onExi = (_this$_reporter10 = this._reporter).onExit) === null || _this$_reporter$onExi === void 0 ? void 0 : _this$_reporter$onExi.call(_this$_reporter10);
   }
   _parseConfig(config) {
@@ -288,7 +283,7 @@ class TeleReporterReceiver {
   }
   _absolutePath(relativePath) {
     if (!relativePath) return relativePath;
-    return this._rootDir + this._pathSeparator + relativePath;
+    return this._stringPool.internString(this._rootDir + this._pathSeparator + relativePath);
   }
 }
 exports.TeleReporterReceiver = TeleReporterReceiver;
@@ -368,27 +363,68 @@ class TeleTestCase {
     this.resultsMap.clear();
   }
   _createTestResult(id) {
-    const result = {
-      retry: this.results.length,
-      parallelIndex: -1,
-      workerIndex: -1,
-      duration: -1,
-      startTime: new Date(),
-      stdout: [],
-      stderr: [],
-      attachments: [],
-      status: 'skipped',
-      statusEx: 'scheduled',
-      steps: [],
-      errors: [],
-      stepMap: new Map()
-    };
+    const result = new TeleTestResult(this.results.length);
     this.results.push(result);
     this.resultsMap.set(id, result);
     return result;
   }
 }
 exports.TeleTestCase = TeleTestCase;
+class TeleTestStep {
+  constructor(payload, parentStep, location) {
+    this.title = void 0;
+    this.category = void 0;
+    this.location = void 0;
+    this.parent = void 0;
+    this.duration = -1;
+    this.steps = [];
+    this._startTime = 0;
+    this.title = payload.title;
+    this.category = payload.category;
+    this.location = location;
+    this.parent = parentStep;
+    this._startTime = payload.startTime;
+  }
+  titlePath() {
+    var _this$parent;
+    const parentPath = ((_this$parent = this.parent) === null || _this$parent === void 0 ? void 0 : _this$parent.titlePath()) || [];
+    return [...parentPath, this.title];
+  }
+  get startTime() {
+    return new Date(this._startTime);
+  }
+  set startTime(value) {
+    this._startTime = +value;
+  }
+}
+class TeleTestResult {
+  constructor(retry) {
+    this.retry = void 0;
+    this.parallelIndex = -1;
+    this.workerIndex = -1;
+    this.duration = -1;
+    this.stdout = [];
+    this.stderr = [];
+    this.attachments = [];
+    this.status = 'skipped';
+    this.steps = [];
+    this.errors = [];
+    this.error = void 0;
+    this.stepMap = new Map();
+    this.statusEx = 'scheduled';
+    this._startTime = 0;
+    this.retry = retry;
+  }
+  setStartTimeNumber(startTime) {
+    this._startTime = startTime;
+  }
+  get startTime() {
+    return new Date(this._startTime);
+  }
+  set startTime(value) {
+    this._startTime = +value;
+  }
+}
 const baseFullConfig = {
   forbidOnly: false,
   fullyParallel: false,

package/lib/plugins/webServerPlugin.js

@@ -8,6 +8,7 @@ var _path = _interopRequireDefault(require("path"));
 var _net = _interopRequireDefault(require("net"));
 var _utilsBundle = require("playwright-core/lib/utilsBundle");
 var _utils = require("playwright-core/lib/utils");
+var _util = require("../util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -32,7 +33,7 @@ const DEFAULT_ENVIRONMENT_VARIABLES = {
 const debugWebServer = (0, _utilsBundle.debug)('pw:webserver');
 class WebServerPlugin {
   constructor(options, checkPortOnly) {
-    this._isAvailable = void 0;
+    this._isAvailableCallback = void 0;
     this._killProcess = void 0;
     this._processExitedPromise = void 0;
     this._options = void 0;
@@ -45,7 +46,7 @@ class WebServerPlugin {
   async setup(config, configDir, reporter) {
     var _this$_reporter$onStd;
     this._reporter = reporter;
-    this._isAvailable = getIsAvailableFunction(this._options.url, this._checkPortOnly, !!this._options.ignoreHTTPSErrors, (_this$_reporter$onStd = this._reporter.onStdErr) === null || _this$_reporter$onStd === void 0 ? void 0 : _this$_reporter$onStd.bind(this._reporter));
+    this._isAvailableCallback = this._options.url ? getIsAvailableFunction(this._options.url, this._checkPortOnly, !!this._options.ignoreHTTPSErrors, (_this$_reporter$onStd = this._reporter.onStdErr) === null || _this$_reporter$onStd === void 0 ? void 0 : _this$_reporter$onStd.bind(this._reporter)) : undefined;
     this._options.cwd = this._options.cwd ? _path.default.resolve(configDir, this._options.cwd) : configDir;
     try {
       await this._startProcess();
@@ -60,14 +61,15 @@ class WebServerPlugin {
     await ((_this$_killProcess = this._killProcess) === null || _this$_killProcess === void 0 ? void 0 : _this$_killProcess.call(this));
   }
   async _startProcess() {
+    var _this$_isAvailableCal;
     let processExitedReject = error => {};
     this._processExitedPromise = new Promise((_, reject) => processExitedReject = reject);
-    const isAlreadyAvailable = await this._isAvailable();
+    const isAlreadyAvailable = await ((_this$_isAvailableCal = this._isAvailableCallback) === null || _this$_isAvailableCal === void 0 ? void 0 : _this$_isAvailableCal.call(this));
     if (isAlreadyAvailable) {
       var _this$_options$url;
       debugWebServer(`WebServer is already available`);
       if (this._options.reuseExistingServer) return;
-      const port = new URL(this._options.url);
+      const port = new URL(this._options.url).port;
       throw new Error(`${(_this$_options$url = this._options.url) !== null && _this$_options$url !== void 0 ? _this$_options$url : `http://localhost${port ? ':' + port : ''}`} is already used, make sure that nothing is running on the port/url or set reuseExistingServer:true in config.webServer.`);
     }
     debugWebServer(`Starting WebServer process ${this._options.command}...`);
@@ -78,6 +80,7 @@ class WebServerPlugin {
       command: this._options.command,
       env: {
         ...DEFAULT_ENVIRONMENT_VARIABLES,
+        ...(0, _util.envWithoutExperimentalLoaderOptions)(),
         ...this._options.env
       },
       cwd: this._options.cwd,
@@ -102,20 +105,21 @@ class WebServerPlugin {
     });
   }
   async _waitForProcess() {
+    if (!this._isAvailableCallback) {
+      this._processExitedPromise.catch(() => {});
+      return;
+    }
     debugWebServer(`Waiting for availability...`);
-    await this._waitForAvailability();
-    debugWebServer(`WebServer available`);
-  }
-  async _waitForAvailability() {
     const launchTimeout = this._options.timeout || 60 * 1000;
     const cancellationToken = {
       canceled: false
     };
     const {
       timedOut
-    } = await Promise.race([(0, _utils.raceAgainstDeadline)(() => waitFor(this._isAvailable, cancellationToken), (0, _utils.monotonicTime)() + launchTimeout), this._processExitedPromise]);
+    } = await Promise.race([(0, _utils.raceAgainstDeadline)(() => waitFor(this._isAvailableCallback, cancellationToken), (0, _utils.monotonicTime)() + launchTimeout), this._processExitedPromise]);
     cancellationToken.canceled = true;
     if (timedOut) throw new Error(`Timed out waiting ${launchTimeout}ms from config.webServer.`);
+    debugWebServer(`WebServer available`);
   }
 }
 exports.WebServerPlugin = WebServerPlugin;
@@ -186,11 +190,14 @@ const webServerPluginsForConfig = config => {
   const shouldSetBaseUrl = !!config.config.webServer;
   const webServerPlugins = [];
   for (const webServerConfig of config.webServers) {
-    if (!webServerConfig.port && !webServerConfig.url || webServerConfig.port && webServerConfig.url) throw new Error(`Exactly one of 'port' or 'url' is required in config.webServer.`);
-    const url = webServerConfig.url || `http://localhost:${webServerConfig.port}`;
+    if (webServerConfig.port && webServerConfig.url) throw new Error(`Either 'port' or 'url' should be specified in config.webServer.`);
+    let url;
+    if (webServerConfig.port || webServerConfig.url) {
+      url = webServerConfig.url || `http://localhost:${webServerConfig.port}`;
 
-    // We only set base url when only the port is given. That's a legacy mode we have regrets about.
-    if (shouldSetBaseUrl && !webServerConfig.url) process.env.PLAYWRIGHT_TEST_BASE_URL = url;
+      // We only set base url when only the port is given. That's a legacy mode we have regrets about.
+      if (shouldSetBaseUrl && !webServerConfig.url) process.env.PLAYWRIGHT_TEST_BASE_URL = url;
+    }
     webServerPlugins.push(new WebServerPlugin({
       ...webServerConfig,
       url

package/lib/reporters/merge.js

@@ -7,6 +7,7 @@ exports.createMergedReport = createMergedReport;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _teleReceiver = require("../isomorphic/teleReceiver");
+var _stringInternPool = require("../isomorphic/stringInternPool");
 var _reporters = require("../runner/reporters");
 var _multiplexer = require("./multiplexer");
 var _utils = require("playwright-core/lib/utils");
@@ -209,6 +210,7 @@ function printStatusToStdout(message) {
 class ProjectNamePatcher {
   constructor(_allTestIds, _projectNameSuffix) {
     this._testIds = new Set();
+    this._stringPool = new _stringInternPool.StringInternPool();
     this._allTestIds = _allTestIds;
     this._projectNameSuffix = _projectNameSuffix;
   }
@@ -266,6 +268,6 @@ class ProjectNamePatcher {
     // To avoid reporters being confused by clashing test ids, we automatically
     // make them unique and produce a separate test from each blob.
     while (this._allTestIds.has(testId)) testId = testId + '1';
-    return testId;
+    return this._stringPool.internString(testId);
   }
 }

package/lib/reporters/teleEmitter.js

@@ -203,7 +203,7 @@ class TeleReporterEmitter {
       retry: result.retry,
       workerIndex: result.workerIndex,
       parallelIndex: result.parallelIndex,
-      startTime: result.startTime.toISOString()
+      startTime: +result.startTime
     };
   }
   _serializeResultEnd(result) {
@@ -231,7 +231,7 @@ class TeleReporterEmitter {
       parentStepId: (_step$parent = step.parent) === null || _step$parent === void 0 ? void 0 : _step$parent[idSymbol],
       title: step.title,
       category: step.category,
-      startTime: step.startTime.toISOString(),
+      startTime: +step.startTime,
       location: this._relativeLocation(step.location)
     };
   }

package/lib/runner/processHost.js

@@ -7,7 +7,6 @@ exports.ProcessHost = void 0;
 var _child_process = _interopRequireDefault(require("child_process"));
 var _events = require("events");
 var _utilsBundle = require("playwright-core/lib/utilsBundle");
-var _util = require("../util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright Microsoft Corporation. All rights reserved.
@@ -50,10 +49,7 @@ class ProcessHost extends _events.EventEmitter {
         ...process.env,
         ...this._extraEnv
       },
-      stdio: inheritStdio ? ['ignore', 'inherit', 'inherit', 'ipc'] : ['ignore', 'ignore', process.env.PW_RUNNER_DEBUG ? 'inherit' : 'ignore', 'ipc'],
-      ...(process.env.PW_TS_ESM_ON ? {
-        execArgv: (0, _util.execArgvWithExperimentalLoaderOptions)()
-      } : {})
+      stdio: inheritStdio ? ['ignore', 'inherit', 'inherit', 'ipc'] : ['ignore', 'ignore', process.env.PW_RUNNER_DEBUG ? 'inherit' : 'ignore', 'ipc']
     });
     this.process.on('exit', (code, signal) => {
       this.didExit = true;

package/lib/util.js

@@ -10,10 +10,10 @@ exports.createFileMatcher = createFileMatcher;
 exports.createFileMatcherFromArguments = createFileMatcherFromArguments;
 exports.createTitleMatcher = createTitleMatcher;
 exports.debugTest = void 0;
+exports.envWithoutExperimentalLoaderOptions = envWithoutExperimentalLoaderOptions;
 exports.errorWithFile = errorWithFile;
-exports.execArgvWithExperimentalLoaderOptions = execArgvWithExperimentalLoaderOptions;
-exports.execArgvWithoutExperimentalLoaderOptions = execArgvWithoutExperimentalLoaderOptions;
 exports.expectTypes = expectTypes;
+exports.experimentalLoaderOption = experimentalLoaderOption;
 exports.fileIsModule = fileIsModule;
 exports.filterStackFile = filterStackFile;
 exports.filterStackTrace = filterStackTrace;
@@ -283,12 +283,16 @@ function folderIsModule(folder) {
   // Rely on `require` internal caching logic.
   return require(packageJsonPath).type === 'module';
 }
-const kExperimentalLoaderOptions = ['--no-warnings', `--experimental-loader=${_url.default.pathToFileURL(require.resolve('@playwright/test/lib/transform/esmLoader')).toString()}`];
-function execArgvWithExperimentalLoaderOptions() {
-  return [...process.execArgv, ...kExperimentalLoaderOptions];
+function experimentalLoaderOption() {
+  return ` --no-warnings --experimental-loader=${_url.default.pathToFileURL(require.resolve('@playwright/test/lib/transform/esmLoader')).toString()}`;
 }
-function execArgvWithoutExperimentalLoaderOptions() {
-  return process.execArgv.filter(arg => !kExperimentalLoaderOptions.includes(arg));
+function envWithoutExperimentalLoaderOptions() {
+  const substring = experimentalLoaderOption();
+  const result = {
+    ...process.env
+  };
+  if (result.NODE_OPTIONS) result.NODE_OPTIONS = result.NODE_OPTIONS.replace(substring, '').trim() || undefined;
+  return result;
 }
 
 // This follows the --moduleResolution=bundler strategy from tsc.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwright/test",
-  "version": "1.37.0-alpha-aug-4-2023",
+  "version": "1.37.0-alpha-aug-5-2023",
   "description": "A high-level API to automate web browsers",
   "repository": "github:Microsoft/playwright",
   "homepage": "https://playwright.dev",
@@ -41,7 +41,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@types/node": "*",
-    "playwright-core": "1.37.0-alpha-aug-4-2023"
+    "playwright-core": "1.37.0-alpha-aug-5-2023"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"

package/types/test.d.ts

@@ -6735,15 +6735,15 @@ interface TestConfigWebServer {
   command: string;
 
   /**
-   * The port that your http server is expected to appear on. It does wait until it accepts connections. Exactly one of
-   * `port` or `url` is required.
+   * The port that your http server is expected to appear on. It does wait until it accepts connections. Either `port`
+   * or `url` should be specified.
    */
   port?: number;
 
   /**
    * The url on your http server that is expected to return a 2xx, 3xx, 400, 401, 402, or 403 status code when the
    * server is ready to accept connections. Redirects (3xx status codes) are being followed and the new location is
-   * checked. Exactly one of `port` or `url` is required.
+   * checked. Either `port` or `url` should be specified.
    */
   url?: string;