fix issues with ember-try and npm peer dependencies

mansona · Jun 28, 2022 · 86d00d2 · 86d00d2
1 parent 58583fb
commit 86d00d2
Showing 4 changed files with 685 additions and 1,232 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm i -g npm@7
+      - run: npm i -g npm@8
       - run: npm ci
       - run: npm run lint
 
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm i -g npm@7
+      - run: npm i -g npm@8
       - run: npm ci
       - run: npm run test:ember
 
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm i -g npm@7
+      - run: npm i -g npm@8
       - run: npm install --no-package-lock
       - run: npm run test:ember
 
@@ -81,7 +81,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm i -g npm@7
+      - run: npm i -g npm@8
       - run: npm ci
 
       - name: test

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -60,6 +60,9 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': await getChannelURL('release'),
           },
+          overrides: {
+            'ember-source': '$ember-source',
+          },
         },
       },
       {
@@ -68,6 +71,9 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': await getChannelURL('beta'),
           },
+          overrides: {
+            'ember-source': '$ember-source',
+          },
         },
       },
       {
@@ -76,6 +82,9 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': await getChannelURL('canary'),
           },
+          overrides: {
+            'ember-source': '$ember-source',
+          },
         },
       },
       {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "ember-source": "~3.28.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^3.6.0",
-    "ember-try": "^1.4.0",
+    "ember-try": "https://git@github.com/mansona/ember-try.git#npm-overrides",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.4",