Merge pull request #53 from mirai-audio/fix-dependencies

Fix dependencies
oskarrough · Apr 29, 2019 · 51d2061 · 51d2061
2 parents ab51621 + 6631bc6
commit 51d2061
Show file tree

Hide file tree

Showing 4 changed files with 889 additions and 652 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,8 @@ env:
     - EMBER_TRY_SCENARIO=ember-lts-2.12
     - EMBER_TRY_SCENARIO=ember-lts-2.16
     - EMBER_TRY_SCENARIO=ember-lts-2.18
+    - EMBER_TRY_SCENARIO=ember-lts-3.4
+    - EMBER_TRY_SCENARIO=ember-lts-3.8
     - EMBER_TRY_SCENARIO=ember-release
     - EMBER_TRY_SCENARIO=ember-beta
     - EMBER_TRY_SCENARIO=ember-canary
@@ -33,6 +35,7 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
+    - env: EMBER_TRY_SCENARIO=ember-beta
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,71 +1,87 @@
-'use strict';
+"use strict";
 
-const getChannelURL = require('ember-source-channel-url');
+const getChannelURL = require("ember-source-channel-url");
 
 module.exports = function() {
-  return Promise.all([
-    getChannelURL('release'),
-    getChannelURL('beta'),
-    getChannelURL('canary'),
-  ]).then((urls) => {
-    return {
-      useYarn: true,
-      scenarios: [
-        {
-          name: 'ember-lts-2.12',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.12.0'
-            }
-          }
-        },
-        {
-          name: 'ember-lts-2.16',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.16.0'
-            }
-          }
-        },
-        {
-          name: 'ember-lts-2.18',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.18.0'
-            }
-          }
-        },
-        {
-          name: 'ember-release',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[0]
-            }
-          }
-        },
-        {
-          name: 'ember-beta',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[1]
-            }
-          }
-        },
-        {
-          name: 'ember-canary',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[2]
-            }
-          }
-        },
-        {
-          name: 'ember-default',
-          npm: {
-            devDependencies: {}
-          }
-        }
-      ]
-    };
-  });
+	return Promise.all([
+		getChannelURL("release"),
+		getChannelURL("beta"),
+		getChannelURL("canary")
+	]).then(urls => {
+		return {
+			useYarn: true,
+			scenarios: [
+				{
+					name: "ember-lts-2.12",
+					npm: {
+						devDependencies: {
+							"ember-source": "~2.12.0"
+						}
+					}
+				},
+				{
+					name: "ember-lts-2.16",
+					npm: {
+						devDependencies: {
+							"ember-source": "~2.16.0"
+						}
+					}
+				},
+				{
+					name: "ember-lts-2.18",
+					npm: {
+						devDependencies: {
+							"ember-source": "~2.18.0"
+						}
+					}
+				},
+				{
+					name: "ember-lts-3.4",
+					npm: {
+						devDependencies: {
+							"ember-source": "~3.4.0"
+						}
+					}
+				},
+				{
+					name: "ember-lts-3.8",
+					npm: {
+						devDependencies: {
+							"ember-source": "~3.8.0"
+						}
+					}
+				},
+				{
+					name: "ember-release",
+					npm: {
+						devDependencies: {
+							"ember-source": urls[0]
+						}
+					}
+				},
+				{
+					name: "ember-beta",
+					npm: {
+						devDependencies: {
+							"ember-source": urls[1]
+						}
+					}
+				},
+				{
+					name: "ember-canary",
+					npm: {
+						devDependencies: {
+							"ember-source": urls[2]
+						}
+					}
+				},
+				{
+					name: "ember-default",
+					npm: {
+						devDependencies: {}
+					}
+				}
+			]
+		};
+	});
 };
diff --git a/package.json b/package.json
@@ -23,21 +23,21 @@
     "deploy-demo": "ember build --envrionment=production; mv dist/index.html dist/200.html; surge dist ember-youtube.surge.sh"
   },
   "dependencies": {
-    "ember-cli-babel": "^6.6.0"
+    "ember-cli-babel": "^6.6.0",
+    "ember-concurrency": "^0.8.18",
+    "ember-cli-htmlbars": "^2.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "ember-ajax": "^3.0.0",
     "ember-cli": "~3.0.0",
     "ember-cli-dependency-checker": "^2.0.0",
     "ember-cli-eslint": "^4.2.1",
-    "ember-cli-htmlbars": "^2.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
     "ember-cli-shims": "^1.2.0",
     "ember-cli-uglify": "^2.0.0",
-    "ember-concurrency": "^0.8.18",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",