fix(cli): update to latest cli (#84)

fix an issue introduced in 12c1c89. Previously, when deploying the dummy app (prod build) or serving the app locally with prod (e s -prod), you would get a run-time error in vendor.js. This fixes the bug.
open-tux · Oct 22, 2017 · c207417 · c207417
1 parent 6e83009
commit c207417
Show file tree

Hide file tree

Showing 12 changed files with 515 additions and 421 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,14 +15,18 @@ cache:
   yarn: true
 
 env:
-  # we recommend new addons test the current and previous LTS
-  # as well as latest stable release (bonus points to beta/canary)
-  - EMBER_TRY_SCENARIO=ember-lts-2.8
-  - EMBER_TRY_SCENARIO=ember-lts-2.12
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
-  - EMBER_TRY_SCENARIO=ember-default
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+  matrix:
+    # we recommend new addons test the current and previous LTS
+    # as well as latest stable release (bonus points to beta/canary)
+    - EMBER_TRY_SCENARIO=ember-lts-2.8
+    - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true

diff --git a/README.md b/README.md
@@ -29,12 +29,13 @@ This will automatically install the `ember-cli-sass` NPM dependency and create a
 ember install ember-font-awesome
 ```
 
-## deploy
+## Deploy
 
 Deploy the demo app:
 
 ```sh
 ember deploy production
+git push upstream gh-pages
 ```
 
 

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -6,9 +6,6 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 module.exports = function(defaults) {
   let app = new EmberAddon(defaults, {
     // Add options here
-    babel: {
-      plugins: ['transform-decorators-legacy']
-    }
   });
 
   /*

diff --git a/package.json b/package.json
@@ -38,44 +38,43 @@
   "dependencies": {
     "babel-eslint": "^7.2.3",
     "broccoli-funnel": "^1.2.0",
-    "ember-cli-babel": "^6.3.0",
+    "ember-cli-babel": "^6.6.0",
     "ember-cli-htmlbars": "^2.0.1",
-    "ember-decorators": "^1.2.1"
+    "ember-decorators": "^1.3.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^3.1.2",
     "@commitlint/config-angular": "3.1.1",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "broccoli-asset-rev": "^2.4.5",
     "bulma": "^0.5.0",
     "code-highlight-linenums": "^0.2.1",
     "commitizen": "^2.9.6",
     "cz-customizable": "^5.0.0",
     "ember-ajax": "^3.0.0",
-    "ember-cli": "~2.14.2",
+    "ember-cli": "~2.16.2",
     "ember-cli-app-version": "^3.1.0",
     "ember-cli-content-security-policy": "^0.6.0",
-    "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-dependency-checker": "^2.0.0",
     "ember-cli-deploy": "^1.0.1",
-    "ember-cli-deploy-build": "^1.1.0",
+    "ember-cli-deploy-build": "^1.1.1",
     "ember-cli-deploy-git": "^1.3.0",
-    "ember-cli-eslint": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.3",
+    "ember-cli-eslint": "^4.0.0",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-qunit": "^4.0.1",
     "ember-cli-sass": "^6.1.3",
     "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^1.2.0",
+    "ember-cli-uglify": "^2.0.0",
     "ember-composable-helpers": "~2.0.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-native-dom-helpers": "^0.5.2",
+    "ember-native-dom-helpers": "^0.5.4",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~2.14.1",
-    "ember-themed-syntax": "^0.1.1",
+    "ember-source": "~2.16.0",
+    "ember-themed-syntax": "^0.1.2",
     "highlightjs": "^9.10.0",
     "hljs-themes": "^1.0.0",
     "husky": "^0.14.3",

diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
@@ -1,9 +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 App = Ember.Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

diff --git a/tests/dummy/app/index.html b/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">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
 
     {{content-for "head-footer"}}

diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -1,10 +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

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -55,6 +55,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
+    // here you can enable a production-specific feature
     ENV.rootURL = '/ember-bulma';
     ENV.locationType = 'hash';
   }

diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
@@ -1,8 +1,4 @@
-import Ember from 'ember';
-
-const {
-  run
-} = Ember;
+import { run } from '@ember/runloop';
 
 export default function destroyApp(application) {
   run(application, 'destroy');

diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -1,10 +1,8 @@
 import { module } from 'qunit';
-import Ember from 'ember';
+import { resolve } from 'rsvp';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { resolve } } = Ember;
-
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {

diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,12 +1,13 @@
-import Ember from 'ember';
 import Application from '../../app';
 import config from '../../config/environment';
+import { merge } from '@ember/polyfills';
+import { run } from '@ember/runloop';
 
 export default function startApp(attrs) {
-  let attributes = Ember.merge({}, config.APP);
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+  let attributes = merge({}, config.APP);
+  attributes = merge(attributes, attrs); // use defaults, but you can override;
 
-  return Ember.run(() => {
+  return run(() => {
     let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();