Merge 7843238 into e685ae8

eclipsesource · Aug 11, 2023 · 56977b7 · 56977b7
2 parents e685ae8 + 7843238
commit 56977b7
Show file tree

Hide file tree

Showing 6 changed files with 6,287 additions and 13,607 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -41,7 +41,7 @@ jobs:
         run: pnpm run lint
 
       - name: Test
-        if: matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-latest' || matrix.os == 'macos-latest'
         run: |
           set NODE_OPTIONS=--max_old_space_size=4096
           pnpm run test

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -42,8 +42,8 @@
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "report": "nyc report --reporter=html",
-    "test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} ava",
-    "test-cov": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} nyc ava",
+    "test": "ava",
+    "test-cov": "nyc ava",
     "doc": "typedoc --name 'JSON Forms Angular Core' --out docs src"
   },
   "nyc": {
@@ -61,7 +61,7 @@
       "ts"
     ],
     "require": [
-      "ts-node/register",
+      "./test-config/ts-node.config.js",
       "source-map-support/register"
     ]
   },
@@ -88,7 +88,6 @@
     "@typescript-eslint/parser": "^5.54.1",
     "ava": "~2.4.0",
     "copy-webpack-plugin": "^5.0.5",
-    "cross-env": "^7.0.2",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",

diff --git a/packages/angular/test-config/ts-node.config.js b/packages/angular/test-config/ts-node.config.js
@@ -0,0 +1,6 @@
+// Register ts-node and override ts options for ava
+require('ts-node').register({
+  compilerOptions: {
+    module: 'commonjs',
+  },
+});
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -42,8 +42,8 @@
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "report": "nyc report --reporter=html",
-    "test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\",\\\"target\\\":\\\"es5\\\"} ava",
-    "test-cov": "rimraf -rf .nyc_output && cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\",\\\"target\\\":\\\"es5\\\"} nyc ava",
+    "test": "ava",
+    "test-cov": "rimraf -rf .nyc_output && nyc ava",
     "doc": "typedoc --name 'JSON Forms Core' --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
   },
   "ava": {
@@ -55,7 +55,7 @@
       "ts"
     ],
     "require": [
-      "ts-node/register",
+      "./test-config/ts-node.config.js",
       "source-map-support/register"
     ]
   },
@@ -77,7 +77,6 @@
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "ava": "~2.4.0",
-    "cross-env": "^7.0.2",
     "document-register-element": "^1.14.3",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.7.0",

diff --git a/packages/core/test-config/ts-node.config.js b/packages/core/test-config/ts-node.config.js
@@ -0,0 +1,7 @@
+// Register ts-node and override ts options for ava
+require('ts-node').register({
+  compilerOptions: {
+    module: 'commonjs',
+    target: 'es5',
+  },
+});