diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc51e0f0..dfa2f30f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: - node-version: [14.x, 12.x] + node-version: [16.x, 14.x] os: [ubuntu-latest, windows-latest] steps: @@ -54,7 +54,7 @@ jobs: strategy: matrix: - node-version: [14.x, 12.x] + node-version: [16.x, 14.x] os: [ubuntu-latest, windows-latest] steps: @@ -76,7 +76,7 @@ jobs: strategy: matrix: - node-version: [14.x, 12.x] + node-version: [16.x, 14.x] os: [ubuntu-latest, windows-latest] steps: @@ -103,7 +103,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [14.x, 12.x] + node-version: [16.x, 14.x] steps: - name: Checkout Code diff --git a/package.json b/package.json index 87cf2581..269d239a 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "npm": false }, "volta": { - "node": "14.17.3", - "yarn": "1.22.10" + "node": "16.18.1", + "yarn": "1.22.19" } } diff --git a/packages/ember-cli-fastboot/config/ember-try.js b/packages/ember-cli-fastboot/config/ember-try.js index 2b47e3e7..0415f321 100644 --- a/packages/ember-cli-fastboot/config/ember-try.js +++ b/packages/ember-cli-fastboot/config/ember-try.js @@ -6,6 +6,10 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup'); module.exports = async function () { return { useYarn: true, + // don't use default `--no-lockfile` option, which has been causing these to fail + buildManagerOptions(/* scenario */) { + return ['--ignore-engines']; + }, scenarios: [ { name: 'ember-lts-3.16', diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json index f6135a29..38d1673e 100644 --- a/packages/ember-cli-fastboot/package.json +++ b/packages/ember-cli-fastboot/package.json @@ -101,7 +101,7 @@ "webpack": "^5.58.1" }, "engines": { - "node": "12.* || 14.* || >=16" + "node": "14.* || 16.* || >=18" }, "publishConfig": { "registry": "https://registry.npmjs.org/" diff --git a/packages/ember-cli-fastboot/test/fastboot-config-test.js b/packages/ember-cli-fastboot/test/fastboot-config-test.js index b49d3bbe..4c8caa9b 100644 --- a/packages/ember-cli-fastboot/test/fastboot-config-test.js +++ b/packages/ember-cli-fastboot/test/fastboot-config-test.js @@ -16,7 +16,6 @@ describe('FastBoot config', function () { return app .create('fastboot-config', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -24,6 +23,8 @@ describe('FastBoot config', function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/fastboot-location-config-test.js b/packages/ember-cli-fastboot/test/fastboot-location-config-test.js index db9fa444..d2385a0e 100644 --- a/packages/ember-cli-fastboot/test/fastboot-location-config-test.js +++ b/packages/ember-cli-fastboot/test/fastboot-location-config-test.js @@ -16,7 +16,6 @@ describe('FastBootLocation Configuration', function () { return app .create('fastboot-location-config', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -24,6 +23,8 @@ describe('FastBootLocation Configuration', function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/fastboot-location-test.js b/packages/ember-cli-fastboot/test/fastboot-location-test.js index 407a9fa8..9acb3c9f 100644 --- a/packages/ember-cli-fastboot/test/fastboot-location-test.js +++ b/packages/ember-cli-fastboot/test/fastboot-location-test.js @@ -15,7 +15,6 @@ describe('FastBootLocation', function () { return app .create('fastboot-location', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -23,6 +22,8 @@ describe('FastBootLocation', function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/package-json-test.js b/packages/ember-cli-fastboot/test/package-json-test.js index 9bc668f2..97c06a0a 100644 --- a/packages/ember-cli-fastboot/test/package-json-test.js +++ b/packages/ember-cli-fastboot/test/package-json-test.js @@ -18,7 +18,6 @@ describe('generating package.json', function () { before(function () { return customApp .create('customized-outputpaths', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -26,6 +25,8 @@ describe('generating package.json', function () { customApp.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return customApp.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/request-details-test.js b/packages/ember-cli-fastboot/test/request-details-test.js index 672b397b..e7e7e7cd 100644 --- a/packages/ember-cli-fastboot/test/request-details-test.js +++ b/packages/ember-cli-fastboot/test/request-details-test.js @@ -18,6 +18,8 @@ function injectMiddlewareAddon(app) { }; delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); } @@ -32,7 +34,6 @@ describe('request details', function () { return app .create('request', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) diff --git a/packages/ember-cli-fastboot/test/root-url-test.js b/packages/ember-cli-fastboot/test/root-url-test.js index f3a0038c..a0f97605 100644 --- a/packages/ember-cli-fastboot/test/root-url-test.js +++ b/packages/ember-cli-fastboot/test/root-url-test.js @@ -16,7 +16,6 @@ describe('rootUrl acceptance', function () { return app .create('root-url', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -24,6 +23,8 @@ describe('rootUrl acceptance', function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); }) diff --git a/yarn.lock b/yarn.lock index 4880e0fc..9c9f188b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17937,9 +17937,9 @@ workerpool@6.1.5, workerpool@^6.1.4: integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw== workerpool@^2.3.0: - version "2.3.3" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.3.tgz#49a70089bd55e890d68cc836a19419451d7c81d7" - integrity sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA== + version "2.3.4" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.4.tgz#661335ded59a08c01ca009e30cc96929a7b4b0aa" + integrity sha512-c2EWrgB9IKHi1jbf4LG9sxKgHYOY+Ej5li6siEGtFecCXWG7eQOqATPEJ0rg1KFETXROEkErc1t5XiNrLG666Q== dependencies: object-assign "4.1.1"