Merge pull request #1594 from embroider-build/remove-volta

remove volta from CI

.github/actions/setup/action.yml

@@ -8,19 +8,17 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - uses: volta-cli/action@v4
-      env:
-        ACTIONS_STEP_DEBUG: truex 
-    - name: Get pnpm cache directory path
-      id: pnpm-cache-dir-path
-      run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+    - name: remove pinned node version
+      run: echo "auto-install-peers=false" > .npmrc
       shell: bash
-    - uses: actions/cache@v3
-      id: pnpm-cache
+    - uses: pnpm/action-setup@v2
+      name: Install pnpm
       with:
-        path: ${{ steps.pnpm-cache-dir-path.outputs.STORE_PATH }}
-        key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}-v1
-        restore-keys: |
-          ${{ runner.os }}-pnpm-
+        version: 8
+        run_install: false
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+        cache: pnpm
     - run: pnpm install ${{ fromJSON('{"false":"--no-lockfile", "true":"--frozen-lockfile"}')[inputs.use_lockfile] }}
       shell: bash

.npmrc

@@ -1 +1,2 @@
-auto-install-peers=false
+auto-install-peers=false
+use-node-version=16.20.0

package.json

@@ -53,10 +53,6 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "volta": {
-    "node": "16.20.0",
-    "pnpm": "8.9.2"
-  },
   "changelog": {
     "__comment__": "Our release infrastructure relies on these exact labels. Be careful changing them.",
     "labels": {

packages/addon-dev/package.json

@@ -48,8 +48,5 @@
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/addon-shim/package.json

@@ -29,8 +29,5 @@
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/babel-loader-9/package.json

@@ -20,8 +20,5 @@
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/compat/package.json

@@ -95,8 +95,5 @@
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/core/package.json

@@ -66,8 +66,5 @@
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/hbs-loader/package.json

@@ -30,8 +30,5 @@
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/macros/package.json

@@ -65,8 +65,5 @@
   },
   "ember-addon": {
     "main": "src/ember-addon-main.js"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/router/package.json

@@ -90,8 +90,5 @@
         "dist/*"
       ]
     }
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/shared-internals/package.json

@@ -55,8 +55,5 @@
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/test-setup/package.json

@@ -39,8 +39,5 @@
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/util/package.json

@@ -102,8 +102,5 @@
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "main": "addon-main.js"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

packages/webpack/package.json

@@ -59,8 +59,5 @@
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

test-packages/release/package.json

@@ -22,8 +22,5 @@
     "latest-version": "^5.0.0",
     "semver": "^7.3.5",
     "yargs": "^17.0.1"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

test-packages/sample-transforms/package.json

@@ -58,8 +58,5 @@
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

test-packages/support/package.json

@@ -34,8 +34,5 @@
     "@types/fs-extra": "^9.0.12",
     "@types/lodash": "^4.14.170",
     "@types/node": "^10.5.2"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

test-packages/unstable-release/package.json

@@ -11,9 +11,6 @@
     "fs-extra": "^9.1.0",
     "globby": "^11.0.3"
   },
-  "volta": {
-    "extends": "../../package.json"
-  },
   "devDependencies": {
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",

tests/app-template/package.json

@@ -72,9 +72,5 @@
   },
   "ember": {
     "edition": "octane"
-  },
-  "volta": {
-    "node": "16.20.0",
-    "pnpm": "8.9.2"
   }
 }

tests/fixtures/engines-host-app/lib/lazy-in-repo-engine/package.json

@@ -10,8 +10,5 @@
   },
   "devDependencies": {
     "ember-engines": "*"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

tests/scenarios/package.json

@@ -83,8 +83,5 @@
     "execa": "^5.1.1",
     "tslib": "^2.6.0",
     "typescript": "^5.1.6"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }

tests/scenarios/shared-internals-test.ts

@@ -5,27 +5,25 @@ const { module: Qmodule, test } = QUnit;
 
 Scenarios.fromProject(() => new Project('shared-internals-tests'))
   .map('shared-internals', project => {
-    project.pkg.volta = {
-      node: '12.22.1',
-    };
     project.linkDependency('@embroider/shared-internals', { baseDir: __dirname });
     project.linkDependency('qunit', { baseDir: __dirname });
     project.linkDependency('semver', { baseDir: __dirname });
 
     project.mergeFiles({
+      '.npmrc': 'use-node-version=12.22.1',
       'test.js': `
         const { module: QModule, test } = require("qunit");
         const semver = require("semver");
         const { PackageCache } = require("@embroider/shared-internals");
-        
+
         QModule("shared-internals", function () {
           test("testing on node 12", function (assert) {
             assert.ok(
               semver.satisfies(process.version, "^12.0.0"),
               \`\${process.version} should be what we expected\`
             );
           });
-        
+
           test("smoke test", async function (assert) {
             let pk = PackageCache.shared("my-test", __dirname);
             assert.equal(pk.get(__dirname).name, "shared-internals-tests");
@@ -39,14 +37,7 @@ Scenarios.fromProject(() => new Project('shared-internals-tests'))
       test('run tests', async function (assert) {
         let app = await scenario.prepare();
 
-        // if we just try to invoke node directly in a child process, our own
-        // volta settings dominate over the test app's
-        let tryit = await app.execute('volta which node');
-        if (tryit.exitCode !== 0) {
-          throw new Error('unable to locate our node version');
-        }
-        let nodebin = tryit.output.trim();
-        let result = await app.execute(`${nodebin} ./node_modules/qunit/bin/qunit.js ./test.js`);
+        let result = await app.execute(`pnpm ./node_modules/qunit/bin/qunit.js ./test.js`);
         assert.equal(result.exitCode, 0, result.output);
       });
     });

tests/ts-app-template/package.json

@@ -37,8 +37,8 @@
     "@embroider/test-setup": "workspace:*",
     "@embroider/webpack": "workspace:*",
     "@glimmer/component": "^1.1.2",
-    "@glimmer/interfaces": "0.84.2",
-    "@glimmer/reference": "0.84.2",
+    "@glimmer/interfaces": "^0.84.2",
+    "@glimmer/reference": "^0.84.2",
     "@glimmer/tracking": "^1.1.2",
     "@glint/environment-ember-loose": "^1.1.0",
     "@glint/template": "^1.1.0",