Make unit tests ES modules

itgalaxy · Dec 21, 2023 · fc09755 · fc09755
1 parent 3bd8436
commit fc09755
Show file tree

Hide file tree

Showing 44 changed files with 567 additions and 616 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "pretest": "npm run lint && npm run fmt-check",
     "test-import": "node ./test-packages/test-mjs/index.js",
     "test-require": "node ./test-packages/test-cjs/index.js",
-    "test": "jest",
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest",
     "test-all": "npm test && npm run test-import && npm run test-require",
     "clean": "rimraf dist/",
     "prebuild": "npm run clean",
@@ -64,22 +64,29 @@
     "@types/xml2js": "^0.4.11",
     "@typescript-eslint/eslint-plugin": "^6.2.0",
     "@typescript-eslint/parser": "^6.2.0",
+    "cross-env": "^7.0.3",
     "eslint": "^8.26.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^27.1.3",
     "eslint-plugin-prettier": "^5.0.0",
-    "icojs": "^0.17.0",
+    "icojs": "^0.19.3",
     "jest": "^29.2.1",
     "jest-image-snapshot": "^6.1.0",
     "prettier": "^3.0.0",
     "rimraf": "^5.0.1",
     "typescript": "^5.0.4",
-    "unbuild": "^1.1.2"
+    "unbuild": "^2.0.0"
   },
   "jest": {
     "testTimeout": 180000,
+    "testMatch": [
+      "<rootDir>/test/**/*.test.mjs"
+    ],
+    "extensionsToTreatAsEsm": [
+      ".ts"
+    ],
     "setupFilesAfterEnv": [
-      "<rootDir>/test/setup.js"
+      "<rootDir>/test/setup.mjs"
     ],
     "collectCoverage": true,
     "collectCoverageFrom": [

diff --git a/test/__snapshots__/array.test.js.snap → test/__snapshots__/array.test.mjs.snap b/test/__snapshots__/array.test.js.snap → test/__snapshots__/array.test.mjs.snap
diff --git a/test/__snapshots__/background.test.js.snap → test/__snapshots__/background.test.mjs.snap b/test/__snapshots__/background.test.js.snap → test/__snapshots__/background.test.mjs.snap
diff --git a/test/__snapshots__/cacheBusting.test.js.snap → .../__snapshots__/cacheBusting.test.mjs.snap b/test/__snapshots__/cacheBusting.test.js.snap → .../__snapshots__/cacheBusting.test.mjs.snap
diff --git a/test/__snapshots__/default.test.js.snap → test/__snapshots__/default.test.mjs.snap b/test/__snapshots__/default.test.js.snap → test/__snapshots__/default.test.mjs.snap
diff --git a/.../loadManifestWithCredentials.test.js.snap → ...loadManifestWithCredentials.test.mjs.snap b/.../loadManifestWithCredentials.test.js.snap → ...loadManifestWithCredentials.test.mjs.snap
diff --git a/...snapshots__/manifestMaskable.test.js.snap → ...napshots__/manifestMaskable.test.mjs.snap b/...snapshots__/manifestMaskable.test.js.snap → ...napshots__/manifestMaskable.test.mjs.snap
diff --git a/...hots__/manifestRelativePaths.test.js.snap → ...ots__/manifestRelativePaths.test.mjs.snap b/...hots__/manifestRelativePaths.test.js.snap → ...ots__/manifestRelativePaths.test.mjs.snap
diff --git a/...napshots__/manifestShortcuts.test.js.snap → ...apshots__/manifestShortcuts.test.mjs.snap b/...napshots__/manifestShortcuts.test.js.snap → ...apshots__/manifestShortcuts.test.mjs.snap
diff --git a/test/__snapshots__/meta.test.js.snap → test/__snapshots__/meta.test.mjs.snap b/test/__snapshots__/meta.test.js.snap → test/__snapshots__/meta.test.mjs.snap
diff --git a/test/__snapshots__/offset.test.js.snap → test/__snapshots__/offset.test.mjs.snap b/test/__snapshots__/offset.test.js.snap → test/__snapshots__/offset.test.mjs.snap
diff --git a/test/__snapshots__/pickedSizes.test.js.snap → test/__snapshots__/pickedSizes.test.mjs.snap b/test/__snapshots__/pickedSizes.test.js.snap → test/__snapshots__/pickedSizes.test.mjs.snap
diff --git a/test/__snapshots__/pixelart.test.js.snap → test/__snapshots__/pixelart.test.mjs.snap b/test/__snapshots__/pixelart.test.js.snap → test/__snapshots__/pixelart.test.mjs.snap
diff --git a/test/__snapshots__/prefixed.test.js.snap → test/__snapshots__/prefixed.test.mjs.snap b/test/__snapshots__/prefixed.test.js.snap → test/__snapshots__/prefixed.test.mjs.snap
diff --git a/test/__snapshots__/restrict.test.js.snap → test/__snapshots__/restrict.test.mjs.snap b/test/__snapshots__/restrict.test.js.snap → test/__snapshots__/restrict.test.mjs.snap
diff --git a/test/__snapshots__/svg.test.js.snap → test/__snapshots__/svg.test.mjs.snap b/test/__snapshots__/svg.test.js.snap → test/__snapshots__/svg.test.mjs.snap
diff --git a/test/__snapshots__/svgOutput.test.js.snap → test/__snapshots__/svgOutput.test.mjs.snap b/test/__snapshots__/svgOutput.test.js.snap → test/__snapshots__/svgOutput.test.mjs.snap
diff --git a/test/__snapshots__/svgScaling.test.js.snap → test/__snapshots__/svgScaling.test.mjs.snap b/test/__snapshots__/svgScaling.test.js.snap → test/__snapshots__/svgScaling.test.mjs.snap
diff --git a/test/array.test.js → test/array.test.mjs b/test/array.test.js → test/array.test.mjs
diff --git a/test/background.test.js → test/background.test.mjs b/test/background.test.js → test/background.test.mjs
diff --git a/test/cacheBusting.test.js → test/cacheBusting.test.mjs b/test/cacheBusting.test.js → test/cacheBusting.test.mjs
diff --git a/test/createExamples.js → test/createExamples.mjs b/test/createExamples.js → test/createExamples.mjs
diff --git a/test/default.test.js → test/default.test.mjs b/test/default.test.js → test/default.test.mjs
diff --git a/test/failure.test.js → test/failure.test.mjs b/test/failure.test.js → test/failure.test.mjs
diff --git a/test/loadManifestWithCredentials.test.js → test/loadManifestWithCredentials.test.mjs b/test/loadManifestWithCredentials.test.js → test/loadManifestWithCredentials.test.mjs
diff --git a/test/manifest.test.js → test/manifest.test.mjs b/test/manifest.test.js → test/manifest.test.mjs
diff --git a/test/manifestMaskable.test.js → test/manifestMaskable.test.mjs b/test/manifestMaskable.test.js → test/manifestMaskable.test.mjs
diff --git a/test/manifestRelativePaths.test.js → test/manifestRelativePaths.test.mjs b/test/manifestRelativePaths.test.js → test/manifestRelativePaths.test.mjs
diff --git a/test/manifestShortcuts.test.js → test/manifestShortcuts.test.mjs b/test/manifestShortcuts.test.js → test/manifestShortcuts.test.mjs
diff --git a/test/meta.test.js → test/meta.test.mjs b/test/meta.test.js → test/meta.test.mjs
diff --git a/test/noassets.test.js → test/noassets.test.mjs b/test/noassets.test.js → test/noassets.test.mjs
diff --git a/test/offset.test.js → test/offset.test.mjs b/test/offset.test.js → test/offset.test.mjs
diff --git a/test/output.test.js → test/output.test.mjs b/test/output.test.js → test/output.test.mjs
diff --git a/test/pickedSizes.test.js → test/pickedSizes.test.mjs b/test/pickedSizes.test.js → test/pickedSizes.test.mjs
diff --git a/test/pixelart.test.js → test/pixelart.test.mjs b/test/pixelart.test.js → test/pixelart.test.mjs
diff --git a/test/prefixed.test.js → test/prefixed.test.mjs b/test/prefixed.test.js → test/prefixed.test.mjs
diff --git a/test/restrict.test.js → test/restrict.test.mjs b/test/restrict.test.js → test/restrict.test.mjs
diff --git a/test/setup.js → test/setup.mjs b/test/setup.js → test/setup.mjs
@@ -10,7 +10,7 @@ async function imagePlanes(image) {
     return [image];
   }
 
-  const planes = await ICO.parse(image.contents, "image/png");
+  const planes = await ICO.parseICO(image.contents, "image/png");
   const result = [];
 
   for (const plane of planes) {

diff --git a/test/stream.test.js → test/stream.test.mjs b/test/stream.test.js → test/stream.test.mjs
diff --git a/test/svg.test.js → test/svg.test.mjs b/test/svg.test.js → test/svg.test.mjs
diff --git a/test/svgOutput.test.js → test/svgOutput.test.mjs b/test/svgOutput.test.js → test/svgOutput.test.mjs
diff --git a/test/svgScaling.test.js → test/svgScaling.test.mjs b/test/svgScaling.test.js → test/svgScaling.test.mjs
diff --git a/test/util.js → test/util.mjs b/test/util.js → test/util.mjs
@@ -1,7 +1,8 @@
-import * as path from "path";
+import { fileURLToPath } from "node:url";
 
-function fixture(uri) {
-  return path.resolve(__dirname, "fixtures", uri);
+function fixture(name) {
+  const url = new URL(`fixtures/${name}`, import.meta.url);
+  return fileURLToPath(url);
 }
 
 export const logo_png = fixture("logo.png");