CI update

shockpkg · Nov 5, 2023 · ad6714f · ad6714f
1 parent a80e447
commit ad6714f
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 21 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -10,47 +10,60 @@ jobs:
       matrix:
         config:
           - node-version: '18.12.0' # LTS
+            CODE_TEST: 'test-legacy'
             PKGSET: ''
             PKG: ''
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '18.18.2' # LTS
+            CODE_TEST: 'test-legacy'
+            PKGSET: ''
+            PKG: ''
+
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             CODE_CHECK: 1
             PKGSET: ''
             PKG: ''
 
-          - node-version: '20.8.0' # Latest
+          - node-version: '21.1.0' # Latest
+            CODE_TEST: 'test'
             PKGSET: ''
             PKG: ''
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '7-windows'
             PKG:
               - shockwave-projector-director-7.0.0-win-win
               - shockwave-projector-director-7.0.2-2-win-win
               - shockwave-projector-director-7.0.2-trial-win-win
               - shockwave-projector-director-7.0.2-win-win
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '8-windows'
             PKG:
               - shockwave-projector-director-8.0.0-trial-win-win
               - shockwave-projector-director-8.0.0-win-win
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '8.5-windows'
             PKG:
               - shockwave-projector-director-8.5.0-win-win
               - shockwave-projector-director-8.5.0-trial-win-win
               - shockwave-projector-director-8.5.1-win-win
               - shockwave-projector-director-8.5.1-trial-win-win
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '9-windows'
             PKG:
               - shockwave-projector-director-9.0.0-win-win
               - shockwave-projector-director-9.0.0-trial-win-win
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '10-windows'
             PKG:
               - shockwave-projector-director-10.0.0-mac-win
@@ -60,7 +73,8 @@ jobs:
               - shockwave-projector-director-10.1.1-mac-win
               - shockwave-projector-director-10.1.1-win-win
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '11-windows'
             PKG:
               - shockwave-projector-director-11.0.0-mac-win
@@ -69,7 +83,8 @@ jobs:
               - shockwave-projector-director-11.0.0-hotfix-3-mac-win
               - shockwave-projector-director-11.0.0-hotfix-3-win-win
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '11.5-windows'
             PKG:
               - shockwave-projector-director-11.5.0-mac-win
@@ -79,15 +94,17 @@ jobs:
               - shockwave-projector-director-11.5.9-mac-win
               - shockwave-projector-director-11.5.9-win-win
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '12-windows'
             PKG:
               - shockwave-projector-director-12.0.0-mac-win
               - shockwave-projector-director-12.0.0-win-win
               - shockwave-projector-director-12.0.2-mac-win
               - shockwave-projector-director-12.0.2-win-win
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '11-mac'
             PKG:
               - shockwave-projector-director-11.0.0-mac-mac-zip
@@ -96,7 +113,8 @@ jobs:
               - shockwave-projector-director-11.0.0-hotfix-3-mac-mac-zip
               - shockwave-projector-director-11.0.0-hotfix-3-win-mac-zip
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '11.5-mac'
             PKG:
               - shockwave-projector-director-11.5.0-mac-mac-zip
@@ -106,7 +124,8 @@ jobs:
               - shockwave-projector-director-11.5.9-mac-mac-zip
               - shockwave-projector-director-11.5.9-win-mac-zip
 
-          - node-version: '18.18.0' # LTS (current)
+          - node-version: '20.9.0' # LTS (current)
+            CODE_TEST: 'test-legacy'
             PKGSET: '12-mac'
             PKG:
               - shockwave-projector-director-12.0.0-mac-mac-zip
@@ -148,11 +167,11 @@ jobs:
       - name: Build
         run: npm run build
 
-      - name: Test CJS
-        run: npm run test:cjs
-
       - name: Test ESM
-        run: npm run test:esm
+        run: npm run ${{ matrix.config.CODE_TEST }}:esm
+
+      - name: Test CJS
+        run: npm run ${{ matrix.config.CODE_TEST }}:cjs
 
       - name: Lint
         run: npm run lint
@@ -175,7 +194,7 @@ jobs:
       - name: Node
         uses: actions/setup-node@v3
         with:
-          node-version: '18.18.0'
+          node-version: '20.9.0'
           registry-url: https://registry.npmjs.org/
 
       - name: Dependencies

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.18.0
+20.9.0
diff --git a/package.json b/package.json
@@ -37,9 +37,15 @@
 		"build:esm": "babel --env-name esm -x .ts -s true -d esm --out-file-extension .mjs src",
 		"build:cjs": "babel --env-name cjs -x .ts -s true -d cjs --out-file-extension .js src",
 		"build": "npm run build:dts && npm run build:esm && npm run build:cjs",
-		"test:esm": "node -r source-map-support/register --test esm",
-		"test:cjs": "node -r source-map-support/register --test cjs",
+		"test-legacy:esm": "node -r source-map-support/register --test esm",
+		"test-legacy:cjs": "node -r source-map-support/register --test cjs",
+		"test-legacy": "npm run test-legacy:esm && npm run test-legacy:cjs",
+		"test:esm": "node -r source-map-support/register --test 'esm/**/*.mjs'",
+		"test:cjs": "node -r source-map-support/register --test 'cjs/**/*.js'",
 		"test": "npm run test:esm && npm run test:cjs",
+		"all-legacy:esm": "npm run clean && npm run build:esm && npm run test-legacy:esm && npm run lint && npm run formatted",
+		"all-legacy:cjs": "npm run clean && npm run build:cjs && npm run test-legacy:cjs && npm run lint && npm run formatted",
+		"all-legacy": "npm run clean && npm run build && npm run test-legacy && npm run lint && npm run formatted",
 		"all:esm": "npm run clean && npm run build:esm && npm run test:esm && npm run lint && npm run formatted",
 		"all:cjs": "npm run clean && npm run build:cjs && npm run test:cjs && npm run lint && npm run formatted",
 		"all": "npm run clean && npm run build && npm run test && npm run lint && npm run formatted",