@playwright/test 1.35.0-alpha-jun-2-2023 → 1.35.0-alpha-jun-4-2023

package/lib/common/config.js

@@ -10,6 +10,7 @@ var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _os = _interopRequireDefault(require("os"));
 var _util = require("../util");
+var _transform = require("../transform/transform");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright Microsoft Corporation. All rights reserved.
@@ -34,6 +35,7 @@ class FullConfigInternal {
     return config[configInternalSymbol];
   }
   constructor(configDir, configFile, config, configCLIOverrides) {
+    var _build, _config$build;
     this.config = void 0;
     this.globalOutputDir = void 0;
     this.configDir = void 0;
@@ -118,6 +120,10 @@ class FullConfigInternal {
     this.projects = projectConfigs.map(p => new FullProjectInternal(configDir, config, this, p, this.configCLIOverrides, throwawayArtifactsPath));
     resolveProjectDependencies(this.projects);
     this._assignUniqueProjectIds(this.projects);
+    (0, _transform.setTransformConfig)({
+      babelPlugins: ((_build = config.build) === null || _build === void 0 ? void 0 : _build.babelPlugins) || [],
+      external: ((_config$build = config.build) === null || _config$build === void 0 ? void 0 : _config$build.external) || []
+    });
     this.config.projects = this.projects.map(p => p.project);
   }
   _assignUniqueProjectIds(projects) {

package/lib/common/configLoader.js

@@ -45,12 +45,11 @@ class ConfigLoader {
     this._configCLIOverrides = configCLIOverrides || {};
   }
   static async deserialize(data) {
-    (0, _transform.setBabelPlugins)(data.babelTransformPlugins);
     (0, _compilationCache.addToCompilationCache)(data.compilationCache);
-    await (0, _esmLoaderHost.initializeEsmLoader)();
     const loader = new ConfigLoader(data.configCLIOverrides);
-    if (data.configFile) return await loader.loadConfigFile(data.configFile);
-    return await loader.loadEmptyConfig(data.configDir);
+    const config = data.configFile ? await loader.loadConfigFile(data.configFile) : await loader.loadEmptyConfig(data.configDir);
+    await (0, _esmLoaderHost.initializeEsmLoader)();
+    return config;
   }
   async loadConfigFile(file, ignoreProjectDependencies = false) {
     if (this._fullConfig) throw new Error('Cannot load two config files');

package/lib/common/esmLoaderHost.js

@@ -47,8 +47,8 @@ async function incorporateCompilationCache() {
 }
 async function initializeEsmLoader() {
   if (!loaderChannel) return;
-  await loaderChannel.send('setBabelPlugins', {
-    plugins: (0, _transform.getBabelPlugins)()
+  await loaderChannel.send('setTransformConfig', {
+    config: (0, _transform.transformConfig)()
   });
   await loaderChannel.send('addToCompilationCache', {
     cache: (0, _compilationCache.serializeCompilationCache)()

package/lib/common/ipc.js

@@ -22,14 +22,11 @@ var _compilationCache = require("../transform/compilationCache");
  */
 
 function serializeConfig(config) {
-  const babelTransformPlugins = [];
-  for (const plugin of config.plugins) babelTransformPlugins.push(...(plugin.babelPlugins || []));
   const result = {
     configFile: config.config.configFile,
     configDir: config.configDir,
     configCLIOverrides: config.configCLIOverrides,
-    compilationCache: (0, _compilationCache.serializeCompilationCache)(),
-    babelTransformPlugins
+    compilationCache: (0, _compilationCache.serializeCompilationCache)()
   };
   return result;
 }

package/lib/index.js

@@ -417,6 +417,7 @@ const playwrightFixtures = {
       ..._combinedContextOptions
     };
     playwright.request._defaultContextOptions.tracesDir = path.join(_artifactsDir(), 'traces');
+    playwright.request._defaultContextOptions.timeout = actionTimeout || 0;
     await use();
     playwright.request._defaultContextOptions = undefined;
     for (const browserType of [playwright.chromium, playwright.firefox, playwright.webkit]) {
@@ -778,6 +779,12 @@ class ArtifactsRecorder {
       await this._stopTracing(tracing, true);
     })));
 
+    // Either remove or attach temporary screenshots for contexts closed before
+    // collecting the test trace.
+    await Promise.all(this._temporaryScreenshots.map(async file => {
+      if (captureScreenshots) await fs.promises.rename(file, this._addScreenshotAttachment()).catch(() => {});else await fs.promises.unlink(file).catch(() => {});
+    }));
+
     // Collect test trace.
     if (this._preserveTrace()) {
       const events = this._testInfo._traceEvents;
@@ -793,8 +800,8 @@ class ArtifactsRecorder {
       }
     }
 
-    // Either remove or attach temporary traces and screenshots for contexts closed
-    // before the test has finished.
+    // Either remove or attach temporary traces for contexts closed before the
+    // test has finished.
     if (this._preserveTrace() && this._temporaryTraceFiles.length) {
       const tracePath = this._testInfo.outputPath(`trace.zip`);
       // This could be: beforeHooks, or beforeHooks + test, etc.
@@ -811,9 +818,6 @@ class ArtifactsRecorder {
         contentType: 'application/zip'
       });
     }
-    await Promise.all(this._temporaryScreenshots.map(async file => {
-      if (captureScreenshots) await fs.promises.rename(file, this._addScreenshotAttachment()).catch(() => {});else await fs.promises.unlink(file).catch(() => {});
-    }));
   }
   _addScreenshotAttachment() {
     const testFailed = this._testInfo.status !== this._testInfo.expectedStatus;

package/lib/runner/dispatcher.js

@@ -180,6 +180,7 @@ class Dispatcher {
       worker.removeListener('testEnd', onTestEnd);
       worker.removeListener('stepBegin', onStepBegin);
       worker.removeListener('stepEnd', onStepEnd);
+      worker.removeListener('attach', onAttach);
       worker.removeListener('done', onDone);
       worker.removeListener('exit', onExit);
       doneCallback();
@@ -220,12 +221,6 @@ class Dispatcher {
       result.duration = params.duration;
       result.errors = params.errors;
       result.error = result.errors[0];
-      result.attachments = params.attachments.map(a => ({
-        name: a.name,
-        path: a.path,
-        contentType: a.contentType,
-        body: a.body !== undefined ? Buffer.from(a.body, 'base64') : undefined
-      }));
       result.status = params.status;
       test.expectedStatus = params.expectedStatus;
       test.annotations = params.annotations;
@@ -288,6 +283,20 @@ class Dispatcher {
       this._reporter.onStepEnd(data.test, result, step);
     };
     worker.on('stepEnd', onStepEnd);
+    const onAttach = params => {
+      const data = this._testById.get(params.testId);
+      const {
+        result
+      } = data.resultByWorkerIndex.get(worker.workerIndex);
+      const attachment = {
+        name: params.name,
+        path: params.path,
+        contentType: params.contentType,
+        body: params.body !== undefined ? Buffer.from(params.body, 'base64') : undefined
+      };
+      result.attachments.push(attachment);
+    };
+    worker.on('attach', onAttach);
     const onDone = params => {
       this._queuedOrRunningHashCount.set(worker.hash(), this._queuedOrRunningHashCount.get(worker.hash()) - 1);
       let remaining = [...remainingByTestId.values()];

package/lib/runner/loaderHost.js

@@ -10,7 +10,6 @@ var _test = require("../common/test");
 var _testLoader = require("../common/testLoader");
 var _poolBuilder = require("../common/poolBuilder");
 var _compilationCache = require("../transform/compilationCache");
-var _transform = require("../transform/transform");
 var _esmLoaderHost = require("../common/esmLoaderHost");
 /**
  * Copyright Microsoft Corporation. All rights reserved.
@@ -36,9 +35,6 @@ class InProcessLoaderHost {
     this._poolBuilder = _poolBuilder.PoolBuilder.createForLoader();
   }
   async start() {
-    const babelTransformPlugins = [];
-    for (const plugin of this._config.plugins) babelTransformPlugins.push(...(plugin.babelPlugins || []));
-    (0, _transform.setBabelPlugins)(babelTransformPlugins);
     await (0, _esmLoaderHost.initializeEsmLoader)();
   }
   async loadTestFile(file, testErrors) {

package/lib/runner/tasks.js

@@ -115,13 +115,12 @@ function createPluginSetupTask(plugin) {
     config,
     reporter
   }) => {
-    var _plugin$instance, _plugin$instance$setu, _plugin$instance2, _plugin$instance2$bab;
+    var _plugin$instance, _plugin$instance$setu;
     if (typeof plugin.factory === 'function') plugin.instance = await plugin.factory();else plugin.instance = plugin.factory;
     await ((_plugin$instance = plugin.instance) === null || _plugin$instance === void 0 ? void 0 : (_plugin$instance$setu = _plugin$instance.setup) === null || _plugin$instance$setu === void 0 ? void 0 : _plugin$instance$setu.call(_plugin$instance, config.config, config.configDir, reporter));
-    plugin.babelPlugins = (await ((_plugin$instance2 = plugin.instance) === null || _plugin$instance2 === void 0 ? void 0 : (_plugin$instance2$bab = _plugin$instance2.babelPlugins) === null || _plugin$instance2$bab === void 0 ? void 0 : _plugin$instance2$bab.call(_plugin$instance2))) || [];
     return () => {
-      var _plugin$instance3, _plugin$instance3$tea;
-      return (_plugin$instance3 = plugin.instance) === null || _plugin$instance3 === void 0 ? void 0 : (_plugin$instance3$tea = _plugin$instance3.teardown) === null || _plugin$instance3$tea === void 0 ? void 0 : _plugin$instance3$tea.call(_plugin$instance3);
+      var _plugin$instance2, _plugin$instance2$tea;
+      return (_plugin$instance2 = plugin.instance) === null || _plugin$instance2 === void 0 ? void 0 : (_plugin$instance2$tea = _plugin$instance2.teardown) === null || _plugin$instance2$tea === void 0 ? void 0 : _plugin$instance2$tea.call(_plugin$instance2);
     };
   };
 }
@@ -129,11 +128,11 @@ function createPluginBeginTask(plugin) {
   return async ({
     rootSuite
   }) => {
-    var _plugin$instance4, _plugin$instance4$beg;
-    await ((_plugin$instance4 = plugin.instance) === null || _plugin$instance4 === void 0 ? void 0 : (_plugin$instance4$beg = _plugin$instance4.begin) === null || _plugin$instance4$beg === void 0 ? void 0 : _plugin$instance4$beg.call(_plugin$instance4, rootSuite));
+    var _plugin$instance3, _plugin$instance3$beg;
+    await ((_plugin$instance3 = plugin.instance) === null || _plugin$instance3 === void 0 ? void 0 : (_plugin$instance3$beg = _plugin$instance3.begin) === null || _plugin$instance3$beg === void 0 ? void 0 : _plugin$instance3$beg.call(_plugin$instance3, rootSuite));
     return () => {
-      var _plugin$instance5, _plugin$instance5$end;
-      return (_plugin$instance5 = plugin.instance) === null || _plugin$instance5 === void 0 ? void 0 : (_plugin$instance5$end = _plugin$instance5.end) === null || _plugin$instance5$end === void 0 ? void 0 : _plugin$instance5$end.call(_plugin$instance5);
+      var _plugin$instance4, _plugin$instance4$end;
+      return (_plugin$instance4 = plugin.instance) === null || _plugin$instance4 === void 0 ? void 0 : (_plugin$instance4$end = _plugin$instance4.end) === null || _plugin$instance4$end === void 0 ? void 0 : _plugin$instance4$end.call(_plugin$instance4);
     };
   };
 }

package/lib/transform/esmLoader.js

@@ -48,7 +48,7 @@ async function load(moduleUrl, context, defaultLoad) {
   if (!moduleUrl.startsWith('file://')) return defaultLoad(moduleUrl, context, defaultLoad);
   const filename = _url.default.fileURLToPath(moduleUrl);
   // Bail for node_modules.
-  if ((0, _compilationCache.belongsToNodeModules)(filename)) return defaultLoad(moduleUrl, context, defaultLoad);
+  if (!(0, _transform.shouldTransform)(filename)) return defaultLoad(moduleUrl, context, defaultLoad);
   const code = _fs.default.readFileSync(filename, 'utf-8');
   const source = (0, _transform.transformHook)(code, filename, moduleUrl);
 
@@ -68,8 +68,8 @@ async function load(moduleUrl, context, defaultLoad) {
 let transport;
 function globalPreload(context) {
   transport = new _portTransport.PortTransport(context.port, async (method, params) => {
-    if (method === 'setBabelPlugins') {
-      (0, _transform.setBabelPlugins)(params.plugins);
+    if (method === 'setTransformConfig') {
+      (0, _transform.setTransformConfig)(params.config);
       return;
     }
     if (method === 'addToCompilationCache') {

package/lib/transform/transform.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getBabelPlugins = getBabelPlugins;
 exports.requireOrImport = requireOrImport;
 exports.resolveHook = resolveHook;
-exports.setBabelPlugins = setBabelPlugins;
+exports.setTransformConfig = setTransformConfig;
+exports.shouldTransform = shouldTransform;
+exports.transformConfig = transformConfig;
 exports.transformHook = transformHook;
 exports.wrapFunctionWithLocation = wrapFunctionWithLocation;
 var _crypto = _interopRequireDefault(require("crypto"));
@@ -36,12 +37,17 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const version = require('../../package.json').version;
 const cachedTSConfigs = new Map();
-let babelPlugins = [];
-function setBabelPlugins(plugins) {
-  babelPlugins = plugins;
+let _transformConfig = {
+  babelPlugins: [],
+  external: []
+};
+let _externalMatcher = () => false;
+function setTransformConfig(config) {
+  _transformConfig = config;
+  _externalMatcher = (0, _util.createFileMatcher)(_transformConfig.external);
 }
-function getBabelPlugins() {
-  return babelPlugins;
+function transformConfig() {
+  return _transformConfig;
 }
 function validateTsConfig(tsconfig) {
   if (!tsconfig.tsConfigPath || !tsconfig.baseUrl) return;
@@ -74,7 +80,7 @@ const pathSeparator = process.platform === 'win32' ? ';' : ':';
 const builtins = new Set(_module.default.builtinModules);
 function resolveHook(filename, specifier) {
   if (specifier.startsWith('node:') || builtins.has(specifier)) return;
-  if ((0, _compilationCache.belongsToNodeModules)(filename)) return;
+  if (!shouldTransform(filename)) return;
   if (isRelativeSpecifier(specifier)) return (0, _util.resolveImportSpecifierExtension)(_path.default.resolve(_path.default.dirname(filename), specifier));
   const isTypeScript = filename.endsWith('.ts') || filename.endsWith('.tsx');
   const tsconfig = loadAndValidateTsconfigForFile(filename);
@@ -124,10 +130,14 @@ function resolveHook(filename, specifier) {
     return (0, _util.resolveImportSpecifierExtension)(specifier);
   }
 }
+function shouldTransform(filename) {
+  if (_externalMatcher(filename)) return false;
+  return !(0, _compilationCache.belongsToNodeModules)(filename);
+}
 function transformHook(originalCode, filename, moduleUrl) {
   const isTypeScript = filename.endsWith('.ts') || filename.endsWith('.tsx') || filename.endsWith('.mts') || filename.endsWith('.cts');
   const hasPreprocessor = process.env.PW_TEST_SOURCE_TRANSFORM && process.env.PW_TEST_SOURCE_TRANSFORM_SCOPE && process.env.PW_TEST_SOURCE_TRANSFORM_SCOPE.split(pathSeparator).some(f => filename.startsWith(f));
-  const pluginsPrologue = babelPlugins;
+  const pluginsPrologue = _transformConfig.babelPlugins;
   const pluginsEpilogue = hasPreprocessor ? [[process.env.PW_TEST_SOURCE_TRANSFORM]] : [];
   const hash = calculateHash(originalCode, filename, !!moduleUrl, pluginsPrologue, pluginsEpilogue);
   const {
@@ -182,7 +192,7 @@ function installTransform() {
   }
   _module.default._resolveFilename = resolveFilename;
   const revertPirates = _utilsBundle.pirates.addHook((code, filename) => {
-    if ((0, _compilationCache.belongsToNodeModules)(filename)) return code;
+    if (!shouldTransform(filename)) return code;
     return transformHook(code, filename);
   }, {
     exts: ['.ts', '.tsx', '.js', '.jsx', '.mjs']

package/lib/worker/testInfo.js

@@ -42,9 +42,10 @@ class TestInfoImpl {
   set timeout(timeout) {
     // Ignored.
   }
-  constructor(configInternal, projectInternal, workerParams, test, retry, onStepBegin, onStepEnd) {
+  constructor(configInternal, projectInternal, workerParams, test, retry, onStepBegin, onStepEnd, onAttach) {
     this._onStepBegin = void 0;
     this._onStepEnd = void 0;
+    this._onAttach = void 0;
     this._test = void 0;
     this._timeoutManager = void 0;
     this._startTime = void 0;
@@ -84,10 +85,12 @@ class TestInfoImpl {
     this.outputDir = void 0;
     this.snapshotDir = void 0;
     this.errors = [];
+    this._attachmentsPush = void 0;
     this._test = test;
     this.testId = test.id;
     this._onStepBegin = onStepBegin;
     this._onStepEnd = onStepEnd;
+    this._onAttach = onAttach;
     this._startTime = (0, _utils.monotonicTime)();
     this._startWallTime = Date.now();
     this.repeatEachIndex = workerParams.repeatEachIndex;
@@ -120,6 +123,11 @@ class TestInfoImpl {
       const relativeTestFilePath = _path.default.relative(this.project.testDir, test._requireFile);
       return _path.default.join(this.project.snapshotDir, relativeTestFilePath + '-snapshots');
     })();
+    this._attachmentsPush = this.attachments.push.bind(this.attachments);
+    this.attachments.push = (...attachments) => {
+      for (const a of attachments) this._attach(a.name, a);
+      return this.attachments.length;
+    };
   }
   _modifier(type, modifierArgs) {
     if (typeof modifierArgs[1] === 'function') {
@@ -283,14 +291,28 @@ class TestInfoImpl {
   // ------------ TestInfo methods ------------
 
   async attach(name, options = {}) {
+    this._attach(name, await (0, _util.normalizeAndSaveAttachment)(this.outputPath(), name, options));
+  }
+  _attach(name, attachment) {
     const step = this._addStep({
       title: `attach "${name}"`,
       category: 'attach',
       wallTime: Date.now()
     });
-    this.attachments.push(await (0, _util.normalizeAndSaveAttachment)(this.outputPath(), name, options));
+    this._attachWithoutStep(attachment);
     step.complete({});
   }
+  _attachWithoutStep(attachment) {
+    var _attachment$body;
+    this._attachmentsPush(attachment);
+    this._onAttach({
+      testId: this._test.id,
+      name: attachment.name,
+      contentType: attachment.contentType,
+      path: attachment.path,
+      body: (_attachment$body = attachment.body) === null || _attachment$body === void 0 ? void 0 : _attachment$body.toString('base64')
+    });
+  }
   outputPath(...pathSegments) {
     _fs.default.mkdirSync(this.outputDir, {
       recursive: true
@@ -331,7 +353,7 @@ class TestInfoImpl {
 }
 exports.TestInfoImpl = TestInfoImpl;
 function serializeAttachments(attachments, initialAttachments) {
-  return attachments.filter(a => !initialAttachments.has(a)).map(a => {
+  return attachments.filter(a => a.name !== 'trace' && !initialAttachments.has(a)).map(a => {
     var _a$body;
     return {
       name: a.name,

package/lib/worker/workerMain.js

@@ -228,7 +228,7 @@ class WorkerMain extends _process.ProcessRunner {
     }
   }
   async _runTest(test, retry, nextTest) {
-    const testInfo = new _testInfo.TestInfoImpl(this._config, this._project, this._params, test, retry, stepBeginPayload => this.dispatchEvent('stepBegin', stepBeginPayload), stepEndPayload => this.dispatchEvent('stepEnd', stepEndPayload));
+    const testInfo = new _testInfo.TestInfoImpl(this._config, this._project, this._params, test, retry, stepBeginPayload => this.dispatchEvent('stepBegin', stepBeginPayload), stepEndPayload => this.dispatchEvent('stepEnd', stepEndPayload), attachment => this.dispatchEvent('attach', attachment));
     const processAnnotation = annotation => {
       testInfo.annotations.push(annotation);
       switch (annotation.type) {
@@ -595,16 +595,7 @@ function buildTestEndPayload(testInfo) {
     errors: testInfo.errors,
     expectedStatus: testInfo.expectedStatus,
     annotations: testInfo.annotations,
-    timeout: testInfo.timeout,
-    attachments: testInfo.attachments.map(a => {
-      var _a$body;
-      return {
-        name: a.name,
-        contentType: a.contentType,
-        path: a.path,
-        body: (_a$body = a.body) === null || _a$body === void 0 ? void 0 : _a$body.toString('base64')
-      };
-    })
+    timeout: testInfo.timeout
   };
 }
 function getSuites(test) {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@playwright/test",
-  "version": "1.35.0-alpha-jun-2-2023",
+  "version": "1.35.0-alpha-jun-4-2023",
   "description": "A high-level API to automate web browsers",
   "repository": "github:Microsoft/playwright",
   "homepage": "https://playwright.dev",
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "main": "index.js",
   "exports": {
@@ -41,7 +41,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@types/node": "*",
-    "playwright-core": "1.35.0-alpha-jun-2-2023"
+    "playwright-core": "1.35.0-alpha-jun-4-2023"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"

package/types/test.d.ts

@@ -569,6 +569,31 @@ interface TestConfig {
    *
    */
   webServer?: TestConfigWebServer | TestConfigWebServer[];
+  /**
+   * Transpiler configuration.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   build: {
+   *     external: '**\/*bundle.js',
+   *   },
+   * });
+   * ```
+   *
+   */
+  build?: {
+    /**
+     * Paths to exclude from the transpilation expressed as glob patterns. Typically heavy JS bundles your tests
+     * reference.
+     */
+    external?: Array<string>;
+  };
+
   /**
    * Configuration for the `expect` assertion library. Learn more about [various timeouts](https://playwright.dev/docs/test-timeouts).
    *