Skip to content

Commit

Permalink
Merge pull request #104 from jrjohnson/update-ember-cli-3.15.1
Browse files Browse the repository at this point in the history
Update to Ember CLI 3.15.1
  • Loading branch information
jrjohnson authored Jan 4, 2020
2 parents 5979377 + 42338d5 commit df1e74c
Show file tree
Hide file tree
Showing 12 changed files with 6,214 additions and 2,204 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ module.exports = {
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module'
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
},
plugins: [
'ember'
Expand Down
18 changes: 16 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,20 @@ jobs:
- name: test
run: npm test

test-floating:
name: Floating Dependencies
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 8
- name: install dependencies
run: npm install --no-package-lock
- name: test
run: npm test

try-scenarios:
name: ember-try

Expand All @@ -37,15 +51,15 @@ jobs:
needs: test

strategy:
fail-fast: true
matrix:
ember-try-scenario:
- ember-lts-3.4
- ember-lts-3.8
- ember-lts-3.12
- ember-release
- ember-beta
- ember-canary
- ember-default-with-jquery
- ember-classic

steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = {
extends: 'recommended'
extends: 'octane'
};
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ It is built using EmberJS and takes advantage of the awesome [Sharp](https://git
Compatibility
------------------------------------------------------------------------------

* Ember.js v3.4 or above
* Ember.js v3.8 or above
* Ember CLI v2.13 or above
* Node.js v8 or above

Expand Down
23 changes: 19 additions & 4 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ module.exports = async function() {
return {
scenarios: [
{
name: 'ember-lts-3.4',
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
'ember-source': '~3.8.0'
}
}
},
{
name: 'ember-lts-3.8',
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
'ember-source': '~3.12.0'
}
}
},
Expand Down Expand Up @@ -67,6 +67,21 @@ module.exports = async function() {
'@ember/jquery': '^0.5.1'
}
}
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false
})
},
npm: {
ember: {
edition: 'classic'
}
}
}
]
};
Expand Down
Loading

0 comments on commit df1e74c

Please sign in to comment.