Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop Node.js 14 support #920

Merged
merged 12 commits into from
Aug 15, 2023
Merged

Drop Node.js 14 support #920

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cc6146a
Drop Node.js 14 support
SergeAstapov Mar 2, 2023
7faf7ab
pin ember-resolver in smoke test
mansona Jun 28, 2023
809dbaf
use local ember-try for smoke tests
mansona Jun 28, 2023
80d774a
add overrides for release beta canary
mansona Jun 28, 2023
6967ae0
Bump action versions
kategengler Aug 15, 2023
6a0c556
add fail-fast: false to smoke tests strategy
mansona Aug 15, 2023
16ca894
update @embroider/test-setup
mansona Aug 15, 2023
1cb9936
dynamically add overrides if the version is a pre-release in npm
mansona Aug 15, 2023
47498bd
Update versions used to test `ember try:ember`
kategengler Aug 15, 2023
b2255a0
only use overrides if using npm
mansona Aug 15, 2023
254b100
add tests for overrides functionality
mansona Aug 15, 2023
54f68f5
remove overrides form smoke test ember-try config
mansona Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions lib/dependency-manager-adapters/npm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -202,6 +203,15 @@ 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
mansona marked this conversation as resolved.
Show resolved Hide resolved
if (semver.prerelease(version) || /^https*:\/\/.*\.tg*z/.test(version)) {
if (!packageJSON.overrides) {
packageJSON.overrides = {};
}

packageJSON.overrides[packageName] = `$${packageName}`;
mansona marked this conversation as resolved.
Show resolved Hide resolved
}
}
});
},
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 2 additions & 0 deletions smoke-test-app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions smoke-test-app/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4195,6 +4195,7 @@ ember-try@../:
fs-extra "^6.0.1"
resolve "^1.20.0"
rimraf "^3.0.2"
semver "^7.5.4"
walk-sync "^2.2.0"

emoji-regex@^8.0.0:
Expand Down
7 changes: 7 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7036,6 +7036,13 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

semver@^7.5.4:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"

[email protected]:
version "0.17.1"
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
Expand Down
Loading