From 85630d1de08ea0e66f111d3a864a95d596cd609a Mon Sep 17 00:00:00 2001 From: Jeremy Brown Date: Mon, 5 Dec 2016 08:25:33 -0600 Subject: [PATCH] Upgrade Ember CLI to v2.7.0 --- .editorconfig | 14 -------------- .jshintrc | 2 +- .travis.yml | 4 +++- bower.json | 3 +-- package.json | 5 +++-- tests/.jshintrc | 2 +- tests/dummy/app/index.html | 8 ++++---- tests/dummy/app/router.js | 3 ++- tests/dummy/config/environment.js | 3 +-- tests/index.html | 17 ++++++++--------- 10 files changed, 24 insertions(+), 37 deletions(-) diff --git a/.editorconfig b/.editorconfig index 47c5438..219985c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,22 +13,8 @@ insert_final_newline = true indent_style = space indent_size = 2 -[*.js] -indent_style = space -indent_size = 2 - [*.hbs] insert_final_newline = false -indent_style = space -indent_size = 2 - -[*.css] -indent_style = space -indent_size = 2 - -[*.html] -indent_style = space -indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false diff --git a/.jshintrc b/.jshintrc index 08096ef..d421faa 100644 --- a/.jshintrc +++ b/.jshintrc @@ -27,6 +27,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true, + "esversion": 6, "unused": true } diff --git a/.travis.yml b/.travis.yml index 00c5822..68b59ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,9 @@ matrix: before_install: - npm config set spin false - npm install -g bower + - bower --version - npm install phantomjs-prebuilt + - phantomjs --version install: - npm install @@ -33,4 +35,4 @@ install: script: # Usually, it's ok to finish the test scenario without reverting # to the addon's original dependency state, skipping "cleanup". - - ember try $EMBER_TRY_SCENARIO test --skip-cleanup + - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup diff --git a/bower.json b/bower.json index 9600cc2..a08df81 100755 --- a/bower.json +++ b/bower.json @@ -1,9 +1,8 @@ { "name": "ember-cli-jsdoc", "dependencies": { - "ember": "2.6.0", + "ember": "2.7.0", "ember-cli-shims": "0.1.1", - "ember-cli-test-loader": "0.2.2", "ember-qunit-notifications": "0.1.0", "loader.js": "ember-cli/loader.js#3.4.0", "qunit": "1.20.0" diff --git a/package.json b/package.json index a7fe50c..8d4cc3c 100644 --- a/package.json +++ b/package.json @@ -28,14 +28,15 @@ "devDependencies": { "broccoli-asset-rev": "2.4.2", "ember-ajax": "2.0.1", - "ember-cli": "2.6.3", + "ember-cli": "2.7.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": "1.4.0", + "ember-cli-qunit": "2.0.0", + "ember-cli-test-loader": "1.1.0", "ember-cli-uglify": "1.2.0", "ember-disable-prototype-extensions": "1.1.0", "ember-disable-proxy-controllers": "1.0.1", diff --git a/tests/.jshintrc b/tests/.jshintrc index 6ec0b7c..d2bd113 100644 --- 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 index c9b4327..5120bd7 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -9,16 +9,16 @@ {{content-for "head"}} - - + + {{content-for "head-footer"}} {{content-for "body"}} - - + + {{content-for "body-footer"}} diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index 3bba78e..cdc2578 100644 --- 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/config/environment.js b/tests/dummy/config/environment.js index c59bcd5..2529939 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -4,7 +4,7 @@ module.exports = function(environment) { var ENV = { modulePrefix: 'dummy', environment: environment, - baseURL: '/', + rootURL: '/', locationType: 'auto', EmberENV: { FEATURES: { @@ -29,7 +29,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/index.html b/tests/index.html index 64cb47e..f7ff652 100644 --- a/tests/index.html +++ b/tests/index.html @@ -10,9 +10,9 @@ {{content-for "head"}} {{content-for "test-head"}} - - - + + + {{content-for "head-footer"}} {{content-for "test-head-footer"}} @@ -21,12 +21,11 @@ {{content-for "body"}} {{content-for "test-body"}} - - - - - - + + + + + {{content-for "body-footer"}} {{content-for "test-body-footer"}}