Skip to content

Commit 1cb9936

Browse files
committed
dynamically add overrides if the version is a pre-release in npm
1 parent 16ca894 commit 1cb9936

File tree

5 files changed

+21
-0
lines changed

5 files changed

+21
-0
lines changed

lib/dependency-manager-adapters/npm.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const path = require('path');
88
const debug = require('debug')('ember-try:dependency-manager-adapter:npm');
99
const rimraf = util.promisify(require('rimraf'));
1010
const chalk = require('chalk');
11+
const semver = require('semver');
1112

1213
module.exports = CoreObject.extend({
1314
init() {
@@ -202,6 +203,15 @@ module.exports = CoreObject.extend({
202203
delete packageJSON[kindOfDependency][packageName];
203204
} else {
204205
packageJSON[kindOfDependency][packageName] = version;
206+
207+
// in npm we need to always add an override if the version is a pre-release
208+
if (semver.prerelease(version) || /^https*:\/\/.*\.tg*z/.test(version)) {
209+
if (!packageJSON.overrides) {
210+
packageJSON.overrides = {};
211+
}
212+
213+
packageJSON.overrides[packageName] = `$${packageName}`;
214+
}
205215
}
206216
});
207217
},

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"fs-extra": "^6.0.1",
3939
"resolve": "^1.20.0",
4040
"rimraf": "^3.0.2",
41+
"semver": "^7.5.4",
4142
"walk-sync": "^2.2.0"
4243
},
4344
"devDependencies": {

smoke-test-app/package-lock.json

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

smoke-test-app/yarn.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4195,6 +4195,7 @@ ember-try@../:
41954195
fs-extra "^6.0.1"
41964196
resolve "^1.20.0"
41974197
rimraf "^3.0.2"
4198+
semver "^7.5.4"
41984199
walk-sync "^2.2.0"
41994200

42004201
emoji-regex@^8.0.0:

yarn.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7036,6 +7036,13 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
70367036
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
70377037
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
70387038

7039+
semver@^7.5.4:
7040+
version "7.5.4"
7041+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
7042+
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
7043+
dependencies:
7044+
lru-cache "^6.0.0"
7045+
70397046
70407047
version "0.17.1"
70417048
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"

0 commit comments

Comments
 (0)