Merge pull request #350 from kratiahuja/serve-refactor

rwjblue · web-flow · commit 85d5281b432d · 2017-02-07T18:46:58.000-08:00
Bump to ember-cli 2.12.0-beta.1
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/.jshintrc b/.jshintrc
diff --git a/.npmignore b/.npmignore
@@ -9,7 +9,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json
diff --git a/.travis.yml b/.travis.yml
@@ -22,11 +22,11 @@ cache:
 
 before_install:
   - npm config set spin false
-  - npm install -g npm@^2
-  - npm install -g bower
+  - npm install -g npm@^3
+  - npm --version
+  - npm install -g bower phantomjs-prebuilt
   - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - phantomjs --version
 
 install:
   - npm install
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016
+Copyright (c) 2015-2017
 
 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,7 +1,4 @@
 {
   "name": "ember-cli-fastboot",
-  "dependencies": {
-    "ember": "~2.10.0",
-    "ember-cli-shims": "0.1.3"
-  }
+  "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';
 
 var path = require('path');
diff --git a/lib/.jshintrc b/lib/.jshintrc
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "core-object": "^2.0.5",
     "debug": "^2.2.0",
     "ember-cli-babel": "^5.1.7",
+    "ember-cli-eslint": "^3.0.2",
     "ember-cli-version-checker": "^1.1.6",
     "express": "^4.8.5",
     "fastboot-express-middleware": "1.0.0-rc.7",
@@ -43,34 +44,34 @@
     "chai": "^3.0.0",
     "chai-fs": "^1.0.0",
     "ember-ajax": "^2.4.1",
-    "ember-cli": "2.10.0",
-    "ember-cli-addon-tests": "^0.4.0",
-    "ember-cli-app-version": "^2.0.0",
+    "ember-cli": "2.12.0-beta.1",
+    "ember-cli-addon-tests": "^0.6.0",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-htmlbars": "^1.0.10",
+    "ember-cli-htmlbars": "^1.1.1",
     "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-qunit": "^3.1.0",
     "ember-cli-release": "^0.2.9",
+    "ember-cli-shims": "^1.0.2",
     "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": "^2.10.0",
+    "ember-data": "^2.11.0",
     "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",
+    "ember-source": "^2.12.0-beta.1",
     "fs-extra": "^1.0.0",
     "glob": "^7.0.0",
-    "loader.js": "^4.0.10",
+    "loader.js": "^4.1.0",
     "mocha": "^3.0.0",
     "request": "^2.55.0",
     "sinon": "^1.17.4"
   },
   "engines": {
-    "node": ">= 4.0.0"
+    "node": ">= 4"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
diff --git a/test/.jshintrc b/test/.jshintrc
diff --git a/test/custom-html-file-test.js b/test/custom-html-file-test.js
@@ -5,7 +5,7 @@ var request          = RSVP.denodeify(require('request'));
 var AddonTestApp     = require('ember-cli-addon-tests').AddonTestApp;
 
 describe('custom htmlFile', function() {
-  this.timeout(300000);
+  this.timeout(400000);
 
   var app;
 
@@ -15,7 +15,8 @@ describe('custom htmlFile', function() {
     return app.create('custom-html-file')
       .then(function() {
         return app.startServer({
-          command: 'fastboot'
+          command: 'fastboot',
+          additionalArguments: ['--serve-assets']
         });
       });
   });
diff --git a/test/fixtures/custom-html-file/app/app.js b/test/fixtures/custom-html-file/app/app.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from 'ember-resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
diff --git a/test/fixtures/dummy/app/app.js b/test/fixtures/dummy/app/app.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from 'ember-resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
diff --git a/test/fixtures/module-whitelist/node_modules/fake-addon-2/package.json b/test/fixtures/module-whitelist/node_modules/fake-addon-2/package.json
diff --git a/test/fixtures/module-whitelist/node_modules/fake-addon/package.json b/test/fixtures/module-whitelist/node_modules/fake-addon/package.json
diff --git a/test/package-json-test.js b/test/package-json-test.js
@@ -35,9 +35,9 @@ describe('generating package.json', function() {
       var config = fs.readJsonSync(app.filePath('/dist/package.json'));
 
       expect(config.dependencies).to.deep.equal({
-        "foo": "1.2.3",
-        "bar": "^7.8.9",
-        "baz": "0.2.0",
+        "foo": "1.0.0",
+        "bar": "^0.1.2",
+        "baz": "0.0.0",
         "rsvp": "3.2.1"
       });
     });
diff --git a/testem.js b/testem.js
@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
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/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/helpers/start-app.js b/tests/helpers/start-app.js
@@ -3,16 +3,14 @@ import Application from '../../app';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  let application;
 
-  // use defaults, but you can override
-  let attributes = Ember.assign({}, config.APP, attrs);
+  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;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ember-cli-fastboot",`
`3`		`- "dependencies": {`
`4`		`- "ember": "~2.10.0",`
`5`		`- "ember-cli-shims": "0.1.3"`
`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`	`var path = require('path');`