make mocha run with ESM modules

cryptomator · Aug 16, 2024 · f1657b3 · f1657b3
1 parent 2af2800
commit f1657b3
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/frontend/.eslintrc.js → frontend/.eslintrc.cjs b/frontend/.eslintrc.js → frontend/.eslintrc.cjs
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,4 +1,5 @@
 {
+  "type": "module",
   "name": "cryptomator-hub",
   "version": "1.4.0",
   "description": "Web-Frontend for Cryptomator Hub",
@@ -9,7 +10,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",
-    "lint": "eslint -c .eslintrc.js",
+    "lint": "eslint -c .eslintrc.cjs",
     "test": "nyc --reporter lcov mocha",
     "serve": "vite preview",
     "dist": "vue-tsc --noEmit && vite build --sourcemap --outDir=\"../backend/src/main/resources/META-INF/resources\" --emptyOutDir"
@@ -19,9 +20,7 @@
     "test": "./test"
   },
   "mocha": {
-    "require": [
-      "ts-node/register"
-    ],
+    "loader": "ts-node/esm",
     "spec": "test/**/*.spec.ts",
     "timeout": 60000
   },

diff --git a/frontend/postcss.config.js → frontend/postcss.config.cjs b/frontend/postcss.config.js → frontend/postcss.config.cjs
diff --git a/frontend/test/common/crypto.spec.ts b/frontend/test/common/crypto.spec.ts
@@ -3,6 +3,7 @@ import chaiAsPromised from 'chai-as-promised';
 import { before, describe } from 'mocha';
 import { base64, base64url } from 'rfc4648';
 import { UnwrapKeyError, UserKeys, VaultKeys, getJwkThumbprint } from '../../src/common/crypto';
+import { webcrypto } from 'node:crypto';
 
 chaiUse(chaiAsPromised);
 
@@ -36,7 +37,7 @@ describe('crypto', () => {
   before(async () => {
     // since this test runs on Node, we need to replace window.crypto:
     // @ts-ignore: global not defined (but will be available within Node)
-    Object.defineProperty(global, 'crypto', { value: require('node:crypto').webcrypto });
+    Object.defineProperty(global, 'crypto', { value: webcrypto });
     // @ts-ignore: global not defined (but will be available within Node)
     global.window = { crypto: global.crypto };
 

diff --git a/frontend/test/common/jwe.spec.ts b/frontend/test/common/jwe.spec.ts
@@ -2,12 +2,13 @@ import { expect } from 'chai';
 import { describe } from 'mocha';
 import { base64url } from 'rfc4648';
 import { ConcatKDF, ECDH_ES, ECDH_P384, JWEBuilder, JWEHeader, JWEParser, PBES2 } from '../../src/common/jwe';
+import { webcrypto } from 'node:crypto';
 
 describe('JWE', () => {
   before(done => {
     // since this test runs on Node, we need to replace window.crypto:
     // @ts-ignore: global not defined (but will be available within Node)
-    Object.defineProperty(global, 'crypto', { value: require('node:crypto').webcrypto });
+    Object.defineProperty(global, 'crypto', { value: webcrypto });
     // @ts-ignore: global not defined (but will be available within Node)
     global.window = { crypto: global.crypto };
     done();

diff --git a/frontend/test/common/jwt.spec.ts b/frontend/test/common/jwt.spec.ts
@@ -1,12 +1,13 @@
 import { expect } from 'chai';
 import { describe } from 'mocha';
 import { JWT, JWTHeader } from '../../src/common/jwt';
+import { webcrypto } from 'node:crypto';
 
 describe('JWT', () => {
   before(done => {
     // since this test runs on Node, we need to replace window.crypto:
     // @ts-ignore: global not defined (but will be available within Node)
-    Object.defineProperty(global, 'crypto', { value: require('node:crypto').webcrypto });
+    Object.defineProperty(global, 'crypto', { value: webcrypto });
     // @ts-ignore: global not defined (but will be available within Node)
     global.window = { crypto: global.crypto };
     done();

diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -14,9 +14,8 @@
     "useUnknownInCatchVariables": false, // Workaround for `node_modules/miscreant/src/providers/webcrypto.ts:21:11 - error TS18046: 'e' is of type 'unknown'.`
   },
   "ts-node": {
-    "compilerOptions": {
-      "module": "CommonJS"
-    }
+    "esm": true,
+    "experimentalSpecifierResolution": "node"
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
+  "include": ["src/**/*.ts", "src/**/*.vue", "test/**/*.ts"]
 }