Skip to content

Commit

Permalink
update ember-cli (#73)
Browse files Browse the repository at this point in the history
  • Loading branch information
efx authored and offirgolan committed Feb 24, 2019
1 parent ea0d578 commit 59a02b5
Show file tree
Hide file tree
Showing 6 changed files with 1,876 additions and 2,611 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/node_modules/

# misc
/.env*
/.sass-cache
/connect.lock
/coverage/
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintignore
/.eslintrc.js
/.gitignore
Expand Down
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ jobs:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: 'Additional Tests'
env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
Expand Down
12 changes: 0 additions & 12 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@ module.exports = function() {
]).then((urls) => {
return {
scenarios: [
{
name: 'ember-lts-2.16',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.16.0'
}
}
},
{
name: 'ember-lts-2.18',
env: {
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
"@ember/optional-features": "^0.6.3",
"babel-eslint": "^10.0.1",
"broccoli-asset-rev": "^2.7.0",
"ember-cli": "~3.6.1",
"ember-cli": "~3.7.1",
"ember-cli-autoprefixer": "^0.8.1",
"ember-cli-changelog": "^0.3.4",
"ember-cli-changelog": "html-next/ember-cli-changelog#v0.4.0-beta.1",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-eslint": "^4.2.3",
"ember-cli-github-pages": "^0.2.1",
Expand All @@ -64,7 +64,7 @@
"ember-qunit": "^3.4.1",
"ember-qunit-nice-errors": "^1.1.2",
"ember-resolver": "^5.0.1",
"ember-source": "~3.6.0",
"ember-source": "~3.7.0",
"ember-source-channel-url": "^1.1.0",
"ember-truth-helpers": "^2.1.0",
"ember-try": "^1.1.0",
Expand Down
Loading

0 comments on commit 59a02b5

Please sign in to comment.