Skip to content

Commit

Permalink
Update to Ember 3.0.0.
Browse files Browse the repository at this point in the history
Done using `npx ember update`
Doesn’t enable new ember eslint rules for now.
  • Loading branch information
CvX committed Mar 25, 2018
1 parent 1dec351 commit ec2bbcb
Show file tree
Hide file tree
Showing 7 changed files with 1,695 additions and 1,221 deletions.
25 changes: 24 additions & 1 deletion .eslintrc.js
Expand Up @@ -7,9 +7,12 @@ module.exports = {
'experimentalObjectRestSpread': true,
},
},
plugins: [
'ember',
],
extends: [
'eslint:recommended',
'plugin:ember-suave/recommended',
'plugin:ember-suave/recommended', // to be replaced with 'plugin:ember/recommended',
],
env: {
browser: true,
Expand All @@ -31,4 +34,24 @@ module.exports = {
'ember-suave/no-direct-property-access': 'off',
'ember-suave/require-access-in-comments': 'off',
},
overrides: [
// node files
{
files: [
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'lib/*/index.js',
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015,
},
env: {
browser: false,
node: true,
},
},
],

};
2 changes: 2 additions & 0 deletions .travis.yml
Expand Up @@ -19,6 +19,7 @@ env:

before_install:
- nvm install 8
- npm config set spin false

install:
- cargo install --force diesel_cli --vers 1.0.0 --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
Expand Down Expand Up @@ -53,6 +54,7 @@ matrix:
- cargo build
- cargo test
- npm install
- npm run lint:js
- npm test
- rust: beta
script:
Expand Down
25 changes: 14 additions & 11 deletions config/targets.js
@@ -1,13 +1,16 @@
/* eslint-env node */
'use strict';

// These are the browsers we actually are attempting to support:
const browsers = [
'last 2 Chrome versions',
'last 1 Firefox version',
'Firefox ESR',
'last 1 Safari version',
'last 1 iOS version',
'last 1 Edge version',
'last 1 UCAndroid version',
];

module.exports = {
browsers: [
// These are the browsers we actually are attempting to support:
'last 2 Chrome versions',
'last 1 Firefox version',
'Firefox ESR',
'last 1 Safari version',
'last 1 iOS version',
'last 1 Edge version',
'last 1 UCAndroid version'
]
browsers
};

0 comments on commit ec2bbcb

Please sign in to comment.