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

chore: enable ts-esm support by default (#12658)

Browse Source
This commit is contained in:
Pavel Feldman 2022-03-10 14:48:33 -08:00 committed by GitHub
parent cf643ff04c
commit 4d3d0e2bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/playwright-test/src/cli.ts
View File

@ -238,9 +238,9 @@ async function launchDockerContainer(): Promise<() => Promise<void>> {
function restartWithExperimentalTsEsm(configFile: string | null): boolean { function restartWithExperimentalTsEsm(configFile: string | null): boolean {
if (!configFile) if (!configFile)
return false; return false;
if (!process.env.PW_EXPERIMENTAL_TS_ESM) if (process.env.PW_DISABLE_TS_ESM)
return false; return false;
if (process.env.PW_EXPERIMENTAL_TS_ESM_ON) if (process.env.PW_TS_ESM_ON)
return false; return false;
if (!configFile.endsWith('.ts')) if (!configFile.endsWith('.ts'))
return false; return false;
@ -251,7 +251,7 @@ function restartWithExperimentalTsEsm(configFile: string | null): boolean {
env: { env: {
...process.env, ...process.env,
NODE_OPTIONS, NODE_OPTIONS,
PW_EXPERIMENTAL_TS_ESM_ON: '1', PW_TS_ESM_ON: '1',
} }
}); });

6
packages/playwright-test/src/transform.ts
View File

@ -54,10 +54,10 @@ sourceMapSupport.install({
} }
}); });
function calculateCachePath(content: string, filePath: string): string { function calculateCachePath(content: string, filePath: string, isModule: boolean): string {
const hash = crypto.createHash('sha1') const hash = crypto.createHash('sha1')
.update(process.env.PW_TEST_SOURCE_TRANSFORM || '') .update(process.env.PW_TEST_SOURCE_TRANSFORM || '')
.update(process.env.PW_EXPERIMENTAL_TS_ESM ? 'esm' : 'no_esm') .update(isModule ? 'esm' : 'no_esm')
.update(content) .update(content)
.update(filePath) .update(filePath)
.update(String(version)) .update(String(version))
@ -134,7 +134,7 @@ export function transformHook(code: string, filename: string, isModule = false):
if (!isTypeScript && !hasPreprocessor) if (!isTypeScript && !hasPreprocessor)
return code; return code;
const cachePath = calculateCachePath(code, filename); const cachePath = calculateCachePath(code, filename, isModule);
const codePath = cachePath + '.js'; const codePath = cachePath + '.js';
const sourceMapPath = cachePath + '.map'; const sourceMapPath = cachePath + '.map';
sourceMaps.set(filename, sourceMapPath); sourceMaps.set(filename, sourceMapPath);

8
tests/playwright-test/loader.spec.ts
View File

@ -260,9 +260,7 @@ test('should import esm from ts when package.json has type module in experimenta
'b.ts': ` 'b.ts': `
export const foo: string = 'foo'; export const foo: string = 'foo';
` `
}, {}, { }, {});
PW_EXPERIMENTAL_TS_ESM: true
});
expect(result.exitCode).toBe(0); expect(result.exitCode).toBe(0);
}); });
@ -278,9 +276,7 @@ test('should propagate subprocess exit code in experimental mode @esm', async ({
expect(1).toBe(2); expect(1).toBe(2);
}); });
`, `,
}, {}, { }, {});
PW_EXPERIMENTAL_TS_ESM: true
});
expect(result.exitCode).toBe(1); expect(result.exitCode).toBe(1);
}); });

4
tests/playwright-test/resolver.spec.ts
View File

@ -195,9 +195,7 @@ test('should respect path resolver in experimental mode @esm', async ({ runInlin
'foo/bar/util/b.ts': ` 'foo/bar/util/b.ts': `
export const foo: string = 'foo'; export const foo: string = 'foo';
`, `,
}, {}, { }, {});
PW_EXPERIMENTAL_TS_ESM: true
});
expect(result.exitCode).toBe(0); expect(result.exitCode).toBe(0);
}); });