playwright 1.57.0-beta-1764944708000 → 1.57.0-beta-1765994134000

package/lib/transform/esmLoader.js

@@ -27,7 +27,9 @@ var import_compilationCache = require("./compilationCache");
 var import_portTransport = require("./portTransport");
 var import_transform = require("./transform");
 var import_util = require("../util");
-async function resolve(specifier, context, defaultResolve) {
+const esmPreflightExtension = ".esm.preflight";
+async function resolve(originalSpecifier, context, defaultResolve) {
+  let specifier = originalSpecifier.replace(esmPreflightExtension, "");
   if (context.parentURL && context.parentURL.startsWith("file://")) {
     const filename = import_url.default.fileURLToPath(context.parentURL);
     const resolved = (0, import_transform.resolveHook)(filename, specifier);
@@ -37,6 +39,8 @@ async function resolve(specifier, context, defaultResolve) {
   const result = await defaultResolve(specifier, context, defaultResolve);
   if (result?.url && result.url.startsWith("file://"))
     (0, import_compilationCache.currentFileDepsCollector)()?.add(import_url.default.fileURLToPath(result.url));
+  if (originalSpecifier.endsWith(esmPreflightExtension))
+    result.url = result.url + esmPreflightExtension;
   return result;
 }
 const kSupportedFormats = /* @__PURE__ */ new Map([
@@ -47,7 +51,8 @@ const kSupportedFormats = /* @__PURE__ */ new Map([
   [null, null],
   [void 0, void 0]
 ]);
-async function load(moduleUrl, context, defaultLoad) {
+async function load(originalModuleUrl, context, defaultLoad) {
+  const moduleUrl = originalModuleUrl.replace(esmPreflightExtension, "");
   if (!kSupportedFormats.has(context.format))
     return defaultLoad(moduleUrl, context, defaultLoad);
   if (!moduleUrl.startsWith("file://"))
@@ -57,23 +62,17 @@ async function load(moduleUrl, context, defaultLoad) {
     return defaultLoad(moduleUrl, context, defaultLoad);
   const code = import_fs.default.readFileSync(filename, "utf-8");
   const transformed = (0, import_transform.transformHook)(code, filename, moduleUrl);
-  if (transformed.serializedCache) {
-    if (legacyWaitForSourceMaps)
-      await transport?.send("pushToCompilationCache", { cache: transformed.serializedCache });
-    else
-      transport?.post("pushToCompilationCache", { cache: transformed.serializedCache });
-  }
+  if (transformed.serializedCache)
+    transport?.post("pushToCompilationCache", { cache: transformed.serializedCache });
   return {
     format: kSupportedFormats.get(context.format) || ((0, import_util.fileIsModule)(filename) ? "module" : "commonjs"),
-    source: transformed.code,
+    source: originalModuleUrl.endsWith(esmPreflightExtension) ? `void 0;` : transformed.code,
     shortCircuit: true
   };
 }
 let transport;
-let legacyWaitForSourceMaps = false;
 function initialize(data) {
   transport = createTransport(data?.port);
-  legacyWaitForSourceMaps = !!process.env.PLAYWRIGHT_WAIT_FOR_SOURCE_MAPS;
 }
 function createTransport(port) {
   return new import_portTransport.PortTransport(port, async (method, params) => {

package/lib/transform/transform.js

@@ -209,11 +209,11 @@ function calculateHash(content, filePath, isModule2, pluginsPrologue, pluginsEpi
 async function requireOrImport(file) {
   installTransformIfNeeded();
   const isModule = (0, import_util.fileIsModule)(file);
-  const esmImport = () => eval(`import(${JSON.stringify(import_url.default.pathToFileURL(file))})`);
   if (isModule) {
-    return await esmImport().finally(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    });
+    const fileName = import_url.default.pathToFileURL(file);
+    const esmImport = () => eval(`import(${JSON.stringify(fileName)})`);
+    await eval(`import(${JSON.stringify(fileName + ".esm.preflight")})`).finally(nextTask);
+    return await esmImport().finally(nextTask);
   }
   const result = require(file);
   const depsCollector = (0, import_compilationCache.currentFileDepsCollector)();
@@ -257,8 +257,8 @@ function wrapFunctionWithLocation(func) {
     const oldPrepareStackTrace = Error.prepareStackTrace;
     Error.prepareStackTrace = (error, stackFrames) => {
       const frame = import_utilsBundle.sourceMapSupport.wrapCallSite(stackFrames[1]);
-      const fileName = frame.getFileName();
-      const file2 = fileName && fileName.startsWith("file://") ? import_url.default.fileURLToPath(fileName) : fileName;
+      const fileName2 = frame.getFileName();
+      const file2 = fileName2 && fileName2.startsWith("file://") ? import_url.default.fileURLToPath(fileName2) : fileName2;
       return {
         file: file2,
         line: frame.getLineNumber(),
@@ -278,6 +278,9 @@ function wrapFunctionWithLocation(func) {
 function isRelativeSpecifier(specifier) {
   return specifier === "." || specifier === ".." || specifier.startsWith("./") || specifier.startsWith("../");
 }
+async function nextTask() {
+  return new Promise((resolve) => setTimeout(resolve, 0));
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   requireOrImport,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playwright",
-  "version": "1.57.0-beta-1764944708000",
+  "version": "1.57.0-beta-1765994134000",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",
@@ -64,7 +64,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "playwright-core": "1.57.0-beta-1764944708000"
+    "playwright-core": "1.57.0-beta-1765994134000"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"