Merge pull request #920 from SergeAstapov/drop-node-14

ember-cli · Aug 15, 2023 · 9d9763a · 9d9763a
2 parents c92dc69 + 54f68f5
commit 9d9763a
Show file tree

Hide file tree

Showing 10 changed files with 18,001 additions and 27,376 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,10 +18,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
 
       - run: yarn install
       - run: yarn lint
@@ -35,7 +35,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: yarn
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: yarn
       - name: Install Dependencies
         run: yarn install --no-lockfile
@@ -85,9 +85,9 @@ jobs:
           - ./node_modules/.bin/ember try:each --config-path='../test/fixtures/dummy-ember-try-config.js' --skip-cleanup true
 
           # try:ember
-          - ./node_modules/.bin/ember try:ember '> 3.28.0 < 4.2.0'
-          - ./node_modules/.bin/ember try:ember '4.1.0' --config-path='../test/fixtures/dummy-ember-try-config.js'
-          - ./node_modules/.bin/ember try:ember '4.2.0' --skip-cleanup=true
+          - ./node_modules/.bin/ember try:ember '> 4.10.0 < 5.2.0'
+          - ./node_modules/.bin/ember try:ember '4.9.0' --config-path='../test/fixtures/dummy-ember-try-config.js'
+          - ./node_modules/.bin/ember try:ember '4.8.3' --skip-cleanup=true
 
           # try:config
           - ./node_modules/.bin/ember try:config
@@ -132,10 +132,10 @@ jobs:
           - ./node_modules/.bin/ember try:each --config-path='../test/fixtures/dummy-ember-try-config-fs-extra-scenarios.js'
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
 
       - name: install deps
         run: yarn install
@@ -150,8 +150,9 @@ jobs:
 
   npm-smoke-tests:
     strategy:
+      fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
 
     name: Smoke Tests (Node v${{ matrix.node }} with npm)
     runs-on: ubuntu-latest
@@ -162,8 +163,8 @@ jobs:
       - test
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
 
@@ -177,8 +178,9 @@ jobs:
 
   yarn-smoke-tests:
     strategy:
+      fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
 
     name: Smoke Tests (Node v${{ matrix.node }} with yarn)
     runs-on: ubuntu-latest
@@ -189,8 +191,8 @@ jobs:
       - test
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
 
@@ -212,10 +214,10 @@ jobs:
       - test
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
 
       - name: install deps
         run: yarn install

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,6 +15,7 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           registry-url: 'https://registry.npmjs.org'
+          node-version: 16
 
       - name: auto-dist-tag
         run: npx auto-dist-tag@1 --write

diff --git a/lib/dependency-manager-adapters/npm.js b/lib/dependency-manager-adapters/npm.js
@@ -8,6 +8,7 @@ const path = require('path');
 const debug = require('debug')('ember-try:dependency-manager-adapter:npm');
 const rimraf = util.promisify(require('rimraf'));
 const chalk = require('chalk');
+const semver = require('semver');
 
 module.exports = CoreObject.extend({
   init() {
@@ -202,6 +203,18 @@ module.exports = CoreObject.extend({
         delete packageJSON[kindOfDependency][packageName];
       } else {
         packageJSON[kindOfDependency][packageName] = version;
+
+        // in npm we need to always add an override if the version is a pre-release
+        if (
+          !this.useYarnCommand &&
+          (semver.prerelease(version) || /^https*:\/\/.*\.tg*z/.test(version))
+        ) {
+          if (!packageJSON.overrides) {
+            packageJSON.overrides = {};
+          }
+
+          packageJSON.overrides[packageName] = `$${packageName}`;
+        }
       }
     });
   },

diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "fs-extra": "^6.0.1",
     "resolve": "^1.20.0",
     "rimraf": "^3.0.2",
+    "semver": "^7.5.4",
     "walk-sync": "^2.2.0"
   },
   "devDependencies": {
@@ -60,7 +61,7 @@
     "tmp-sync": "^1.1.0"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18.*"
+    "node": "16.* || >= 18.*"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"