Skip to content

Commit

Permalink
upgrade ember-cli to 2.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanpenner committed Jun 22, 2016
1 parent ba71505 commit d0793f1
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 26 deletions.
19 changes: 8 additions & 11 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
{
"name": "ember-cli-babel",
"dependencies": {
"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.8",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
"ember-qunit": "0.4.9",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.18",
"jquery": "1.11.3",
"loader.js": "ember-cli/loader.js#3.2.1",
"qunit": "~1.18.0"
"ember": "~2.6.0",
"ember-cli-shims": "0.1.1",
"ember-cli-test-loader": "0.2.2",
"ember-qunit-notifications": "0.1.0"
},
"resolutions": {
"qunit-notifications": "~0.1.0",
"ember": "~2.6.0"
}
}
16 changes: 16 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,28 @@
var EmberApp = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
/* hack so that we can test ourselves, only really and ember-cli-babel thing */
var super$addonInstalled = EmberApp.prototype._addonInstalled;

EmberApp.prototype._addonInstalled = function(addonName) {
if (addonName === 'ember-cli-babel') {
return true;
} else{
return super$addonInstalled.call(this, addonName);
}
};
/* end hack */

var app = new EmberApp(defaults, {
babel: {
includePolyfill: true
}
});





/*
This build file specifes the options for the dummy test app of this
addon, located in `/tests/dummy`
Expand Down
22 changes: 8 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,18 @@
},
"homepage": "https://github.com/babel/ember-cli-babel",
"devDependencies": {
"broccoli-asset-rev": "^2.1.2",
"ember-cli": "1.13.8",
"ember-cli-app-version": "0.5.0",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "^1.0.1",
"ember-cli-htmlbars": "0.7.9",
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
"ember-cli-ic-ajax": "0.2.1",
"ember-cli": "^2.6.2",
"ember-cli-app-version": "^1.0.0",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-htmlbars": "^1.0.8",
"ember-cli-htmlbars-inline-precompile": "^0.3.2",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.0.0",
"ember-cli-release": "0.2.3",
"ember-cli-sri": "^1.0.3",
"ember-cli-uglify": "^1.2.0",
"ember-data": "1.13.8",
"ember-disable-proxy-controllers": "^1.0.0",
"ember-export-application-global": "^1.0.3",
"ember-disable-prototype-extensions": "^1.0.0",
"jshint": "^2.6.3"
"ember-load-initializers": "0.5.1",
"ember-resolver": "2.0.3",
"loader.js": "4.0.10"
},
"keywords": [
"ember-addon"
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/resolver.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Resolver from 'ember/resolver';
import Resolver from 'ember-resolver';
import config from '../../config/environment';

var resolver = Resolver.create();
Expand Down
1 change: 1 addition & 0 deletions tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/dummy.js"></script>
<script src="assets/tests.js"></script>
<script src="testem.js"></script>
<script src="assets/test-loader.js"></script>

Expand Down

0 comments on commit d0793f1

Please sign in to comment.