ember-try: Use ember-source-channel-url for release channels

ef4 · Oct 16, 2020 · e58bde9 · e58bde9
1 parent faa6d49
commit e58bde9
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 76 deletions.
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,92 +1,67 @@
 /* eslint-env node */
-module.exports = {
-  useYarn: true,
-  scenarios: [
-    {
-      name: 'ember-3.10',
-      npm: {
-        devDependencies: {
-          'ember-source': '~3.10.0',
+
+const getChannelURL = require('ember-source-channel-url');
+
+module.exports = async function () {
+  return {
+    useYarn: true,
+    scenarios: [
+      {
+        name: 'ember-3.10',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.10.0',
+          },
         },
       },
-    },
-    {
-      name: 'ember-lts-3.12',
-      npm: {
-        devDependencies: {
-          'ember-source': '~3.12.0',
+      {
+        name: 'ember-lts-3.12',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.12.0',
+          },
         },
       },
-    },
-    {
-      name: 'ember-lts-3.16',
-      npm: {
-        devDependencies: {
-          'ember-source': '~3.16.0',
+      {
+        name: 'ember-lts-3.16',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.16.0',
+          },
         },
       },
-    },
-    {
-      name: 'ember-lts-3.20',
-      npm: {
-        devDependencies: {
-          'ember-source': '~3.20.0',
+      {
+        name: 'ember-lts-3.20',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.20.0',
+          },
         },
       },
-    },
-    {
-      name: 'ember-release',
-      bower: {
-        dependencies: {
-          ember: 'components/ember#release',
-        },
-        resolutions: {
-          ember: 'release',
-        },
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': null,
-        },
-      },
-    },
-    {
-      name: 'ember-beta',
-      bower: {
-        dependencies: {
-          ember: 'components/ember#beta',
-        },
-        resolutions: {
-          ember: 'beta',
+      {
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release'),
+          },
         },
       },
-      npm: {
-        devDependencies: {
-          'ember-source': null,
+      {
+        name: 'ember-beta',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('beta'),
+          },
         },
       },
-    },
-    {
-      name: 'ember-canary',
-      bower: {
-        dependencies: {
-          ember: 'components/ember#canary',
-        },
-        resolutions: {
-          ember: 'canary',
+      {
+        name: 'ember-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('canary'),
+          },
         },
       },
-      npm: {
-        devDependencies: {
-          'ember-source': null,
-        },
-      },
-    },
-    {
-      name: 'ember-default',
-      npm: {
-        devDependencies: {},
-      },
-    },
-  ],
+    ],
+  };
 };
diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "ember-resolver": "8.0.2",
     "ember-sinon": "5.0.0",
     "ember-source": "3.8.3",
+    "ember-source-channel-url": "^3.0.0",
     "ember-try": "1.4.0",
     "eslint": "7.11.0",
     "eslint-config-prettier": "6.12.0",

diff --git a/yarn.lock b/yarn.lock
@@ -4565,6 +4565,13 @@ ember-source-channel-url@^2.0.1:
   dependencies:
     got "^8.0.1"
 
+ember-source-channel-url@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-3.0.0.tgz#bcd5be72c63fa0b8c390b3121783b462063e2a1b"
+  integrity sha512-vF/8BraOc66ZxIDo3VuNP7iiDrnXEINclJgSJmqwAAEpg84Zb1DHPI22XTXSDA+E8fW5btPUxu65c3ZXi8AQFA==
+  dependencies:
+    node-fetch "^2.6.0"
+
 ember-source@3.8.3:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.8.3.tgz#831a4e792f06d1ff292595fad817eed8f2be9d0c"
@@ -7745,6 +7752,11 @@ nock@^12.0.3:
     lodash "^4.17.13"
     propagate "^2.0.0"
 
+node-fetch@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"