Skip to content
This repository has been archived by the owner on Mar 15, 2023. It is now read-only.

Update ember-cli to 1.13.8, use simplified initializer pattern #16

Merged
merged 1 commit into from
Aug 23, 2015
Merged

Update ember-cli to 1.13.8, use simplified initializer pattern #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/initializers/export-application-global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Ember from 'ember';
import config from '../config/environment';

export function initialize(container, application) {
export function initialize() {
var application = arguments[1] || arguments[0];
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rwjblue @stefanpenner if this is an acceptable fix, I'm happy to apply this pattern to ember's internal initializers. Canary is currently throwing warnings, so I assume they'll need to be handled before cutting the next beta

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mike-north - Are you saying that the initializers that are internal to Ember itself are triggering this deprecation? Can you open an issue for that (the fix in Ember itself isn't quite like this though)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you saying that the initializers that are internal to Ember itself are triggering this deprecation?

Yes

Can you open an issue for that

I'll open a PR. The particulars of the fix are likely to be simple enough that I don't mind having to re-do them after feedback

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. The solution in Ember is to import isEnabled and use different signatures based on the flag being enabled. Also, I'm concerned that our tests did not show this (we throw errors if we hit a deprecation).

if (config.exportApplicationGlobal !== false) {
var value = config.exportApplicationGlobal;
var globalName;
Expand Down
12 changes: 6 additions & 6 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "ember-export-application-global",
"dependencies": {
"ember": "1.13.3",
"ember": "1.13.7",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-data": "1.13.5",
"ember-data": "1.13.8",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
"ember-qunit": "0.4.1",
"ember-qunit": "0.4.9",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.18",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
"qunit": "~1.17.1"
"jquery": "^1.11.3",
"loader.js": "ember-cli/loader.js#3.2.1",
"qunit": "~1.18.0"
}
}
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"author": "Robert Jackson <me@rwjblue.com>",
"license": "MIT",
"devDependencies": {
"ember-cli": "1.13.1",
"ember-cli-app-version": "0.4.0",
"ember-cli": "1.13.8",
"ember-cli-app-version": "0.3.3",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "^1.0.0",
"ember-cli-dependency-checker": "^1.0.1",
"ember-cli-htmlbars": "0.7.9",
"ember-cli-htmlbars-inline-precompile": "^0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.15",
"ember-cli-uglify": "1.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.0.0",
"ember-cli-uglify": "^1.2.0",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-try": "0.0.6"
},
Expand Down
4 changes: 2 additions & 2 deletions tests/dummy/app/templates/application.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<h2 id="title">Welcome to Ember.js</h2>
<h2 id="title">Welcome to Ember</h2>

{{outlet}}
{{outlet}}