From ed71aa133e85b11bf5136a3cab6adcddde016910 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 14 Jan 2016 11:54:26 +0100 Subject: [PATCH] Update Ember.js to 2.2.0 --- app/app.js | 2 +- app/index.html | 8 ++++---- bower.json | 11 +++++++---- package.json | 9 +++++---- tests/helpers/resolver.js | 2 +- tests/index.html | 18 +++++++++--------- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/app/app.js b/app/app.js index f56a9fcf..d9246b12 100644 --- a/app/app.js +++ b/app/app.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import Resolver from 'ember/resolver'; +import Resolver from 'ember-resolver'; import loadInitializers from 'ember/load-initializers'; import config from './config/environment'; diff --git a/app/index.html b/app/index.html index 0f7355ba..2b3e7e67 100644 --- a/app/index.html +++ b/app/index.html @@ -8,14 +8,14 @@ - {{content-for 'head'}} + {{content-for "head"}} - {{content-for 'head-footer'}} + {{content-for "head-footer"}} - {{content-for 'body'}} + {{content-for "body"}} - {{content-for 'body-footer'}} + {{content-for "body-footer"}} Do you have a question? diff --git a/bower.json b/bower.json index 5fdfcb84..b850a2aa 100644 --- a/bower.json +++ b/bower.json @@ -1,15 +1,15 @@ { "name": "travis", "dependencies": { - "ember": "1.13.10", - "ember-cli-shims": "0.0.6", - "ember-cli-test-loader": "0.2.1", "ember-data": "1.13.15", + "ember": "2.2.0", + "ember-cli-shims": "0.1.0", + "ember-cli-test-loader": "0.2.2", "ember-load-initializers": "0.1.7", "ember-qunit": "0.4.16", "ember-qunit-notifications": "0.1.0", "jquery": "~1.11.3", - "loader.js": "ember-cli/loader.js#3.2.1", + "loader.js": "^3.5.0", "qunit": "~1.20.0", "visibilityjs": "~1.2.1", "JavaScript-MD5": "~1.1.0", @@ -18,5 +18,8 @@ "pusher": "~2.2.3", "pretender": "0.1.0", "ember-resolver": "~0.1.20" + }, + "resolutions": { + "ember": "2.2.0" } } diff --git a/package.json b/package.json index aacf826c..f0168b75 100644 --- a/package.json +++ b/package.json @@ -21,20 +21,20 @@ "devDependencies": { "broccoli-asset-rev": "^2.2.0", "broccoli-sass": "0.6.6", - "ember-cli": "1.13.12", + "ember-ajax": "0.7.1", + "ember-cli": "2.2.0-beta.6", "ember-cli-app-version": "^1.0.0", "ember-cli-autoprefixer": "^0.3.0", "ember-cli-babel": "5.1.5", - "ember-cli-dependency-checker": "^1.1.0", + "ember-cli-dependency-checker": "^1.2.0", "ember-cli-deprecation-workflow": "0.1.5", "ember-cli-document-title": "0.2.0", "ember-cli-htmlbars": "1.0.1", "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-ic-ajax": "0.2.4", "ember-cli-inject-live-reload": "^1.3.1", "ember-cli-inline-images": "^0.0.4", "ember-cli-pretender": "0.3.1", - "ember-cli-qunit": "^1.0.4", + "ember-cli-qunit": "^1.1.0", "ember-cli-release": "0.2.8", "ember-cli-sauce": "^1.1.0", "ember-cli-uglify": "1.2.0", @@ -42,6 +42,7 @@ "ember-data-filter": "1.13.0", "ember-disable-proxy-controllers": "^1.0.1", "ember-export-application-global": "^1.0.4", + "ember-resolver": "^2.0.3", "ember-try": "0.0.7", "emberx-select": "2.0.2" } diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js index ebfb4e4d..ac94b1bc 100644 --- a/tests/helpers/resolver.js +++ b/tests/helpers/resolver.js @@ -1,4 +1,4 @@ -import Resolver from 'ember/resolver'; +import Resolver from 'ember-resolver'; import config from '../../config/environment'; const resolver = Resolver.create(); diff --git a/tests/index.html b/tests/index.html index f1301f10..8c1263e9 100644 --- a/tests/index.html +++ b/tests/index.html @@ -7,8 +7,8 @@ - {{content-for 'head'}} - {{content-for 'test-head'}} + {{content-for "head"}} + {{content-for "test-head"}} @@ -23,21 +23,21 @@ } - {{content-for 'head-footer'}} - {{content-for 'test-head-footer'}} + {{content-for "head-footer"}} + {{content-for "test-head-footer"}} - {{content-for 'body'}} - {{content-for 'test-body'}} + {{content-for "body"}} + {{content-for "test-body"}} + - - {{content-for 'body-footer'}} - {{content-for 'test-body-footer'}} + {{content-for "body-footer"}} + {{content-for "test-body-footer"}}