ember-cli@2.10.0

kellyselden · kellyselden · commit d1eb95afddba · 2016-12-23T11:36:51.000-08:00
diff --git a/.editorconfig b/.editorconfig
@@ -13,21 +13,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
 [*.hbs]
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
+insert_final_newline = false
 
 [*.{diff,md}]
 trim_trailing_whitespace = false
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
@@ -14,5 +14,5 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log
diff --git a/.jshintrc b/.jshintrc
@@ -28,6 +28,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }
diff --git a/.npmignore b/.npmignore
@@ -1,2 +1,17 @@
-test
-tests
+/bower_components
+/config/ember-try.js
+/dist
+/test
+/tests
+/tmp
+**/.gitkeep
+.bowerrc
+.editorconfig
+.ember-cli
+.gitignore
+.jshintrc
+.watchmanconfig
+.travis.yml
+bower.json
+ember-cli-build.js
+testem.js
diff --git a/.travis.yml b/.travis.yml
@@ -17,16 +17,18 @@ sudo: false
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache
 
 before_install:
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g npm@^2
+  - npm install -g bower
+  - bower --version
   - npm install phantomjs-prebuilt
   - node_modules/phantomjs-prebuilt/bin/phantomjs --version
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 
diff --git a/.watchmanconfig b/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp", "dist"]
+}
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015
+Copyright (c) 2016
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/bower.json b/bower.json
@@ -1,17 +1,7 @@
 {
   "name": "ember-cli-fastboot",
   "dependencies": {
-    "jquery": "^1.11.1",
-    "ember": "canary",
-    "ember-data": "canary",
-    "ember-resolver": "~0.1.12",
-    "ember-cli-shims": "0.1.0",
-    "ember-cli-test-loader": "0.2.2",
-    "ember-qunit": "0.2.8",
-    "ember-qunit-notifications": "0.0.7",
-    "qunit": "~1.17.1"
-  },
-  "resolutions": {
-    "ember": "canary"
+    "ember": "~2.10.0",
+    "ember-cli-shims": "0.1.3"
   }
 }
diff --git a/config/environment.js b/config/environment.js
@@ -1,3 +1,4 @@
+/*jshint node:true*/
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -8,7 +8,7 @@ module.exports = function(defaults) {
   });
 
   /*
-    This build file specifes the options for the dummy test app of this
+    This build file specifies the options for the dummy test app of this
     addon, located in `/tests/dummy`
     This build file does *not* influence how the addon or the app using it
     behave. You most likely want to be modifying `./index.js` or app's build file
diff --git a/package.json b/package.json
@@ -2,85 +2,89 @@
   "name": "ember-cli-fastboot",
   "version": "1.0.0-beta.13",
   "description": "Server-side rendering for Ember.js apps",
+  "keywords": [
+    "ember-addon"
+  ],
+  "license": "MIT",
+  "author": "Tom Dale & Yehuda Katz <tomhuda@tilde.io>",
   "directories": {
     "doc": "doc",
     "test": "tests"
   },
   "repository": "https://github.com/ember-fastboot/ember-cli-fastboot",
   "scripts": {
-    "start": "ember server",
     "build": "ember build",
+    "start": "ember server",
     "test": "mocha && ember test",
     "test:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js"
   },
-  "engines": {
-    "node": ">= 4.0.0"
+  "dependencies": {
+    "broccoli-funnel": "0.2.8",
+    "broccoli-merge-trees": "^1.1.1",
+    "broccoli-plugin": "^1.2.1",
+    "broccoli-stew": "^1.2.0",
+    "compression": "^1.6.2",
+    "core-object": "^2.0.5",
+    "debug": "^2.2.0",
+    "ember-cli-babel": "^5.1.7",
+    "ember-cli-version-checker": "^1.1.6",
+    "ember-test-helpers": "^0.5.22",
+    "express": "^4.8.5",
+    "fastboot-express-middleware": "1.0.0-beta.8",
+    "fastboot-filter-initializers": "0.0.2",
+    "lodash.defaults": "^4.0.1",
+    "lodash.uniq": "^4.2.0",
+    "md5-hex": "^1.3.0",
+    "portfinder": "^1.0.3",
+    "rsvp": "^3.0.16",
+    "silent-error": "^1.0.0"
   },
-  "author": "Tom Dale & Yehuda Katz <tomhuda@tilde.io>",
-  "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.0",
+    "broccoli-asset-rev": "^2.4.5",
     "chai": "^2.2.0",
     "chai-fs": "peterkc/chai-fs#31deec5232297e2887a2ffb39b9081364c8e78e1",
     "chalk": "^1.1.1",
     "cpr": "^1.1.1",
-    "ember-cli": "^2.7.0",
+    "ember-ajax": "^2.4.1",
+    "ember-cli": "2.10.0",
     "ember-cli-addon-tests": "^0.3.0",
-    "ember-cli-app-version": "0.5.0",
+    "ember-cli-app-version": "^2.0.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.1",
-    "ember-cli-htmlbars": "0.7.9",
-    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
-    "ember-cli-ic-ajax": "0.2.1",
-    "ember-cli-inject-live-reload": "^1.3.1",
-    "ember-cli-qunit": "^1.0.0",
-    "ember-cli-release": "^1.0.0-beta.1",
+    "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-htmlbars": "^1.0.10",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-inject-live-reload": "^1.4.1",
+    "ember-cli-jshint": "^2.0.1",
+    "ember-cli-qunit": "^3.0.1",
+    "ember-cli-release": "^0.2.9",
+    "ember-cli-sri": "^2.1.0",
     "ember-cli-string-utils": "^1.0.0",
+    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "1.13.8",
-    "ember-export-application-global": "^1.0.3",
+    "ember-data": "^2.10.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",
     "exists-sync": "0.0.3",
     "fs-extra": "^0.24.0",
     "fs-promise": "^0.3.1",
     "glob": "^7.0.0",
-    "loader.js": "^4.0.1",
+    "loader.js": "^4.0.10",
     "mocha": "^2.2.4",
     "request": "^2.55.0",
     "sinon": "^1.17.4",
     "symlink-or-copy": "^1.0.1",
     "temp": "^0.8.3",
     "walk-sync": "^0.2.5"
   },
-  "keywords": [
-    "ember-addon"
-  ],
+  "engines": {
+    "node": ">= 4.0.0"
+  },
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "after": [
       "broccoli-asset-rev"
     ]
-  },
-  "dependencies": {
-    "broccoli-funnel": "0.2.8",
-    "broccoli-merge-trees": "^1.1.1",
-    "broccoli-plugin": "^1.2.1",
-    "broccoli-stew": "^1.2.0",
-    "compression": "^1.6.2",
-    "core-object": "^2.0.5",
-    "debug": "^2.2.0",
-    "ember-cli-babel": "^5.1.5",
-    "ember-cli-version-checker": "^1.1.6",
-    "ember-test-helpers": "^0.5.22",
-    "express": "^4.8.5",
-    "fastboot-express-middleware": "1.0.0-beta.8",
-    "fastboot-filter-initializers": "0.0.2",
-    "lodash.defaults": "^4.0.1",
-    "lodash.uniq": "^4.2.0",
-    "md5-hex": "^1.3.0",
-    "portfinder": "^1.0.3",
-    "rsvp": "^3.0.16",
-    "silent-error": "^1.0.0"
   }
 }
diff --git a/testem.js b/testem.js
@@ -1,11 +1,13 @@
-{
+/*jshint node:true*/
+module.exports = {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
   "launch_in_ci": [
     "PhantomJS"
   ],
   "launch_in_dev": [
     "PhantomJS",
     "Chrome"
   ]
-}
+};
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -47,6 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -9,16 +9,16 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/dummy.css">
+    <link rel="stylesheet" href="/assets/vendor.css">
+    <link rel="stylesheet" href="/assets/dummy.css">
 
     {{content-for "head-footer"}}
   </head>
   <body>
     {{content-for "body"}}
 
