Merge pull request #121 from romgere/fix_ember_try

fix ember try CI step

.github/workflows/ci.yml

@@ -80,8 +80,8 @@ jobs:
       fail-fast: true
       matrix:
         ember-try-scenario:
-          - ember-3.25
-          - ember-3.26
+          - ember-4.4
+          - ember-4.8
           - ember-release
           - ember-beta
           - ember-canary

config/ember-try.js

@@ -4,20 +4,28 @@ const getChannelURL = require('ember-source-channel-url');
 
 module.exports = async function () {
   return {
+    /**
+     * Related to https://github.com/emberjs/ember.js/issues/20418
+     * This prevent npm to break ember-canary & ember-beta :
+     * [email protected] have an optional peerDependency to ember-source ^4.8.3 & it make npm break (where yarn does not).
+     * Adding this option will prevent npm to complain about this
+     */
+    npmOptions: ['--legacy-peer-deps'],
+
     scenarios: [
       {
-        name: 'ember-3.25',
+        name: 'ember-4.4',
         npm: {
           devDependencies: {
-            'ember-source': '~3.25.0',
+            'ember-source': '~4.4.0',
           },
         },
       },
       {
-        name: 'ember-3.26',
+        name: 'ember-4.8',
         npm: {
           devDependencies: {
-            'ember-source': '~3.26.0',
+            'ember-source': '~4.8.0',
           },
         },
       },
@@ -34,6 +42,9 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('beta'),
+            // https://github.com/emberjs/ember.js/issues/20418
+            'ember-resolver': '10.0.0',
+            '@ember/string': '3.0.1',
           },
         },
       },
@@ -42,6 +53,9 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('canary'),
+            // https://github.com/emberjs/ember.js/issues/20418
+            'ember-resolver': '10.0.0',
+            '@ember/string': '3.0.1',
           },
         },
       },

package.json

@@ -51,6 +51,7 @@
     "@types/ember__component": "^3.16.7",
     "@types/ember__controller": "^3.16.7",
     "@types/ember__debug": "^3.16.7",
+    "@types/ember__destroyable": "3.22.0",
     "@types/ember__engine": "^3.16.4",
     "@types/ember__error": "^3.16.2",
     "@types/ember__object": "^3.12.7",
@@ -76,7 +77,6 @@
     "ember-cli-terser": "^4.0.2",
     "ember-cli-typescript-blueprints": "^3.0.0",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^1.0.0",
     "ember-page-title": "^7.0.0",
@@ -85,7 +85,7 @@
     "ember-source": "~4.2.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^3.2.0",
-    "ember-try": "^2.0.0",
+    "ember-try": "^3.0.0-beta.1",
     "eslint": "^7.20.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.2.0",

yarn.lock

@@ -3069,7 +3069,7 @@
     "@types/ember__engine" "^3"
     "@types/ember__object" "^3"
 
-"@types/ember__destroyable@*":
+"@types/ember__destroyable@*", "@types/[email protected]":
   version "3.22.0"
   resolved "https://registry.npmjs.org/@types/ember__destroyable/-/ember__destroyable-3.22.0.tgz#2af2c27f5d8996694c3f0fe906e2536b2e4c5aca"
   integrity sha512-T5wZGK1MwEelNIv1bbAvRQZPo9zvfjpGyyFPwjz+sakjImKVcQzb/yq1SgGyT0QTAQAT7l0L+kFru9+fSVVo5A==
@@ -7177,11 +7177,6 @@ ember-disable-prototype-extensions@^1.1.3:
   resolved "https://registry.npmjs.org/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
   integrity sha1-GWkTUhdlS14nj5/i2dTkm1cgMp4=
 
-ember-export-application-global@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
-  integrity sha512-B7wiurPgsxsSGzJuPFkpBWnaeuCu2PGpG2BjyrfA1VcL7//o+5RSnZqiCEY326y7qmxb2GoCgo0ft03KBU0rRw==
-
 ember-load-initializers@^2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ember-load-initializers/-/ember-load-initializers-2.1.2.tgz#8a47a656c1f64f9b10cecdb4e22a9d52ad9c7efa"
@@ -7343,18 +7338,18 @@ ember-try-config@^4.0.0:
     remote-git-tags "^3.0.0"
     semver "^7.3.2"
 
-ember-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-2.0.0.tgz#2671c221f5a0335fa2c189d00db7146e2e72a1dd"
-  integrity sha512-2N7Vic45sbAegA5fhdfDjVbEVS4r+ze+tTQs2/wkY+8fC5yAGHfCM5ocyoTfBN5m7EhznC3AyMsOy4hLPzHFSQ==
+ember-try@^3.0.0-beta.1:
+  version "3.0.0-beta.1"
+  resolved "https://registry.npmjs.org/ember-try/-/ember-try-3.0.0-beta.1.tgz#2809d95ac48f72d989516e20ea589b6ca856ea91"
+  integrity sha512-L8Nuy1iJZQmaEvxycTXCKe67K85f44DLRvwZL5ow8WtPdaZQuAHs9fJmYEGI1uyymf4MJChu6wwyh3tLSHiCag==
   dependencies:
     chalk "^4.1.2"
     cli-table3 "^0.6.0"
     core-object "^3.1.5"
     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"