Skip to content

Commit

Permalink
Merge pull request #179 from yapplabs/upgrades
Browse files Browse the repository at this point in the history
Upgrade ember-cli, ember-cli-babel, and friends
  • Loading branch information
lukemelia authored May 13, 2017
2 parents 7b98281 + 866bae3 commit e96b7d8
Show file tree
Hide file tree
Showing 6 changed files with 422 additions and 209 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
Expand Down
1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "ember-modal-dialog",
"dependencies": {
"ember": "~2.4.6"
}
}
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,34 @@
"test": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "^6.0.0-beta.9",
"ember-cli-htmlbars": "^1.0.8",
"ember-cli-babel": "^6.1.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-wormhole": "^0.5.1"
},
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"ember-cli": "^2.12.1",
"ember-cli": "^2.13.1",
"ember-cli-build-notifications": "^0.2.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "^3.0.0",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^3.1.0",
"ember-cli-github-pages": "^0.1.2",
"ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.2",
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-lorem-ipsum": "0.0.2",
"ember-cli-qunit": "^3.1.2",
"ember-cli-qunit": "^4.0.0",
"ember-cli-release": "^1.0.0-beta.2",
"ember-cli-sass": "^6.1.2",
"ember-cli-sass": "^6.1.3",
"ember-cli-shims": "^1.1.0",
"ember-source": "~2.13.0",
"ember-cli-uglify": "^1.2.0",
"ember-code-snippet": "^1.8.1",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.6.0",
"ember-resolver": "^2.0.3",
"ember-tether": "^0.4.1",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.1.0",
"ember-tether": "^1.0.0-beta.0",
"ember-truth-helpers": "^1.3.0",
"loader.js": "^4.2.3"
"loader.js": "^4.4.0"
},
"engines": {
"node": ">= 4"
Expand Down
10 changes: 10 additions & 0 deletions tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/* eslint-env node */

module.exports = {
browsers: [
'ie 9',
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions'
]
};
2 changes: 2 additions & 0 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
import {
setResolver
} from 'ember-qunit';
import { start } from 'ember-cli-qunit';

setResolver(resolver);
start();
Loading

0 comments on commit e96b7d8

Please sign in to comment.