-    <script src="assets/vendor.js"></script>
-    <script src="assets/dummy.js"></script>
+    <script src="/assets/vendor.js"></script>
+    <script src="/assets/dummy.js"></script>
 
     {{content-for "body-footer"}}
 
@@ -28,6 +28,5 @@
     <script type="fastboot/shoebox" id="shoebox-key2">
       {"zip":"zap"}
     </script>
-
   </body>
 </html>
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -2,7 +2,8 @@ import Ember from 'ember';
 import config from './config/environment';
 
 const Router = Ember.Router.extend({
-  location: config.locationType
+  location: config.locationType,
+  rootURL: config.rootURL
 });
 
 Router.map(function() {
diff --git a/tests/dummy/app/routes/.gitkeep b/tests/dummy/app/routes/.gitkeep
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -4,12 +4,16 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'dummy',
     environment: environment,
-    baseURL: '/',
+    rootURL: '/',
     locationType: 'auto',
     EmberENV: {
       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
       }
     },
 
@@ -29,7 +33,6 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
     ENV.locationType = 'none';
 
     // keep test console output quieter
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -1,23 +1,23 @@
 import { module } from 'qunit';
+import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
+const { RSVP: { Promise } } = Ember;
+
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {
       this.application = startApp();
 
       if (options.beforeEach) {
-        options.beforeEach.apply(this, arguments);
+        return options.beforeEach.apply(this, arguments);
       }
     },
 
     afterEach() {
-      destroyApp(this.application);
-
-      if (options.afterEach) {
-        options.afterEach.apply(this, arguments);
-      }
+      let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
 }
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -5,8 +5,8 @@ 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);
diff --git a/tests/index.html b/tests/index.html
diff --git a/tests/unit/.gitkeep b/tests/unit/.gitkeep

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@`
`28`	`28`	`"strict": false,`
`29`	`29`	`"white": false,`
`30`	`30`	`"eqnull": true,`
`31`		`- "esnext": true,`
	`31`	`+ "esversion": 6,`
`32`	`32`	`"unused": true`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "ignore_dirs": ["tmp", "dist"]`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/jshint node:true/`
`1`	`2`	`'use strict';`
`2`	`3`
`3`	`4`	`module.exports = function(/* environment, appConfig */) {`