yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(esm loader): support Node 18.6 (#15694)

Browse Source 
A small change in the API requires `shortCircuit: true` when returning the
transformed source.
Another API change removes third argument from the chained resolve/load,
but passing three instead of two still works.
This commit is contained in:
Dmitry Gozman 2022-07-14 19:10:39 -07:00 committed by GitHub
parent 732b8f4760
commit da2fdc2e2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/playwright-test/src/experimentalLoader.ts
View File

@ -18,7 +18,9 @@ import fs from 'fs';
import url from 'url'; import url from 'url';
import { transformHook, resolveHook, belongsToNodeModules } from './transform'; import { transformHook, resolveHook, belongsToNodeModules } from './transform';
async function resolve(specifier: string, context: { parentURL: string }, defaultResolve: any) { // Node < 18.6: defaultResolve takes 3 arguments.
// Node >= 18.6: nextResolve from the chain takes 2 arguments.
async function resolve(specifier: string, context: { parentURL?: string }, defaultResolve: Function) {
if (context.parentURL && context.parentURL.startsWith('file://')) { if (context.parentURL && context.parentURL.startsWith('file://')) {
const filename = url.fileURLToPath(context.parentURL); const filename = url.fileURLToPath(context.parentURL);
const resolved = resolveHook(filename, specifier); const resolved = resolveHook(filename, specifier);
@ -28,7 +30,9 @@ async function resolve(specifier: string, context: { parentURL: string }, defaul
return defaultResolve(specifier, context, defaultResolve); return defaultResolve(specifier, context, defaultResolve);
} }
async function load(moduleUrl: string, context: any, defaultLoad: any) { // Node < 18.6: defaultLoad takes 3 arguments.
// Node >= 18.6: nextLoad from the chain takes 2 arguments.
async function load(moduleUrl: string, context: { format?: string }, defaultLoad: Function) {
// Bail out for wasm, json, etc. // Bail out for wasm, json, etc.
// non-js files have context.format === undefined // non-js files have context.format === undefined
if (context.format !== 'commonjs' && context.format !== 'module' && context.format !== undefined) if (context.format !== 'commonjs' && context.format !== 'module' && context.format !== undefined)
@ -49,7 +53,8 @@ async function load(moduleUrl: string, context: any, defaultLoad: any) {
const code = fs.readFileSync(filename, 'utf-8'); const code = fs.readFileSync(filename, 'utf-8');
const source = transformHook(code, filename, moduleUrl); const source = transformHook(code, filename, moduleUrl);
// Output format is always the same as input format, if it was unknown, we always report modules. // Output format is always the same as input format, if it was unknown, we always report modules.
return { format: context.format || 'module', source }; // shortCurcuit is required by Node >= 18.6 to designate no more loaders should be called.
return { format: context.format || 'module', source, shortCircuit: true };
} }
module.exports = { resolve, load }; module.exports = { resolve, load };