Skip to content

Commit 676a1e7

Browse files
committed
Merge pull request #306 from Gaurav0/update_ember_cli_2_2_beta_3
Update ember-cli version to 2.2beta3
2 parents 4f65b22 + 57641e4 commit 676a1e7

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dependencies": {
44
"ember": "2.2.0",
55
"ember-cli-shims": "0.0.6",
6-
"ember-cli-test-loader": "0.2.1",
6+
"ember-cli-test-loader": "0.2.2",
77
"ember-data": "2.2.1",
88
"ember-load-initializers": "0.1.7",
99
"ember-qunit-notifications": "0.1.0",

ember-cli-build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* global require, module, process */
2-
module.exports = function() {
2+
module.exports = function(defaults) {
33
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
44
var funnel = require('broccoli-funnel');
55
var concat = require('broccoli-concat');
@@ -16,7 +16,7 @@ module.exports = function() {
1616

1717
var blueprintsCode = getEmberCLIBlueprints();
1818

19-
var app = new EmberApp({
19+
var app = new EmberApp(defaults, {
2020
SRI: {
2121
runsIn: "production"
2222
},

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"ember-api-actions": "0.0.11",
3232
"ember-autoresize": "0.5.14",
3333
"ember-browserify": "1.1.4",
34-
"ember-cli": "2.2.0-beta.1",
34+
"ember-cli": "2.2.0-beta.3",
3535
"ember-cli-app-version": "1.0.0",
3636
"ember-cli-babel": "^5.1.5",
3737
"ember-cli-bootstrap-sassy": "0.5.1",
@@ -63,7 +63,7 @@
6363
},
6464
"dependencies": {
6565
"babel": "^5.0.0",
66-
"ember-cli-sri": "1.2.0",
66+
"ember-cli-sri": "2.0.0",
6767
"ember-cli-uglify": "1.2.0",
6868
"ember-data": "2.2.1",
6969
"ember-disable-proxy-controllers": "1.0.1",

tests/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626

2727
{{content-for "body"}}
2828
{{content-for "test-body"}}
29+
30+
<script src="testem.js" integrity=""></script>
2931
<script src="assets/vendor.js"></script>
3032
<script src="assets/test-support.js"></script>
3133
<script src="assets/ember-twiddle.js"></script>
32-
<script src="testem.js" integrity=""></script>
3334
<script src="assets/tests.js"></script>
3435
<script src="assets/test-loader.js"></script>
3536

0 commit comments

Comments
 (0)