fix: set front-end to Node v20, fix use of ts-node

electricitymaps · Oct 27, 2023 · 63fccea · 63fccea
1 parent 5c10eea
commit 63fccea
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 21 deletions.
diff --git a/.github/workflows/deploy-preview-branch.yml b/.github/workflows/deploy-preview-branch.yml
@@ -21,10 +21,10 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: 8
-      - name: Setup Node v18.x
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: './web/.node-version'
       - name: Restore node_modules for web
         id: cache-web
         uses: actions/cache@v3

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -17,10 +17,10 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: 8
-      - name: Setup Node v18.x
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: './web/.node-version'
       - name: Restore node_modules for web
         id: cache-web
         uses: actions/cache@v3

diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
@@ -21,10 +21,10 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: 8
-      - name: Setup Node v18.x
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: './web/.node-version'
       - name: Restore node_modules for web
         id: cache-web
         uses: actions/cache@v3

diff --git a/.github/workflows/jsonlint.yml b/.github/workflows/jsonlint.yml
@@ -11,10 +11,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup Node LTS
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: './web/.node-version'
       - name: Install jsonlint-mod
         run: |
           npm install -g jsonlint-mod

diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
@@ -15,10 +15,10 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: 8
-      - name: Setup Node v18.x
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: './web/.node-version'
       - name: Restore node_modules for web
         id: cache-web
         uses: actions/cache@v3

diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
@@ -16,10 +16,10 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: 8
-      - name: Setup Node v18.x
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: './web/.node-version'
       - name: Restore node_modules for web
         id: cache-web
         uses: actions/cache@v3

diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
@@ -16,10 +16,10 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: 8
-      - name: Setup Node v18.x
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: './web/.node-version'
       - name: Restore node_modules for web
         id: cache-web
         uses: actions/cache@v3

diff --git a/.github/workflows/validate_generate_files.yml b/.github/workflows/validate_generate_files.yml
@@ -16,10 +16,10 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: 8
-      - name: Setup Node v18.x
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: './web/.node-version'
       - name: Restore node_modules for web
         id: cache-web
         uses: actions/cache@v3

diff --git a/.github/workflows/validate_generated_files.yml b/.github/workflows/validate_generated_files.yml
@@ -16,10 +16,10 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: 8
-      - name: Setup Node v18.x
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: './web/.node-version'
       - name: Restore node_modules
         id: cache
         uses: actions/cache@v3

diff --git a/mockserver/.node-version b/mockserver/.node-version
@@ -0,0 +1 @@
+20
diff --git a/web/.node-version b/web/.node-version
@@ -0,0 +1 @@
+20
diff --git a/web/package.json b/web/package.json
@@ -14,8 +14,8 @@
     "build": "pnpm update-version && vite build",
     "update-version": "echo '{\"version\": \"'$npm_package_version'\"}' > public/client-version.json",
     "create-generated-files": "pnpm run generate-world && pnpm run generate-zones-config",
-    "generate-world": "ts-node --esm ./geo/generateWorld.ts",
-    "generate-zones-config": "ts-node --esm ./scripts/generateZonesConfig.ts",
+    "generate-world": "node --import=./scripts/register-tsNodeESM.js ./geo/generateWorld.ts",
+    "generate-zones-config": "node --import=./scripts/register-tsNodeESM.js ./scripts/generateZonesConfig.ts",
     "predev": "pnpm run create-generated-files",
     "dev": "vite --open",
     "cy:component": "cypress open --component -b electron",
@@ -195,7 +195,7 @@
     "workbox-window": "7.0.0"
   },
   "engines": {
-    "node": ">=18",
+    "node": "^20",
     "pnpm": "^8"
   }
 }
diff --git a/web/scripts/register-tsNodeESM.js b/web/scripts/register-tsNodeESM.js
@@ -0,0 +1,3 @@
+import { register } from 'node:module';
+import { pathToFileURL } from 'node:url';
+register('ts-node/esm', pathToFileURL('./'));