chore: use node v20 in GH actions

SoftwareBrothers · Feb 20, 2024 · 2e92ca1 · 2e92ca1
1 parent c013a17
commit 2e92ca1
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 117 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Setup
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'yarn'
       - name: Install
         run: yarn install --frozen-lockfile
@@ -26,7 +26,7 @@ jobs:
       - name: Setup
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'yarn'
       - name: Install
         run: yarn install
@@ -90,7 +90,7 @@ jobs:
       - name: Setup
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'yarn'
       - name: Install
         run: yarn install
@@ -134,7 +134,7 @@ jobs:
       - name: Setup
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'yarn'
       - name: Install
         run: yarn install

diff --git a/bin/bundle-globals.js b/bin/bundle-globals.js
diff --git a/bin/watch-dev.js b/bin/watch-dev.js
diff --git a/package.json b/package.json
@@ -174,6 +174,7 @@
     "semantic-release-slack-bot": "^4.0.0",
     "sinon": "^15.0.2",
     "sinon-chai": "^3.7.0",
+    "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
   },
   "resolutions": {

diff --git a/src/backend/utils/router/router.ts b/src/backend/utils/router/router.ts
@@ -4,8 +4,7 @@ import { createRequire } from 'node:module'
 
 import AppController from '../../controllers/app-controller.js'
 import ApiController from '../../controllers/api-controller.js'
-import env from '../../bundler/bundler-env.js'
-import { COMPONENTS_OUTPUT_PATH } from '../../bundler/utils/constants.js'
+import { COMPONENTS_OUTPUT_PATH, NODE_ENV } from '../../bundler/utils/constants.js'
 
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 const ASSETS_ROOT = `${__dirname}/../lib/../../../frontend/assets/`
@@ -20,7 +19,7 @@ const resolveDesignSystemBundle = (): string => {
 
   return path.join(
     path.parse(require.resolve('@adminjs/design-system')).dir,
-    `../bundle.${env}.js`,
+    `../bundle.${NODE_ENV}.js`,
   )
 }
 
@@ -65,10 +64,10 @@ export const Router: RouterType = {
     src: path.join(ASSETS_ROOT, 'fonts/icomoon.woff'),
   }, {
     path: '/frontend/assets/app.bundle.js',
-    src: path.join(ASSETS_ROOT, `scripts/app-bundle.${env}.js`),
+    src: path.join(ASSETS_ROOT, `scripts/app-bundle.${NODE_ENV}.js`),
   }, {
     path: '/frontend/assets/global.bundle.js',
-    src: path.join(ASSETS_ROOT, `scripts/global-bundle.${env}.js`),
+    src: path.join(ASSETS_ROOT, `scripts/global-bundle.${NODE_ENV}.js`),
   }, {
     path: '/frontend/assets/design-system.bundle.js',
     src: resolveDesignSystemBundle(),

diff --git a/yarn.lock b/yarn.lock
@@ -9861,6 +9861,25 @@ ts-node@^10.8.1:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
+ts-node@^10.9.2:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
+  dependencies:
+    "@cspotcode/source-map-support" "^0.8.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.1"
+    yn "3.1.1"
+
 tsconfig-paths@^3.14.1:
   version "3.14.2"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"