Skip to content

Commit cfc3757

Browse files
wycatswycats
committed
Merge pull request #2 from stefanpenner/update-ember-cli
update to ember-cli 0.0.46
2 parents a11561e + e4f795e commit cfc3757

19 files changed

+138
-56
lines changed

‎.bowerrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"directory": "vendor"
2+
"directory": "bower_components",
3+
"analytics": false
34
}

‎.editorconfig

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# EditorConfig helps developers define and maintain consistent
2+
# coding styles between different editors and IDEs
3+
# editorconfig.org
4+
5+
root = true
6+
7+
8+
[*]
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true
13+
indent_style = space
14+
indent_size = 2
15+
16+
[*.js]
17+
indent_style = space
18+
indent_size = 2
19+
20+
[*.hbs]
21+
indent_style = space
22+
indent_size = 2
23+
24+
[*.css]
25+
indent_style = space
26+
indent_size = 2
27+
28+
[*.html]
29+
indent_style = space
30+
indent_size = 2
31+
32+
[*.md]
33+
trim_trailing_whitespace = false

‎.ember-cli

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
/**
3+
Ember CLI sends analytics information by default. The data is completely
4+
anonymous, but there are times when you might want to disable this behavior.
5+
6+
Setting `disableAnalytics` to true will prevent any data from being sent.
7+
*/
8+
"disableAnalytics": false
9+
}

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# dependencies
99
/node_modules
10-
/vendor/*
10+
/bower_components/*
1111

1212
# misc
1313
/.sass-cache

‎.jshintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"predef": {
33
"document": true,
44
"window": true,
5-
"CargoENV": true
5+
"-Promise": true
66
},
77
"browser" : true,
88
"boss" : true,

‎app/app.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import Ember from 'ember';
22
import Resolver from 'ember/resolver';
33
import loadInitializers from 'ember/load-initializers';
4+
import config from './config/environment';
45

56
Ember.MODEL_FACTORY_INJECTIONS = true;
67

78
var App = Ember.Application.extend({
8-
modulePrefix: 'cargo', // TODO: loaded via config
9+
modulePrefix: config.modulePrefix,
10+
podModulePrefix: config.podModulePrefix,
911
Resolver: Resolver
1012
});
1113

12-
loadInitializers(App, 'cargo');
14+
loadInitializers(App, config.modulePrefix);
1315

1416
export default App;

‎app/index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
</head>
1515
<body>
1616
<script>
17-
window.CargoENV = {{ENV}};
18-
window.EmberENV = window.CargoENV.EmberENV;
17+
window.EmberENV = {{EMBER_ENV}};
1918
</script>
2019
<script src="assets/vendor.js"></script>
2120
<script src="assets/cargo.js"></script>
2221
<script>
23-
window.Cargo = require('cargo/app')['default'].create(CargoENV.APP);
22+
window.Cargo = require('cargo/app')['default'].create({{APP_CONFIG}});
2423
</script>
2524
</body>
2625
</html>

‎app/router.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import Ember from 'ember';
2+
import config from './config/environment';
23

34
var Router = Ember.Router.extend({
4-
location: CargoENV.locationType
5+
location: config.locationType
56
});
67

78
Router.map(function() {

‎bower.json

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
"dependencies": {
44
"handlebars": "~1.3.0",
55
"jquery": "^1.11.1",
6-
"qunit": "~1.12.0",
7-
"ember-qunit": "~0.1.5",
8-
"ember": "components/ember#canary",
9-
"ember-resolver": "~0.1.1",
10-
"loader": "stefanpenner/loader.js#1.0.0",
11-
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.2",
6+
"ember": "1.7.0",
7+
"ember-data": "1.0.0-beta.10",
8+
"ember-resolver": "~0.1.7",
9+
"loader": "stefanpenner/loader.js#1.0.1",
10+
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
11+
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
1212
"ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
13-
"ember-qunit-notifications": "^0.0.3",
14-
"ember-cli-test-loader": "rjackson/ember-cli-test-loader#0.0.2"
15-
},
16-
"resolutions": {
17-
"ember": "canary"
13+
"ember-qunit": "0.1.8",
14+
"ember-qunit-notifications": "0.0.4",
15+
"qunit": "~1.15.0"
1816
}
1917
}

‎config/environment.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
module.exports = function(environment) {
44
var ENV = {
5+
modulePrefix: 'cargo',
56
environment: environment,
67
baseURL: '/',
78
locationType: 'auto',
@@ -19,17 +20,25 @@ module.exports = function(environment) {
1920
};
2021

2122
if (environment === 'development') {
22-
// LOG_MODULE_RESOLVER is needed for pre-1.6.0
23-
// ENV.LOG_MODULE_RESOLVER = true;
24-
2523
// ENV.APP.LOG_RESOLVER = true;
26-
// ENV.APP.LOG_ACTIVE_GENERATION = true;
27-
// ENV.APP.LOG_MODULE_RESOLVER = true;
28-
ENV.APP.LOG_TRANSITIONS = true;
24+
ENV.APP.LOG_ACTIVE_GENERATION = true;
25+
// ENV.APP.LOG_TRANSITIONS = true;
2926
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
3027
ENV.APP.LOG_VIEW_LOOKUPS = true;
3128
}
3229

30+
if (environment === 'test') {
31+
// Testem prefers this...
32+
ENV.baseURL = '/';
33+
ENV.locationType = 'auto';
34+
35+
// keep test console output quieter
36+
ENV.APP.LOG_ACTIVE_GENERATION = false;
37+
ENV.APP.LOG_VIEW_LOOKUPS = false;
38+
39+
ENV.APP.rootElement = '#ember-testing';
40+
}
41+
3342
if (environment === 'production') {
3443

3544
}

0 commit comments

Comments
 (0)