playwright 1.47.0 → 1.47.1

package/lib/transform/esmLoader.js

@@ -29,7 +29,7 @@ async function resolve(specifier, context, defaultResolve) {
   var _currentFileDepsColle;
   if (context.parentURL && context.parentURL.startsWith('file://')) {
     const filename = _url.default.fileURLToPath(context.parentURL);
-    const resolved = (0, _transform.resolveHook)(filename, specifier, true);
+    const resolved = (0, _transform.resolveHook)(filename, specifier);
     if (resolved !== undefined) specifier = _url.default.pathToFileURL(resolved).toString();
   }
   const result = await defaultResolve(specifier, context, defaultResolve);

package/lib/transform/transform.js

@@ -88,16 +88,15 @@ function loadAndValidateTsconfigsForFile(file) {
 }
 const pathSeparator = process.platform === 'win32' ? ';' : ':';
 const builtins = new Set(_module.default.builtinModules);
-function resolveHook(filename, specifier, isESM) {
+function resolveHook(filename, specifier) {
   if (specifier.startsWith('node:') || builtins.has(specifier)) return;
   if (!shouldTransform(filename)) return;
-  if (isRelativeSpecifier(specifier)) return (0, _util.resolveImportSpecifierExtension)(_path.default.resolve(_path.default.dirname(filename), specifier), false, isESM);
+  if (isRelativeSpecifier(specifier)) return (0, _util.resolveImportSpecifierAfterMapping)(_path.default.resolve(_path.default.dirname(filename), specifier), false);
 
   /**
-   * TypeScript discourages path-mapping into node_modules
-   *    (https://www.typescriptlang.org/docs/handbook/modules/reference.html#paths-should-not-point-to-monorepo-packages-or-node_modules-packages).
-   * It seems like TypeScript tries path-mapping first, but does not look at the `package.json` or `index.js` files in ESM.
-   * If path-mapping doesn't yield a result, TypeScript falls back to the default resolution (typically node_modules).
+   * TypeScript discourages path-mapping into node_modules:
+   * https://www.typescriptlang.org/docs/handbook/modules/reference.html#paths-should-not-point-to-monorepo-packages-or-node_modules-packages
+   * However, if path-mapping doesn't yield a result, TypeScript falls back to the default resolution through node_modules.
    */
   const isTypeScript = filename.endsWith('.ts') || filename.endsWith('.tsx');
   const tsconfigs = loadAndValidateTsconfigsForFile(filename);
@@ -133,7 +132,7 @@ function resolveHook(filename, specifier, isESM) {
         let candidate = value;
         if (value.includes('*')) candidate = candidate.replace('*', matchedPartOfSpecifier);
         candidate = _path.default.resolve(tsconfig.pathsBase, candidate);
-        const existing = (0, _util.resolveImportSpecifierExtension)(candidate, true, isESM);
+        const existing = (0, _util.resolveImportSpecifierAfterMapping)(candidate, true);
         if (existing) {
           longestPrefixLength = keyPrefix.length;
           pathMatchedByLongestPrefix = existing;
@@ -145,7 +144,7 @@ function resolveHook(filename, specifier, isESM) {
   if (_path.default.isAbsolute(specifier)) {
     // Handle absolute file paths like `import '/path/to/file'`
     // Do not handle module imports like `import 'fs'`
-    return (0, _util.resolveImportSpecifierExtension)(specifier, false, isESM);
+    return (0, _util.resolveImportSpecifierAfterMapping)(specifier, false);
   }
 }
 function shouldTransform(filename) {
@@ -218,7 +217,7 @@ function installTransformIfNeeded() {
   const originalResolveFilename = _module.default._resolveFilename;
   function resolveFilename(specifier, parent, ...rest) {
     if (parent) {
-      const resolved = resolveHook(parent.filename, specifier, false);
+      const resolved = resolveHook(parent.filename, specifier);
       if (resolved !== undefined) specifier = resolved;
     }
     return originalResolveFilename.call(this, specifier, parent, ...rest);

package/lib/util.js

@@ -23,7 +23,7 @@ exports.getPackageJsonPath = getPackageJsonPath;
 exports.mergeObjects = mergeObjects;
 exports.normalizeAndSaveAttachment = normalizeAndSaveAttachment;
 exports.relativeFilePath = relativeFilePath;
-exports.resolveImportSpecifierExtension = resolveImportSpecifierExtension;
+exports.resolveImportSpecifierAfterMapping = resolveImportSpecifierAfterMapping;
 exports.resolveReporterOutputPath = resolveReporterOutputPath;
 exports.sanitizeFilePathBeforeExtension = sanitizeFilePathBeforeExtension;
 exports.serializeError = serializeError;
@@ -277,11 +277,23 @@ function folderIsModule(folder) {
   // Rely on `require` internal caching logic.
   return require(packageJsonPath).type === 'module';
 }
+const packageJsonMainFieldCache = new Map();
+function getMainFieldFromPackageJson(packageJsonPath) {
+  if (!packageJsonMainFieldCache.has(packageJsonPath)) {
+    let mainField;
+    try {
+      mainField = JSON.parse(_fs.default.readFileSync(packageJsonPath, 'utf8')).main;
+    } catch {}
+    packageJsonMainFieldCache.set(packageJsonPath, mainField);
+  }
+  return packageJsonMainFieldCache.get(packageJsonPath);
+}
 
-// This follows the --moduleResolution=bundler strategy from tsc.
-// https://devblogs.microsoft.com/typescript/announcing-typescript-5-0-beta/#moduleresolution-bundler
+// This method performs "file extension subsitution" to find the ts, js or similar source file
+// based on the import specifier, which might or might not have an extension. See TypeScript docs:
+// https://www.typescriptlang.org/docs/handbook/modules/reference.html#file-extension-substitution.
 const kExtLookups = new Map([['.js', ['.jsx', '.ts', '.tsx']], ['.jsx', ['.tsx']], ['.cjs', ['.cts']], ['.mjs', ['.mts']], ['', ['.js', '.ts', '.jsx', '.tsx', '.cjs', '.mjs', '.cts', '.mts']]]);
-function resolveImportSpecifierExtension(resolved, isPathMapping, isESM) {
+function resolveImportSpecifierExtension(resolved) {
   if (fileExists(resolved)) return resolved;
   for (const [ext, others] of kExtLookups) {
     if (!resolved.endsWith(ext)) continue;
@@ -291,23 +303,43 @@ function resolveImportSpecifierExtension(resolved, isPathMapping, isESM) {
     }
     break; // Do not try '' when a more specific extension like '.jsx' matched.
   }
+}
 
-  // After TypeScript path mapping, here's how directories with a `package.json` are resolved:
-  //  - `package.json#exports` is not respected
-  //  - `package.json#main` is respected only in CJS mode
-  //  - `index.js` default is respected only in CJS mode
-  //
-  // More info:
-  //  - https://www.typescriptlang.org/docs/handbook/modules/reference.html#paths-should-not-point-to-monorepo-packages-or-node_modules-packages
-  //  - https://www.typescriptlang.org/docs/handbook/modules/reference.html#directory-modules-index-file-resolution
-  //  - https://nodejs.org/dist/latest-v20.x/docs/api/modules.html#folders-as-modules
+// This method resolves directory imports and performs "file extension subsitution".
+// It is intended to be called after the path mapping resolution.
+//
+// Directory imports follow the --moduleResolution=bundler strategy from tsc.
+// https://www.typescriptlang.org/docs/handbook/modules/reference.html#directory-modules-index-file-resolution
+// https://www.typescriptlang.org/docs/handbook/modules/reference.html#bundler
+//
+// See also Node.js "folder as module" behavior:
+// https://nodejs.org/dist/latest-v20.x/docs/api/modules.html#folders-as-modules.
+function resolveImportSpecifierAfterMapping(resolved, afterPathMapping) {
+  const resolvedFile = resolveImportSpecifierExtension(resolved);
+  if (resolvedFile) return resolvedFile;
+  if (dirExists(resolved)) {
+    const packageJsonPath = _path.default.join(resolved, 'package.json');
+    if (afterPathMapping) {
+      // Most notably, the module resolution algorithm is not performed after the path mapping.
+      // This means no node_modules lookup or package.json#exports.
+      //
+      // Only the "folder as module" Node.js behavior is respected:
+      //  - consult `package.json#main`;
+      //  - look for `index.js` or similar.
+      const mainField = getMainFieldFromPackageJson(packageJsonPath);
+      const mainFieldResolved = mainField ? resolveImportSpecifierExtension(_path.default.resolve(resolved, mainField)) : undefined;
+      return mainFieldResolved || resolveImportSpecifierExtension(_path.default.join(resolved, 'index'));
+    }
 
-  const shouldNotResolveDirectory = isPathMapping && isESM;
-  if (!shouldNotResolveDirectory && dirExists(resolved)) {
     // If we import a package, let Node.js figure out the correct import based on package.json.
-    if (fileExists(_path.default.join(resolved, 'package.json'))) return resolved;
+    // This also covers the "main" field for "folder as module".
+    if (fileExists(packageJsonPath)) return resolved;
+
+    // Implement the "folder as module" Node.js behavior.
+    // Note that we do not delegate to Node.js, because we support this for ESM as well,
+    // following the TypeScript "bundler" mode.
     const dirImport = _path.default.join(resolved, 'index');
-    return resolveImportSpecifierExtension(dirImport, isPathMapping, isESM);
+    return resolveImportSpecifierExtension(dirImport);
   }
 }
 function fileExists(resolved) {

package/package.json

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