Upgrade ember-cli and ember to 2.12 (#31)

lukemelia · web-flow · commit 4114c0f20bc9 · 2017-04-07T00:30:23.000-04:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,13 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    browser: true
+  },
+  rules: {
+  }
+};
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,5 +13,5 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log
diff --git a/.jshintrc b/.jshintrc
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
@@ -3,22 +3,32 @@ language: node_js
 node_js:
   - "4"
 
-sudo: false
+dist: trusty
+sudo: required
+
+addons:
+  apt:
+    sources:
+    - google-chrome
+    packages:
+    - google-chrome-stable
 
 cache:
-  directories:
-    - node_modules
+  yarn: true
 
 before_install:
-  - npm config set spin false
-  - npm install -g bower
-  - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+  - yarn global add bower
 
 install:
-  - npm install
+  - yarn install --no-lockfile
   - bower install
 
 script:
-  - ember try:each
+  # Usually, it's ok to finish the test scenario without reverting
+  #  to the addon's original dependency state, skipping "cleanup".
+  - ember try:each --skip-cleanup
diff --git a/bower.json b/bower.json
@@ -1,7 +1,4 @@
 {
   "name": "ember-buffered-proxy",
-  "dependencies": {
-    "ember": "~2.8.0",
-    "ember-cli-shims": "0.1.1"
-  }
+  "dependencies": {}
 }
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';
 
 module.exports = {
diff --git a/package.json b/package.json
@@ -2,59 +2,54 @@
   "name": "ember-buffered-proxy",
   "version": "0.6.0",
   "description": "An Ember Object Proxy with change buffering",
+  "keywords": [
+    "ember-addon"
+  ],
+  "license": "MIT",
+  "author": "Kris Selden, Stefan Penner & Yapp Labs",
+  "contributors": [
+    {
+      "name": "Ben Limmer",
+      "email": "hello@benlimmer.com"
+    }
+  ],
   "directories": {
     "doc": "doc",
     "test": "tests"
   },
+  "repository": "https://github.com/yapplabs/ember-buffered-proxy",
   "scripts": {
     "build": "ember build",
     "start": "ember server",
     "test": "ember try:each"
   },
-  "repository": "https://github.com/yapplabs/ember-buffered-proxy",
-  "engines": {
-    "node": ">= 0.10.0"
+  "dependencies": {
+    "ember-cli-babel": "^5.1.7"
   },
-  "author": "Kris Selden, Stefan Penner & Yapp Labs",
-  "contributors": [
-    {
-      "name": "Ben Limmer",
-      "email": "hello@benlimmer.com"
-    }
-  ],
-  "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.8.0",
-    "ember-cli-app-version": "^1.0.0",
-    "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-htmlbars": "^1.0.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-jshint": "^1.0.0",
-    "ember-cli-qunit": "^2.1.0",
-    "ember-cli-release": "^0.2.9",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.8.0",
+    "ember-cli": "^2.12.1",
+    "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-eslint": "^3.0.0",
+    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-inject-live-reload": "^1.4.1",
+    "ember-cli-qunit": "^3.1.0",
+    "ember-cli-release": "^1.0.0-beta.2",
+    "ember-cli-shims": "^1.0.2",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
+    "ember-load-initializers": "^0.6.0",
     "ember-resolver": "^2.0.3",
-    "loader.js": "^4.0.1"
+    "ember-source": "~2.12.0",
+    "loader.js": "^4.2.3"
   },
-  "keywords": [
-    "ember-addon"
-  ],
-  "dependencies": {
-    "ember-cli-babel": "^5.1.6"
+  "engines": {
+    "node": ">= 4"
   },
   "ember-addon": {
-    "configPath": "tests/dummy/config",
     "versionCompatibility": {
       "ember": ">=1.13"
-    }
+    },
+    "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/.jshintrc b/tests/.jshintrc
diff --git a/tests/dummy/.jshintrc b/tests/dummy/.jshintrc
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
@@ -1,3 +1,5 @@
-<h2 id="title">Welcome to Ember</h2>
+{{!-- The following component displays Ember's default welcome message. --}}
+{{welcome-page}}
+{{!-- Feel free to remove this! --}}
 
 {{outlet}}
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 = {
@@ -10,6 +10,10 @@ module.exports = function(environment) {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. 'with-controller': true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false
       }
     },
 
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;
 
-  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/index.html b/tests/index.html
@@ -21,7 +21,7 @@
     {{content-for "body"}}
     {{content-for "test-body"}}
 
-    <script src="{{rootURL}}testem.js" integrity=""></script>
+    <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>
     <script src="{{rootURL}}assets/dummy.js"></script>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ember-buffered-proxy",`
`3`		`- "dependencies": {`
`4`		`- "ember": "~2.8.0",`
`5`		`- "ember-cli-shims": "0.1.1"`
`6`		`- }`
	`3`	`+ "dependencies": {}`
`7`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/jshint node:true/`
	`1`	`+/* eslint-env node */`
`2`	`2`	`'use strict';`
`3`	`3`
`4`	`4`	`module.exports = function(/* environment, appConfig */) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* jshint node: true */`
	`1`	`+/* eslint-env node */`
`2`	`2`	`'use strict';`
`3`	`3`
`4`	`4`	`module.exports = {`