Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update "ember-cli" to v2.13.0 #108

Merged
merged 1 commit into from
May 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@ sudo: false
cache:
directories:
- $HOME/.npm
- $HOME/.cache # includes bowers cache

before_install:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version
- npm install -g phantomjs-prebuilt
- phantomjs --version

install:
- npm install
- bower install

script:
# Usually, it's ok to finish the test scenario without reverting
Expand Down
4 changes: 0 additions & 4 deletions bower.json

This file was deleted.

10 changes: 10 additions & 0 deletions 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',
],
};
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
"ember-cli-version-checker": "^1.2.0"
},
"devDependencies": {
"ember-cli": "2.12.2",
"ember-cli": "2.13.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "^3.0.3",
"ember-cli-htmlbars": "^1.2.0",
"ember-cli-htmlbars-inline-precompile": "^0.4.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^3.1.0",
"ember-cli-shims": "^1.0.2",
"ember-cli-qunit": "^4.0.0",
"ember-cli-shims": "^1.1.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
Expand Down
6 changes: 3 additions & 3 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import resolver from './helpers/resolver';
import {
setResolver
} from 'ember-qunit';
import { setResolver } from 'ember-qunit';
import { start } from 'ember-cli-qunit';

setResolver(resolver);
start();