-
Notifications
You must be signed in to change notification settings - Fork 50
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
Upgrade Ember CLI to 3.12 LTS #138
Merged
drewlee
merged 25 commits into
ember-a11y:master
from
SergeAstapov:SergeAstapov/upgrade-deps
Nov 21, 2019
Merged
Changes from 21 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
0f9a31b
upgrade ember-cli to 3.4
EndangeredMassa 39d82ba
Update tests/integration/helpers/a11y-audit-if-test.js
rwjblue b0d74b1
Update tests/integration/helpers/a11y-audit-if-test.js
rwjblue c652c4d
Update tests/integration/helpers/a11y-audit-test.js
rwjblue 03fcf59
Update tests/integration/helpers/a11y-audit-test.js
rwjblue 2ed5aa3
Update tests/integration/helpers/a11y-audit-test.js
rwjblue 8e0ade3
Merge branch 'smassa/upgrade-ember-cli' of https://github.com/ember-a…
MelSumner 8eb8b75
updated to latest LTS(3.8) & added jQuery guard
MelSumner 95abe92
removed use of/support for node 6 & updated travis config and ember-try
MelSumner a0633da
travis config file update
MelSumner cce7000
moved jQuery guard to the correct place
MelSumner d05edeb
updated babel version as per review notes
MelSumner 2b76678
updated as per code review
MelSumner bfae7d8
updated concurrent axe test to use settled instead of wait
MelSumner 4fede46
Merge pull request #120 from ember-a11y/smassa/upgrade-ember-cli
MelSumner aecb957
updated to latest LTS (3.12)
SergeAstapov 2f2d07f
Merge branch 'master' into SergeAstapov/upgrade-deps
SergeAstapov 5fb0a11
Added @ember/jquery and fixed async/await syntax in tests
SergeAstapov a69f3ad
Fix ember-default scenario in .travis.yml
SergeAstapov 67ea4c3
Update .travis.yml
SergeAstapov ea5a3a4
Remove 2.12 and 2.16 ember-try configs from .travis.yml
SergeAstapov c657130
Fix missing semicolons and JSDoc typo
SergeAstapov 2a57283
Fix Compatibility section in README.md
SergeAstapov 47174f9
Update engines.node section in package.json
SergeAstapov 4c3e39d
Remove registerAsyncHelper() global-style helper
SergeAstapov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# unconventional js | ||
/blueprints/*/files/ | ||
/vendor/ | ||
|
||
# compiled output | ||
/dist/ | ||
/tmp/ | ||
|
||
# dependencies | ||
/bower_components/ | ||
|
||
# misc | ||
/coverage/ | ||
|
||
# ember-try | ||
/.node_modules.ember-try/ | ||
/bower.json.ember-try | ||
/package.json.ember-try |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
# See https://help.github.com/ignore-files/ for more about ignoring files. | ||
|
||
# compiled output | ||
/dist | ||
/tmp | ||
/dist/ | ||
/tmp/ | ||
|
||
# dependencies | ||
/node_modules | ||
/bower_components | ||
/bower_components/ | ||
/node_modules/ | ||
|
||
# misc | ||
/.sass-cache | ||
/connect.lock | ||
/coverage/* | ||
/coverage/ | ||
/libpeerconnection.log | ||
npm-debug.log* | ||
yarn-error.log | ||
testem.log | ||
/npm-debug.log* | ||
/testem.log | ||
/yarn-error.log | ||
|
||
# ember-try | ||
.node_modules.ember-try/ | ||
bower.json.ember-try | ||
package.json.ember-try | ||
/.node_modules.ember-try/ | ||
/bower.json.ember-try | ||
/package.json.ember-try |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,28 @@ | ||
/bower_components | ||
# compiled output | ||
/dist/ | ||
/tmp/ | ||
|
||
# dependencies | ||
/bower_components/ | ||
|
||
# misc | ||
/.bowerrc | ||
/.editorconfig | ||
/.ember-cli | ||
/.eslintignore | ||
/.eslintrc.js | ||
/.gitignore | ||
/.watchmanconfig | ||
/.travis.yml | ||
/bower.json | ||
/config/ember-try.js | ||
/dist | ||
/tests | ||
/tmp | ||
**/.gitkeep | ||
.bowerrc | ||
.editorconfig | ||
.ember-cli | ||
.eslintrc.js | ||
.gitignore | ||
.watchmanconfig | ||
.travis.yml | ||
bower.json | ||
ember-cli-build.js | ||
testem.js | ||
/ember-cli-build.js | ||
/testem.js | ||
/tests/ | ||
/yarn.lock | ||
.gitkeep | ||
|
||
# ember-try | ||
.node_modules.ember-try/ | ||
bower.json.ember-try | ||
package.json.ember-try | ||
/.node_modules.ember-try/ | ||
/bower.json.ember-try | ||
/package.json.ember-try |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,75 +1,93 @@ | ||
module.exports = { | ||
useYarn: true, | ||
scenarios: [ | ||
{ | ||
name: 'ember-lts-2.12', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': '~2.12.0' | ||
'use strict'; | ||
|
||
const getChannelURL = require('ember-source-channel-url'); | ||
|
||
module.exports = async function() { | ||
return { | ||
useYarn: true, | ||
scenarios: [ | ||
{ | ||
name: 'ember-lts-2.18', | ||
env: { | ||
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'@ember/jquery': '^0.5.1', | ||
'ember-source': '~2.18.0' | ||
} | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-lts-2.16', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': '~2.16.0' | ||
}, | ||
{ | ||
name: 'ember-lts-3.4', | ||
env: { | ||
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'@ember/jquery': '^0.5.1', | ||
'ember-source': '~3.4.0' | ||
} | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-release', | ||
bower: { | ||
dependencies: { | ||
'ember': 'components/ember#release' | ||
}, | ||
{ | ||
name: 'ember-lts-3.8', | ||
env: { | ||
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), | ||
}, | ||
resolutions: { | ||
'ember': 'release' | ||
npm: { | ||
devDependencies: { | ||
'ember-source': '~3.8.0' | ||
} | ||
} | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'ember-source': null | ||
{ | ||
name: 'ember-release', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': await getChannelURL('release') | ||
} | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-beta', | ||
bower: { | ||
dependencies: { | ||
'ember': 'components/ember#beta' | ||
}, | ||
resolutions: { | ||
'ember': 'beta' | ||
}, | ||
{ | ||
name: 'ember-beta', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': await getChannelURL('beta') | ||
} | ||
} | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'ember-source': null | ||
{ | ||
name: 'ember-canary', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': await getChannelURL('canary') | ||
} | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-canary', | ||
bower: { | ||
dependencies: { | ||
'ember': 'components/ember#canary' | ||
}, | ||
resolutions: { | ||
'ember': 'canary' | ||
}, | ||
// The default `.travis.yml` runs this scenario via `npm test`, | ||
// not via `ember try`. It's still included here so that running | ||
// `ember try:each` manually or from a customized CI config will run it | ||
// along with all the other scenarios. | ||
{ | ||
name: 'ember-default', | ||
npm: { | ||
devDependencies: {} | ||
} | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'ember-source': null | ||
{ | ||
name: 'ember-default-with-jquery', | ||
env: { | ||
EMBER_OPTIONAL_FEATURES: JSON.stringify({ | ||
'jquery-integration': true | ||
}) | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'@ember/jquery': '^0.5.1' | ||
} | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-default', | ||
npm: { | ||
devDependencies: {} | ||
} | ||
} | ||
] | ||
] | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should change this to 2.18 (since that is all we are testing)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed