feat: move from CJS to ESM

this is an unreasonably large change which does a few things: - Moves all packages to `type: "module"` - Removes `node-fetch` (ran into problems in ESM-land) - Replaces all `__dirname` with an equivalent using `import.meta` - Replaces all `require.resolve` with `import.meta.resolve` - Update all imports to be ESM-compatible - Move all `tsconfig` to use `nodenext` resolution Probably some other stuff too.
modernweb-dev · Nov 21, 2023 · 70dd2e3 · 70dd2e3
1 parent d3ef523
commit 70dd2e3
Show file tree

Hide file tree

Showing 452 changed files with 7,785 additions and 4,736 deletions.
diff --git a/integration/test-runner/index.ts b/integration/test-runner/index.ts
@@ -1,11 +1,11 @@
 import { BrowserLauncher, TestRunnerCoreConfig } from '@web/test-runner-core';
-import { runBasicTest } from './tests/basic/runBasicTest';
-import { runConfigGroupsTest } from './tests/config-groups/runConfigGroupsTest';
-import { runParallelTest } from './tests/parallel/runParallelTest';
-import { runTestFailureTest } from './tests/test-failure/runTestFailureTest';
-import { runLocationChangeTest } from './tests/location-change/runLocationChangeTest';
-import { runFocusTest } from './tests/focus/runFocusTest';
-import { runManyTests } from './tests/many/runManyTests';
+import { runBasicTest } from './tests/basic/runBasicTest.js';
+import { runConfigGroupsTest } from './tests/config-groups/runConfigGroupsTest.js';
+import { runParallelTest } from './tests/parallel/runParallelTest.js';
+import { runTestFailureTest } from './tests/test-failure/runTestFailureTest.js';
+import { runLocationChangeTest } from './tests/location-change/runLocationChangeTest.js';
+import { runFocusTest } from './tests/focus/runFocusTest.js';
+import { runManyTests } from './tests/many/runManyTests.js';
 
 export interface Tests {
  basic: boolean;

diff --git a/integration/test-runner/package.json b/integration/test-runner/package.json
@@ -15,6 +15,7 @@
  "author": "modern-web",
  "homepage": "https://github.com/modernweb-dev/web/tree/master/packages/test-runner-integration-tests",
  "main": "index.js",
+ "type": "module",
  "scripts": {
  "test": "mocha test/**/*.test.ts --require ts-node/register --reporter dot",
  "test:watch": "mocha test/**/*.test.ts --require ts-node/register --watch --watch-files src,test --reporter dot"

diff --git a/integration/test-runner/tests/basic/runBasicTest.ts b/integration/test-runner/tests/basic/runBasicTest.ts
@@ -1,8 +1,11 @@
 import { BrowserLauncher, TestRunnerCoreConfig, TestSession } from '@web/test-runner-core';
-import { runTests } from '@web/test-runner-core/test-helpers';
+import { runTests } from '@web/test-runner-core/dist/test-helpers.js';
 import { legacyPlugin } from '@web/dev-server-legacy';
 import { resolve } from 'path';
 import { expect } from 'chai';
+import { fileURLToPath } from 'node:url';
+
+const dirname = fileURLToPath(new URL('.', import.meta.url));
 
 export function runBasicTest(
  config: Partial<TestRunnerCoreConfig> & { browsers: BrowserLauncher[] },
@@ -14,7 +17,7 @@ export function runBasicTest(
  before(async () => {
  const result = await runTests({
  ...config,
- files: [...(config.files ?? []), resolve(__dirname, 'browser-tests', '*.test.js')],
+ files: [...(config.files ?? []), resolve(dirname, 'browser-tests', '*.test.js')],
  plugins: [...(config.plugins ?? []), legacyPlugin()],
  });
  allSessions = result.sessions;

diff --git a/integration/test-runner/tests/config-groups/runConfigGroupsTest.ts b/integration/test-runner/tests/config-groups/runConfigGroupsTest.ts
@@ -3,10 +3,13 @@ import {
  TestRunnerCoreConfig,
  TestRunnerGroupConfig,
 } from '@web/test-runner-core';
-import { runTests } from '@web/test-runner-core/test-helpers';
+import { runTests } from '@web/test-runner-core/dist/test-helpers.js';
 import { legacyPlugin } from '@web/dev-server-legacy';
 import { resolve } from 'path';
 import { expect } from 'chai';
+import { fileURLToPath } from 'node:url';
+
+const dirname = fileURLToPath(new URL('.', import.meta.url));
 
 export function runConfigGroupsTest(
  config: Partial<TestRunnerCoreConfig> & { browsers: BrowserLauncher[] },
@@ -18,13 +21,13 @@ export function runConfigGroupsTest(
  name: 'a',
  testRunnerHtml: path =>
  `<html><body><script>window.__group__ = "a";</script><script type="module" src=${path}></script></body></html>`,
- files: [resolve(__dirname, 'browser-tests', 'test-runner-html-a.test.js')],
+ files: [resolve(dirname, 'browser-tests', 'test-runner-html-a.test.js')],
  },
  {
  name: 'b',
  testRunnerHtml: path =>
  `<html><body><script>window.__group__ = "b";</script><script type="module" src=${path}></script></body></html>`,
- files: [resolve(__dirname, 'browser-tests', 'test-runner-html-b.test.js')],
+ files: [resolve(dirname, 'browser-tests', 'test-runner-html-b.test.js')],
  },
  ];
  const result = await runTests(

diff --git a/integration/test-runner/tests/focus/runFocusTest.ts b/integration/test-runner/tests/focus/runFocusTest.ts
@@ -1,8 +1,11 @@
 import { BrowserLauncher, TestRunnerCoreConfig, TestSession } from '@web/test-runner-core';
-import { runTests } from '@web/test-runner-core/test-helpers';
+import { runTests } from '@web/test-runner-core/dist/test-helpers.js';
 import { legacyPlugin } from '@web/dev-server-legacy';
 import { resolve } from 'path';
 import { expect } from 'chai';
+import { fileURLToPath } from 'node:url';
+
+const dirname = fileURLToPath(new URL('.', import.meta.url));
 
 export function runFocusTest(
  config: Partial<TestRunnerCoreConfig> & { browsers: BrowserLauncher[] },
@@ -15,7 +18,7 @@ export function runFocusTest(
  ...config,
  // 2 means some are executed concurrently, and some sequentially
  concurrency: 2,
- files: [...(config.files ?? []), resolve(__dirname, 'browser-tests', '*.test.js')],
+ files: [...(config.files ?? []), resolve(dirname, 'browser-tests', '*.test.js')],
  plugins: [...(config.plugins ?? []), legacyPlugin()],
  });
  allSessions = result.sessions;

diff --git a/integration/test-runner/tests/location-change/runLocationChangeTest.ts b/integration/test-runner/tests/location-change/runLocationChangeTest.ts
@@ -1,8 +1,11 @@
 import { BrowserLauncher, TestRunnerCoreConfig, TestSession } from '@web/test-runner-core';
-import { runTests } from '@web/test-runner-core/test-helpers';
+import { runTests } from '@web/test-runner-core/dist/test-helpers.js';
 import { legacyPlugin } from '@web/dev-server-legacy';
 import { resolve } from 'path';
 import { expect } from 'chai';
+import { fileURLToPath } from 'node:url';
+
+const dirname = fileURLToPath(new URL('.', import.meta.url));
 
 export function runLocationChangeTest(
  config: Partial<TestRunnerCoreConfig> & { browsers: BrowserLauncher[] },
@@ -15,7 +18,7 @@ export function runLocationChangeTest(
  const result = await runTests(
  {
  ...config,
- files: [...(config.files ?? []), resolve(__dirname, 'browser-tests', '*.test.js')],
+ files: [...(config.files ?? []), resolve(dirname, 'browser-tests', '*.test.js')],
  plugins: [...(config.plugins ?? []), legacyPlugin()],
  },
  undefined,

diff --git a/integration/test-runner/tests/many/runManyTests.ts b/integration/test-runner/tests/many/runManyTests.ts
@@ -1,7 +1,10 @@
 import { BrowserLauncher, TestRunnerCoreConfig } from '@web/test-runner-core';
-import { runTests } from '@web/test-runner-core/test-helpers';
+import { runTests } from '@web/test-runner-core/dist/test-helpers.js';
 import { legacyPlugin } from '@web/dev-server-legacy';
 import { resolve } from 'path';
+import { fileURLToPath } from 'node:url';
+
+const dirname = fileURLToPath(new URL('.', import.meta.url));
 
 export function runManyTests(
  config: Partial<TestRunnerCoreConfig> & { browsers: BrowserLauncher[] },
@@ -11,7 +14,7 @@ export function runManyTests(
  await Promise.all([
  runTests({
  ...config,
- files: [...(config.files ?? []), resolve(__dirname, 'browser-tests', '*.test.js')],
+ files: [...(config.files ?? []), resolve(dirname, 'browser-tests', '*.test.js')],
  plugins: [...(config.plugins ?? []), legacyPlugin()],
  }),
  ]);

diff --git a/integration/test-runner/tests/parallel/runParallelTest.ts b/integration/test-runner/tests/parallel/runParallelTest.ts
@@ -1,7 +1,10 @@
 import { BrowserLauncher, TestRunnerCoreConfig } from '@web/test-runner-core';
-import { runTests } from '@web/test-runner-core/test-helpers';
+import { runTests } from '@web/test-runner-core/dist/test-helpers.js';
 import { legacyPlugin } from '@web/dev-server-legacy';
 import { resolve } from 'path';
+import { fileURLToPath } from 'node:url';
+
+const dirname = fileURLToPath(new URL('.', import.meta.url));
 
 export function runParallelTest(
  createConfig: () => Partial<TestRunnerCoreConfig> & { browsers: BrowserLauncher[] },
@@ -14,13 +17,13 @@ export function runParallelTest(
  await Promise.all([
  runTests({
  ...configA,
- files: [...(configA.files ?? []), resolve(__dirname, 'browser-tests', '*.test.js')],
+ files: [...(configA.files ?? []), resolve(dirname, 'browser-tests', '*.test.js')],
  plugins: [...(configA.plugins ?? []), legacyPlugin()],
  }),
 
  runTests({
  ...configB,
- files: [...(configB.files ?? []), resolve(__dirname, 'browser-tests', '*.test.js')],
+ files: [...(configB.files ?? []), resolve(dirname, 'browser-tests', '*.test.js')],
  plugins: [...(configB.plugins ?? []), legacyPlugin()],
  }),
  ]);

diff --git a/integration/test-runner/tests/test-failure/runTestFailureTest.ts b/integration/test-runner/tests/test-failure/runTestFailureTest.ts
@@ -1,8 +1,11 @@
 import { BrowserLauncher, TestRunnerCoreConfig, TestSession } from '@web/test-runner-core';
-import { runTests } from '@web/test-runner-core/test-helpers';
+import { runTests } from '@web/test-runner-core/dist/test-helpers.js';
 import { legacyPlugin } from '@web/dev-server-legacy';
 import { resolve, sep } from 'path';
 import { expect } from 'chai';
+import { fileURLToPath } from 'node:url';
+
+const dirname = fileURLToPath(new URL('.', import.meta.url));
 
 const ERROR_NOT_IMPORTABLE = {
  message:
@@ -34,7 +37,7 @@ export function runTestFailureTest(
  const result = await runTests(
  {
  ...config,
- files: [...(config.files ?? []), resolve(__dirname, 'browser-tests', '*.test.js')],
+ files: [...(config.files ?? []), resolve(dirname, 'browser-tests', '*.test.js')],
  plugins: [...(config.plugins ?? []), legacyPlugin()],
  },
  undefined,