github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-19 18:12:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade ember-cli to 0.1.7

Browse Source
This commit is contained in:
Toby Zerner 2015-01-21 14:28:28 +10:30
parent 106c51071b
commit aa346b3884
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/ember/.editorconfig
View File

@ -29,5 +29,5 @@ indent_size = 2
indent_style = space
indent_size = 2
[*.md]
[*.{diff,md}]
trim_trailing_whitespace = false

8
framework/core/ember/bower.json
View File

@ -5,11 +5,11 @@
"jquery": "^1.11.1",
"ember": "1.9.1",
"ember-data": "1.0.0-beta.14",
"ember-resolver": "~0.1.10",
"loader.js": "stefanpenner/loader.js#1.0.1",
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
"ember-resolver": "~0.1.11",
"loader.js": "ember-cli/loader.js#1.0.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
"ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-qunit": "0.1.8",
"ember-qunit-notifications": "0.0.4",
"qunit": "~1.15.0",

4
framework/core/ember/config/environment.js
View File

@ -21,10 +21,10 @@ module.exports = function(environment) {
if (environment === 'development') {
// ENV.APP.LOG_RESOLVER = true;
ENV.APP.LOG_ACTIVE_GENERATION = true;
// ENV.APP.LOG_ACTIVE_GENERATION = true;
// ENV.APP.LOG_TRANSITIONS = true;
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
ENV.APP.LOG_VIEW_LOOKUPS = true;
// ENV.APP.LOG_VIEW_LOOKUPS = true;
}
if (environment === 'test') {

15
framework/core/ember/package.json
View File

@ -18,22 +18,21 @@
"author": "",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^1.0.0",
"ember-cli": "0.1.4",
"broccoli-asset-rev": "^2.0.0",
"ember-cli": "0.1.7",
"ember-cli-6to5": "0.2.1",
"ember-cli-content-security-policy": "0.3.0",
"ember-cli-dependency-checker": "0.0.6",
"ember-cli-esnext": "0.1.1",
"ember-cli-htmlbars": "^0.5.4",
"ember-cli-dependency-checker": "0.0.7",
"ember-cli-htmlbars": "^0.6.0",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-less": "^1.0.5",
"ember-cli-qunit": "0.1.2",
"ember-data": "1.0.0-beta.12",
"ember-data": "1.0.0-beta.14",
"ember-dynamic-component": "0.0.4",
"ember-export-application-global": "^1.0.0",
"ember-json-api": "^0.2.3",
"express": "^4.8.5",
"glob": "^4.0.5",
"liquid-fire": "^0.16.0"
"glob": "^4.0.5"
}
}

10
framework/core/ember/tests/helpers/start-app.js
View File

@ -4,16 +4,16 @@ import Router from '../../router';
import config from '../../config/environment';
export default function startApp(attrs) {
var App;
var application;
var attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
Ember.run(function() {
App = Application.create(attributes);
App.setupForTesting();
App.injectTestHelpers();
application = Application.create(attributes);
application.setupForTesting();
application.injectTestHelpers();
});
return App;
return application;
}