Merge pull request #171 from simplabs/greenkeeper/ember-cli-3.0.0

Update ember-cli to the latest version 🚀

.gitignore

@@ -20,4 +20,5 @@ testem.log
 
 # ember-try
 .node_modules.ember-try/
+bower.json.ember-try
 package.json.ember-try

.npmignore

@@ -8,11 +8,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
-*.ember-try
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

config/ember-try.js

@@ -1,5 +1,50 @@
+'use strict';
+
 /* eslint-env node */
-module.exports = {
-  command: 'npm test',
-  useVersionCompatibility: true,
+
+const getChannelURL = require('ember-source-channel-url');
+
+module.exports = function() {
+  return Promise.all([
+    getChannelURL('release'),
+    getChannelURL('beta'),
+    getChannelURL('canary'),
+  ]).then((urls) => {
+    return {
+      command: 'npm test',
+      useVersionCompatibility: true,
+      scenarios: [
+        {
+          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: {}
+          }
+        }
+      ]
+    };
+  });
 };

ember-cli-build.js

@@ -1,4 +1,7 @@
+'use strict';
+
 /* eslint-env node */
+
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {

package.json

@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "broccoli-stew": "^1.4.0",
-    "ember-cli": "~2.18.0",
+    "ember-cli": "~3.0.0",
     "ember-cli-dependency-checker": "^2.0.1",
     "ember-cli-eslint": "^4.1.0",
     "ember-cli-htmlbars": "^2.0.2",
@@ -42,6 +42,8 @@
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.3.0",
     "ember-source": "~3.0.0",
+    "ember-source-channel-url": "^1.0.1",
+    "ember-try": "^0.2.23",
     "eslint": "^4.2.0",
     "eslint-config-simplabs": "^0.4.0",
     "eslint-plugin-ember": "^3.6.2",

tests/dummy/app/app.js

@@ -1,15 +1,9 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const { Application } = Ember;
-
-let App;
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

tests/dummy/app/index.html

@@ -9,8 +9,8 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
 
     {{content-for "head-footer"}}
   </head>

tests/dummy/app/router.js

@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const { Router: EmberRouter } = Ember;
-
 const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL

tests/dummy/config/environment.js

@@ -47,7 +47,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-    // nothing yet...
+    // here you can enable a production-specific feature
   }
 
   return ENV;

tests/dummy/config/targets.js

@@ -1,9 +1,20 @@
+'use strict';
+
 /* eslint-env node */
+
+const browsers = [
+  'last 1 Chrome versions',
+  'last 1 Firefox versions',
+  'last 1 Safari versions'
+];
+
+const isCI = Boolean(process.env.CI);
+const isProduction = process.env.EMBER_ENV === 'production';
+
+if (isCI || isProduction) {
+  browsers.push('ie 11');
+}
+
 module.exports = {
-  browsers: [
-    'ie 9',
-    'last 1 Chrome versions',
-    'last 1 Firefox versions',
-    'last 1 Safari versions'
-  ]
+  browsers
 };