Merge pull request #44 from mfeckie/feature/dependency-bumps

chriskrycho · web-flow · commit 268483bae127 · 2017-07-01T06:44:54.000-04:00
Upgrade ember-cli and typescript
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,13 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    browser: true
+  },
+  rules: {
+  }
+};
diff --git a/.npmignore b/.npmignore
@@ -8,7 +8,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,12 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: false
 
 cache:
-  directories:
-    - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
+  yarn: true
 
 env:
   # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
@@ -17,24 +15,23 @@ env:
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
+  - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - npm config set spin false
-  - npm install -g bower
-  - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+  - yarn global add phantomjs-prebuilt
+  - phantomjs --version
 
 install:
-  - npm install
-  - bower install
+  - yarn install --no-lockfile
 
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
diff --git a/bower.json b/bower.json
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   scenarios: [
     {
@@ -10,6 +10,11 @@ module.exports = {
         resolutions: {
           'ember': 'lts-2-4'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -21,6 +26,11 @@ module.exports = {
         resolutions: {
           'ember': 'lts-2-8'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -32,6 +42,11 @@ module.exports = {
         resolutions: {
           'ember': 'release'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -43,6 +58,11 @@ module.exports = {
         resolutions: {
           'ember': 'beta'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -54,6 +74,17 @@ module.exports = {
         resolutions: {
           'ember': 'canary'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
       }
     }
   ]
diff --git a/config/environment.js b/config/environment.js
@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,6 +1,5 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
   var app = new EmberAddon(defaults, {
diff --git a/index.js b/index.js
@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 
 'use strict';
 var path      = require('path');
diff --git a/package.json b/package.json
@@ -34,37 +34,37 @@
     "broccoli-stew": "^1.4.0",
     "broccoli-typescript-compiler": "^1.0.1",
     "debug": "^2.2.0",
-    "ember-cli-babel": "^5.1.7"
+    "ember-cli-babel": "^6.3.0"
   },
   "devDependencies": {
     "@types/ember": "^2.7.34",
     "broccoli-asset-rev": "^2.4.5",
-    "ember-ajax": "^2.4.1",
-    "ember-cli": "2.10.0",
+    "ember-cli": "^2.13.3",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-htmlbars": "^1.0.10",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-eslint": "^3.0.0",
+    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-jshint": "^2.0.1",
-    "ember-cli-qunit": "^3.0.1",
+    "ember-cli-qunit": "^4.0.0",
     "ember-cli-release": "^0.2.9",
+    "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
-    "ember-resolver": "^2.0.3",
-    "loader.js": "^4.0.10",
-    "typescript": "^2.1.0"
+    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.0.0",
+    "ember-source": "~2.13.3",
+    "loader.js": "^4.2.3",
+    "typescript": "^2.4.1"
   },
   "peerDependencies": {
     "@types/ember": "^2.7.34",
-    "typescript": "^2.1.0"
+    "typescript": "^2.4.1"
   },
   "engines": {
-    "node": ">= 0.12.0"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
diff --git a/testem.js b/testem.js
@@ -1,6 +1,5 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [
diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+  env: {
+    embertest: true
+  }
+};
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 
 module.exports = function(environment) {
   var ENV = {
diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
@@ -0,0 +1,10 @@
+/* eslint-env node */
+
+module.exports = {
+  browsers: [
+    'ie 9',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions'
+  ]
+};
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -3,16 +3,13 @@ import Application from '../../app';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  let application;
+  let attributes = Ember.merge({}, config.APP);
+  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  // use defaults, but you can override
-  let attributes = Ember.assign({}, config.APP, attrs);
-
-  Ember.run(() => {
-    application = Application.create(attributes);
+  return Ember.run(() => {
+    let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
+    return application;
   });
-
-  return application;
 }
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
 import {
   setResolver
 } from 'ember-qunit';
+import { start } from 'ember-cli-qunit';
 
 setResolver(resolver);
+start();

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/jshint node:true/`
	`1`	`+/* eslint-env node */`
`2`	`2`	`module.exports = {`
`3`	`3`	`scenarios: [`
`4`	`4`	`{`
`@@ -10,6 +10,11 @@ module.exports = {`
`10`	`10`	`resolutions: {`
`11`	`11`	`'ember': 'lts-2-4'`
`12`	`12`	`}`
	`13`	`+ },`
	`14`	`+ npm: {`
	`15`	`+ devDependencies: {`
	`16`	`+ 'ember-source': null`
	`17`	`+ }`
`13`	`18`	`}`
`14`	`19`	`},`
`15`	`20`	`{`
`@@ -21,6 +26,11 @@ module.exports = {`
`21`	`26`	`resolutions: {`
`22`	`27`	`'ember': 'lts-2-8'`
`23`	`28`	`}`
	`29`	`+ },`
	`30`	`+ npm: {`
	`31`	`+ devDependencies: {`
	`32`	`+ 'ember-source': null`
	`33`	`+ }`
`24`	`34`	`}`
`25`	`35`	`},`
`26`	`36`	`{`
`@@ -32,6 +42,11 @@ module.exports = {`
`32`	`42`	`resolutions: {`
`33`	`43`	`'ember': 'release'`
`34`	`44`	`}`
	`45`	`+ },`
	`46`	`+ npm: {`
	`47`	`+ devDependencies: {`
	`48`	`+ 'ember-source': null`
	`49`	`+ }`
`35`	`50`	`}`
`36`	`51`	`},`
`37`	`52`	`{`
`@@ -43,6 +58,11 @@ module.exports = {`
`43`	`58`	`resolutions: {`
`44`	`59`	`'ember': 'beta'`
`45`	`60`	`}`
	`61`	`+ },`
	`62`	`+ npm: {`
	`63`	`+ devDependencies: {`
	`64`	`+ 'ember-source': null`
	`65`	`+ }`
`46`	`66`	`}`
`47`	`67`	`},`
`48`	`68`	`{`
`@@ -54,6 +74,17 @@ module.exports = {`
`54`	`74`	`resolutions: {`
`55`	`75`	`'ember': 'canary'`
`56`	`76`	`}`
	`77`	`+ },`
	`78`	`+ npm: {`
	`79`	`+ devDependencies: {`
	`80`	`+ 'ember-source': null`
	`81`	`+ }`
	`82`	`+ }`
	`83`	`+ },`
	`84`	`+ {`
	`85`	`+ name: 'ember-default',`
	`86`	`+ npm: {`
	`87`	`+ devDependencies: {}`
`57`	`88`	`}`
`58`	`89`	`}`
`59`	`90`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* jshint node: true */`
	`1`	`+/* eslint-env node */`
`2`	`2`
`3`	`3`	`'use strict';`
`4`	`4`	`var path = require('path');`