diff --git a/package-lock.json b/package-lock.json index bb0502a..229c8a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "ember-source": "~4.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^5.7.2", - "ember-try": "^2.0.0", + "ember-try": "github:ember-cli/ember-try#master", "eslint": "^8.37.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-ember": "^11.5.0", @@ -13764,10 +13764,10 @@ "dev": true }, "node_modules/ember-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ember-try/-/ember-try-2.0.0.tgz", - "integrity": "sha512-2N7Vic45sbAegA5fhdfDjVbEVS4r+ze+tTQs2/wkY+8fC5yAGHfCM5ocyoTfBN5m7EhznC3AyMsOy4hLPzHFSQ==", + "version": "3.0.0-beta.1", + "resolved": "git+ssh://git@github.com/ember-cli/ember-try.git#81c6107779ba1422e9ffae7df77c3477e1b02b0e", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.2", "cli-table3": "^0.6.0", @@ -13775,13 +13775,13 @@ "debug": "^4.3.2", "ember-try-config": "^4.0.0", "execa": "^4.1.0", - "fs-extra": "^9.0.1", + "fs-extra": "^6.0.1", "resolve": "^1.20.0", "rimraf": "^3.0.2", "walk-sync": "^2.2.0" }, "engines": { - "node": "10.* || 12.* || >= 14.*" + "node": "14.* || 16.* || >= 18.*" } }, "node_modules/ember-try-config": { @@ -13882,30 +13882,14 @@ } }, "node_modules/ember-try/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ember-try/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", + "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", "dev": true, "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "node_modules/ember-try/node_modules/matcher-collection": { @@ -13936,15 +13920,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/ember-try/node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/ember-try/node_modules/walk-sync": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz", @@ -39073,10 +39048,9 @@ } }, "ember-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ember-try/-/ember-try-2.0.0.tgz", - "integrity": "sha512-2N7Vic45sbAegA5fhdfDjVbEVS4r+ze+tTQs2/wkY+8fC5yAGHfCM5ocyoTfBN5m7EhznC3AyMsOy4hLPzHFSQ==", + "version": "git+ssh://git@github.com/ember-cli/ember-try.git#81c6107779ba1422e9ffae7df77c3477e1b02b0e", "dev": true, + "from": "ember-try@github:ember-cli/ember-try#master", "requires": { "chalk": "^4.1.2", "cli-table3": "^0.6.0", @@ -39084,7 +39058,7 @@ "debug": "^4.3.2", "ember-try-config": "^4.0.0", "execa": "^4.1.0", - "fs-extra": "^9.0.1", + "fs-extra": "^6.0.1", "resolve": "^1.20.0", "rimraf": "^3.0.2", "walk-sync": "^2.2.0" @@ -39134,25 +39108,14 @@ } }, "fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "requires": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", + "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", "dev": true, "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "matcher-collection": { @@ -39174,12 +39137,6 @@ "glob": "^7.1.3" } }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - }, "walk-sync": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz", diff --git a/package.json b/package.json index ed86162..01fcf0f 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "ember-source": "~4.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^5.7.2", - "ember-try": "^2.0.0", + "ember-try": "github:ember-cli/ember-try#master", "eslint": "^8.37.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-ember": "^11.5.0", diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js index 21149d9..696484f 100644 --- a/tests/dummy/config/ember-try.js +++ b/tests/dummy/config/ember-try.js @@ -71,6 +71,9 @@ module.exports = async function () { devDependencies: { 'ember-source': await getChannelURL('release'), }, + overrides: { + 'ember-source': '$ember-source', + }, }, }, { @@ -79,6 +82,9 @@ module.exports = async function () { devDependencies: { 'ember-source': await getChannelURL('beta'), }, + overrides: { + 'ember-source': '$ember-source', + }, }, }, { @@ -87,6 +93,9 @@ module.exports = async function () { devDependencies: { 'ember-source': await getChannelURL('canary'), }, + overrides: { + 'ember-source': '$ember-source', + }, }, }, {