From 19b51d6b484bc5701690117d1e172dc7096d0710 Mon Sep 17 00:00:00 2001 From: James Herdman Date: Wed, 30 Nov 2016 12:31:09 -0500 Subject: [PATCH] Upgrade ember-cli to 2.10.0 --- .gitignore | 4 +- .travis.yml | 10 +++-- bower.json | 5 +-- config/ember-try.js | 15 ++++--- package.json | 66 +++++++++++++++---------------- tests/dummy/config/environment.js | 11 +++--- tests/helpers/start-app.js | 4 +- tests/index.html | 2 +- 8 files changed, 62 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 86fceae..5ad14dd 100644 --- 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/.travis.yml b/.travis.yml index 68b59ab..b3be07e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,13 @@ sudo: false cache: directories: - - node_modules + - $HOME/.npm + - $HOME/.cache # includes bowers cache env: - - EMBER_TRY_SCENARIO=default - - EMBER_TRY_SCENARIO=ember-1.13 + # we recommend testing LTS's and latest stable release (bonus points to beta/canary) + - EMBER_TRY_SCENARIO=ember-lts-2.4 + - EMBER_TRY_SCENARIO=ember-lts-2.8 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary @@ -26,7 +28,7 @@ before_install: - npm install -g bower - bower --version - npm install phantomjs-prebuilt - - phantomjs --version + - node_modules/phantomjs-prebuilt/bin/phantomjs --version install: - npm install diff --git a/bower.json b/bower.json index bb36803..0a82131 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,8 @@ { "name": "ember-cli-chartist", "dependencies": { - "ember": "~2.7.0", - "ember-cli-shims": "0.1.1", - "ember-qunit-notifications": "0.1.0" + "ember": "~2.10.0", + "ember-cli-shims": "0.1.3" }, "devDependencies": { "chartist": "~0.10.1" diff --git a/config/ember-try.js b/config/ember-try.js index 014f603..c58516b 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -2,19 +2,24 @@ module.exports = { scenarios: [ { - name: 'default', + name: 'ember-lts-2.4', bower: { - dependencies: { } + dependencies: { + 'ember': 'components/ember#lts-2-4' + }, + resolutions: { + 'ember': 'lts-2-4' + } } }, { - name: 'ember-1.13', + name: 'ember-lts-2.8', bower: { dependencies: { - 'ember': '~1.13.0' + 'ember': 'components/ember#lts-2-8' }, resolutions: { - 'ember': '~1.13.0' + 'ember': 'lts-2-8' } } }, diff --git a/package.json b/package.json index 94c6609..d44f3f3 100644 --- a/package.json +++ b/package.json @@ -2,15 +2,21 @@ "name": "ember-cli-chartist", "version": "1.2.0", "description": "Ember Addon for Chartist.js", + "keywords": [ + "ember-addon", + "ember-cli", + "chartist", + "chartist-js" + ], + "license": "MIT", + "author": "James Herdman ", + "contributors": [ + "Tyler Gaw " + ], "directories": { "doc": "doc", "test": "tests" }, - "scripts": { - "build": "ember build", - "start": "ember server", - "test": "ember try:each" - }, "repository": { "type": "git", "url": "https://github.com/jherdman/ember-cli-chartist.git" @@ -18,46 +24,40 @@ "bugs": { "url": "https://github.com/jherdman/ember-cli-chartist/issues" }, - "engines": { - "node": ">= 0.10.0" + "scripts": { + "build": "ember build", + "start": "ember server", + "test": "ember try:each" + }, + "dependencies": { + "ember-cli-babel": "^5.1.7", + "ember-cli-htmlbars": "^1.0.10" }, - "author": "James Herdman ", - "contributors": [ - "Tyler Gaw " - ], - "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.4.2", - "ember-ajax": "^2.0.1", - "ember-cli": "2.7.0", - "ember-cli-app-version": "^1.0.0", - "ember-cli-dependency-checker": "^1.2.0", - "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.0.0", + "broccoli-asset-rev": "^2.4.5", + "ember-ajax": "^2.4.1", + "ember-cli": "2.10.0", + "ember-cli-app-version": "^2.0.0", + "ember-cli-dependency-checker": "^1.3.0", + "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-sass": "5.3.1", "ember-cli-sri": "^2.1.0", "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.7.0", + "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", - "ember-welcome-page": "^1.0.1", - "loader.js": "^4.0.1" + "ember-welcome-page": "^1.0.3", + "loader.js": "^4.0.10" }, - "keywords": [ - "ember-addon", - "ember-cli", - "chartist", - "chartist-js" - ], - "dependencies": { - "ember-cli-babel": "^5.1.6", - "ember-cli-htmlbars": "^1.0.3" + "engines": { + "node": ">= 0.12.0" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 77c3511..703c472 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -6,15 +6,14 @@ module.exports = function(environment) { environment: environment, rootURL: '/', locationType: 'auto', - - contentSecurityPolicy: { - 'style-src': "'self' 'unsafe-inline'" - }, - 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,9 +28,11 @@ module.exports = function(environment) { // ENV.APP.LOG_ACTIVE_GENERATION = true; // ENV.APP.LOG_TRANSITIONS = true; // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; + // ENV.APP.LOG_VIEW_LOOKUPS = true; } if (environment === 'test') { + // Testem prefers this... ENV.locationType = 'none'; // keep test console output quieter diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index e098f1d..54c33c1 100644 --- 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 index f7ff652..5209b85 100644 --- a/tests/index.html +++ b/tests/index.html @@ -21,7 +21,7 @@ {{content-for "body"}} {{content-for "test-body"}} - +