Skip to content

Commit

Permalink
update ember-cli and other libraries (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcoow authored Mar 26, 2017
1 parent c4cb2c2 commit dec45d3
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.editorconfig
.ember-cli
.gitignore
.jshintrc
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- "4"
- "6"

sudo: false

Expand Down
12 changes: 8 additions & 4 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
'use strict';

/* eslint-env node */

let EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
let stripTestSelectors = process.env['STRIP_TEST_SELECTORS'];
Expand All @@ -13,5 +10,12 @@ module.exports = function(defaults) {
}
});

/*
This build file specifies the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/

return app.toTree();
};
36 changes: 15 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,22 @@
"ember-cli-babel": "^5.1.7"
},
"devDependencies": {
"babel-core": "^5.8.38",
"broccoli-asset-rev": "^2.4.5",
"broccoli-stew": "^1.4.0",
"ember-ajax": "^2.4.1",
"ember-cli": "2.11.1",
"ember-cli-app-version": "^2.0.0",
"ember-cli": "2.12.1",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "3.0.2",
"ember-cli-htmlbars": "1.1.1",
"ember-cli-eslint": "^3.0.3",
"ember-cli-htmlbars": "^1.2.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-qunit": "^3.1.0",
"ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-data": "^2.11.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.6.3",
"ember-resolver": "^3.0.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-source": "~2.12.0",
"eslint": "^3.12.2",
"eslint-config-simplabs": "^0.4.0",
Expand All @@ -57,19 +51,19 @@
"mocha": "^3.2.0"
},
"engines": {
"node": ">= 0.12.0"
"node": ">= 4"
},
"ember-addon": {
"configPath": "tests/dummy/config",
"versionCompatibility": {
"ember": ">=1.13"
},
"greenkeeper": {
"ignore": [
"babel-core",
"eslint-plugin-ember",
"eslint-plugin-qunit"
]
}
},
"greenkeeper": {
"ignore": [
"babel-core",
"eslint-plugin-ember",
"eslint-plugin-qunit"
]
}
}
1 change: 0 additions & 1 deletion testem.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* eslint-env node */
module.exports = {
'framework': 'qunit',
'test_page': 'tests/index.html?hidepassed',
'disable_watching': true,
'launch_in_ci': [
Expand Down

0 comments on commit dec45d3

Please sign in to comment.