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.

Sign up for GitHub

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

Updates for LTS 3.28 including ember-data #1085

Merged
merged 10 commits into from
Feb 8, 2022
Merged

Updates for LTS 3.28 including ember-data #1085

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ba8c1ed
Adjust lts scenarios
ef4 Jan 23, 2022
c69b99d
Update tests/scenarios/scenarios.ts
ef4 Jan 24, 2022
65454a7
Merge remote-tracking branch 'origin/main' into adjust-lts-scenarios
ef4 Feb 6, 2022
0b6233c
Use broccoli memoization by default
ef4 Feb 8, 2022
11020c7
Merge branch 'broccoli-memoize' into adjust-lts-scenarios
ef4 Feb 8, 2022
c04d4d2
test support for simulated watching
ef4 Feb 8, 2022
4d36a05
Merge branch 'broccoli-memoize' into adjust-lts-scenarios
ef4 Feb 8, 2022
0fdbb37
adjusting build.didChange usage
ef4 Feb 8, 2022
9084dc3
Merge branch 'broccoli-memoize' into adjust-lts-scenarios
ef4 Feb 8, 2022
f203ff7
adjust package rules for ember-data
ef4 Feb 8, 2022
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
6 changes: 3 additions & 3 deletions tests/scenarios/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,25 @@
"broccoli-persistent-filter": "^3.1.2",
"ember-bootstrap": "^4.6.3",
"ember-cli-3.16": "npm:ember-cli@~3.16.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious, why keep 3.16 and drop 3.20?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Purely to keep the test suite smaller. We still support both, we're just testing the older one of the two and assuming it's unlikely that the newer one is broken if LTS releases on either side of it are working.

"ember-cli-3.20": "npm:ember-cli@~3.20.0",
"ember-cli-3.24": "npm:ember-cli@~3.24.0",
"ember-cli-3.28": "npm:ember-cli@~3.28.0",
"ember-cli-beta": "npm:ember-cli@beta",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-htmlbars-3": "npm:ember-cli-htmlbars@3",
"ember-cli-latest": "npm:ember-cli@latest",
"ember-cli-fastboot": "^2.2.3",
"ember-composable-helpers": "^4.4.1",
"ember-data-3.16": "npm:ember-data@~3.16.0",
"ember-data-3.20": "npm:ember-data@~3.20.0",
"ember-data-3.24": "npm:ember-data@~3.24.0",
"ember-data-3.28": "npm:ember-data@~3.28.0",
"ember-data-latest": "npm:ember-data@latest",
"ember-engines": "^0.8.17",
"ember-inline-svg": "^0.2.1",
"ember-source-latest": "npm:ember-source@latest",
"ember-source-beta": "npm:ember-source@beta",
"ember-source-3.16": "npm:ember-source@~3.16.0",
"ember-source-3.20": "npm:ember-source@~3.20.0",
"ember-source-3.24": "npm:ember-source@~3.24.0",
"ember-source-3.28": "npm:ember-source@~3.28.0",
"ember-truth-helpers": "^3.0.0"
},
"volta": {
Expand Down
17 changes: 7 additions & 10 deletions tests/scenarios/scenarios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,6 @@ async function lts_3_16(project: Project) {
project.linkDevDependency('@ember/string', { baseDir: __dirname });
}

async function lts_3_20(project: Project) {
project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-3.20' });
project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-3.20' });
project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-3.20' });

// needed because the ember-inflector used by this ember-data version blows up without it
project.linkDevDependency('@ember/string', { baseDir: __dirname });
}

async function lts_3_24(project: Project) {
project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-3.24' });
project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-3.24' });
Expand All @@ -42,6 +33,12 @@ async function lts_3_24(project: Project) {
project.linkDevDependency('@ember/string', { baseDir: __dirname });
}

async function lts_3_28(project: Project) {
project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-3.28' });
project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-3.28' });
project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-3.38' });
ef4 marked this conversation as resolved.
Show resolved Hide resolved
}

async function release(project: Project) {
project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-latest' });
project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-latest' });
Expand All @@ -51,8 +48,8 @@ async function release(project: Project) {
export function supportMatrix(scenarios: Scenarios) {
return scenarios.expand({
lts_3_16,
lts_3_20,
lts_3_24,
lts_3_28,
release,
});
}
Expand Down
Loading