Skip to content
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

Add ember-source 5 support #893

Merged
merged 7 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ jobs:
try-scenario:
- ember-lts-3.28
- ember-lts-4.4
- ember-lts-4.8
- ember-release
- ember-classic
- embroider-safe
SergeAstapov marked this conversation as resolved.
Show resolved Hide resolved
experimental: [false]
include:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ will be automatically restored to their original methods at the end of each test

## Compatibility

- Sinon.js v15.0.0 or above
- Sinon.js v15 or above
- Ember.js v3.28 or above
- Ember CLI v3.28 or above
- Node.js v14 or above
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,19 @@
"postpack": "ember ts:clean"
},
"dependencies": {
"@types/sinon": "^10.0.13",
"@types/sinon": "^10.0.19",
"broccoli-funnel": "^3.0.8",
"ember-auto-import": "^2.6.1",
"ember-auto-import": "^2.6.3",
"ember-cli-babel": "^7.26.11",
"ember-cli-typescript": "^5.2.1"
},
"devDependencies": {
"@babel/core": "^7.23.0",
"@babel/eslint-parser": "^7.21.3",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@embroider/test-setup": "^2.1.1",
"@ember/test-helpers": "^3.2.0",
"@embroider/test-setup": "^3.0.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@release-it-plugins/lerna-changelog": "^5.0.0",
Expand All @@ -58,7 +59,6 @@
"@types/ember-data__model": "^4.0.0",
"@types/ember-data__serializer": "^4.0.1",
"@types/ember-data__store": "^4.0.2",
"@types/ember-qunit": "^6.1.1",
"@types/ember-resolver": "^9.0.0",
"@types/ember__application": "^4.0.5",
"@types/ember__array": "^4.0.3",
Expand Down Expand Up @@ -87,15 +87,15 @@
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "^4.11.3",
"ember-data": "^5.3.0",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^6.2.0",
"ember-qunit": "^7.0.0",
"ember-resolver": "^10.0.0",
"ember-source": "~4.11.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.7.2",
"ember-try": "^2.0.0",
"ember-try": "^3.0.0",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.4.9",
Expand All @@ -104,23 +104,23 @@
"eslint-plugin-qunit": "^7.3.4",
"loader.js": "^4.7.0",
"prettier": "^2.8.7",
"qunit": "^2.19.4",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
"release-it": "^15.10.1",
"sinon": "^15.0.3",
"sinon": "^16.1.0",
"typescript": "^5.0.3",
"webpack": "^5.77.0"
"webpack": "^5.88.2"
},
"peerDependencies": {
"ember-source": "^3.28.0 || ^4.0.0",
"ember-source": ">=3.28.0",
"qunit": "^2.0.0",
"sinon": "^15.0.3"
"sinon": "^15.0.3 || ^16.0.0"
},
"engines": {
"node": "14.* || 16.* || >= 18"
},
"volta": {
"node": "14.21.1",
"node": "16.20.2",
"yarn": "1.22.19"
},
"publishConfig": {
Expand Down
30 changes: 12 additions & 18 deletions tests/dummy/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ module.exports = async function () {
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'@ember/test-helpers': '^2.9.3',
'ember-data': '~3.28.0',
'ember-qunit': '^6.0.0',
'ember-source': '~3.28.0',
},
},
Expand All @@ -19,49 +22,40 @@ module.exports = async function () {
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-data': '~4.4.0',
'ember-source': '~4.4.0',
},
},
},
{
name: 'ember-release',
name: 'ember-lts-4.8',
npm: {
devDependencies: {
'ember-source': await getChannelURL('release'),
'ember-source': '~4.8.0',
},
},
},
{
name: 'ember-beta',
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': await getChannelURL('beta'),
'ember-source': await getChannelURL('release'),
},
},
},
{
name: 'ember-canary',
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': await getChannelURL('canary'),
'ember-source': await getChannelURL('beta'),
},
},
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false,
}),
},
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
},
ember: {
edition: 'classic',
'ember-source': await getChannelURL('canary'),
},
},
},
Expand Down
Loading