Skip to content

Commit

Permalink
Merge pull request #392 from sir-dunxalot/mf-upgrade_ember_cli
Browse files Browse the repository at this point in the history
Upgrade Ember & Ember-CLI to 3.15
maxfierke authored Jan 20, 2020
2 parents d0cf778 + 964a74e commit 5047aee
Showing 32 changed files with 3,976 additions and 2,210 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,10 @@ module.exports = {
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module'
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
},
plugins: [
'ember'
10 changes: 7 additions & 3 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
'use strict';

module.exports = {
extends: 'recommended',
extends: 'octane',

rules: {
'attribute-indentation': false,
},
'no-curly-component-invocation': {
allow: [
'maybe-in-element',
]
}
}
};
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "8"
- "10"

sudo: false
dist: trusty
@@ -32,7 +32,6 @@ jobs:

include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
install:
@@ -42,7 +41,10 @@ jobs:
- yarn lint:js
- yarn test

- name: "Floating dependencies"
- stage: "Additional Tests"
name: "Floating Dependencies"
install:
- yarn install --no-lockfile
script:
- yarn test

@@ -53,10 +55,12 @@ jobs:
env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
- env: EMBER_TRY_SCENARIO=ember-classic

script:
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
Loading

0 comments on commit 5047aee

Please sign in to comment.