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

Fix stable #2204

Merged
merged 9 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 6 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ module.exports = function (environment) {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false,
},
EXTEND_PROTOTYPES: false,
},

APP: {
Expand Down
5 changes: 1 addition & 4 deletions tests/fixtures/fastboot-app/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ module.exports = function (environment) {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false,
},
EXTEND_PROTOTYPES: false,
},
fastboot: {
hostWhitelist: ['localhost:4200'],
Expand Down
5 changes: 1 addition & 4 deletions tests/fixtures/macro-test/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ module.exports = function (environment) {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false,
},
EXTEND_PROTOTYPES: false,
},

APP: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ module('Integration | Macro | macroCondition', function (hooks) {
assert.ok(true, 'it ran');
};
await render(
hbs`<div data-test-target {{action this.doThing}} {{macroMaybeAttrs false data-optional data-flavor="vanilla" }} ></div>`
hbs`<div data-test-target {{on "click" this.doThing}} {{macroMaybeAttrs false data-optional data-flavor="vanilla" }} ></div>`
);
let target = this.element.querySelector('[data-test-target]');
await click(target);
Expand Down
1 change: 0 additions & 1 deletion tests/scenarios/compat-resolver-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ Scenarios.fromProject(() => new Project())
emberVersion = '4.6.0' //based on app-template package.json
) {
let etcOptions: EtcOptions = {
compilerPath: require.resolve('ember-source-latest/dist/ember-template-compiler'),
targetFormat: 'hbs',
transforms: [
...(extraOpts?.astPlugins ?? []),
Expand Down
8 changes: 2 additions & 6 deletions tests/scenarios/compat-route-split-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,7 @@ splitScenarios
EmberENV: {
FEATURES: {
},
EXTEND_PROTOTYPES: {
Date: false
}
EXTEND_PROTOTYPES: false,
},
APP: {}
};
Expand Down Expand Up @@ -412,9 +410,7 @@ splitScenarios
EmberENV: {
FEATURES: {
},
EXTEND_PROTOTYPES: {
Date: false
}
EXTEND_PROTOTYPES: false,
},
APP: {}
};
Expand Down
3 changes: 3 additions & 0 deletions tests/scenarios/compat-stage2-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@ stage2Scenarios
});

stage2Scenarios
// last release that supports non-colocated templates (which is part of what
// this test is testing)
.only('lts_5_12-compat-stage2-build')
.map('static-with-rules', app => {
app.addDependency('some-library', '1.0.0');
app.linkDependency('@embroider/sample-transforms', { baseDir: __dirname });
Expand Down
4 changes: 1 addition & 3 deletions tests/scenarios/compat-template-colocation-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,7 @@ appScenarios
EmberENV: {
FEATURES: {
},
EXTEND_PROTOTYPES: {
Date: false
}
EXTEND_PROTOTYPES: false,
},
APP: {}
};
Expand Down
8 changes: 2 additions & 6 deletions tests/scenarios/engines-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ let engineScenarios = appScenarios.map('engines', project => {
});

engineScenarios
.skip('lts_3_28-engines') // this skip should be removed before https://github.com/embroider-build/embroider/pull/1435 is merged
.skip('lts_4_4-engines') // this skip should be removed before https://github.com/embroider-build/embroider/pull/1435 is merged
.skip('release-engines') // this skip should be removed before https://github.com/embroider-build/embroider/pull/1435 is merged
.skip()
.map('without-fastboot', () => {})
.forEachScenario(scenario => {
Qmodule(scenario.name, function (hooks) {
Expand Down Expand Up @@ -137,9 +135,7 @@ engineScenarios
});

engineScenarios
.skip('lts_3_28-engines') // fails due to https://github.com/emberjs/ember.js/pull/20461
.skip('lts_4_4-engines') // fails due to https://github.com/emberjs/ember.js/pull/20461
.skip('release-engines') // fails due to https://github.com/emberjs/ember.js/pull/20461
.skip()
.map('with-fastboot', app => {
app.linkDependency('ember-cli-fastboot', { baseDir: __dirname });
app.linkDependency('fastboot', { baseDir: __dirname });
Expand Down
2 changes: 2 additions & 0 deletions tests/scenarios/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"ember-cli-4.8": "npm:ember-cli@~4.8.0",
"ember-cli-5.4": "npm:ember-cli@~5.4.0",
"ember-cli-5.8": "npm:ember-cli@~5.8.0",
"ember-cli-5.12": "npm:ember-cli@~5.12.0",
"ember-cli-babel-latest": "npm:ember-cli-babel@latest",
"ember-cli-beta": "npm:ember-cli@beta",
"ember-cli-fastboot": "^4.1.1",
Expand All @@ -90,6 +91,7 @@
"ember-source-4.8": "npm:ember-source@~4.8.0",
"ember-source-5.4": "npm:ember-source@~5.4.0",
"ember-source-5.8": "npm:ember-source@~5.8.0",
"ember-source-5.12": "npm:ember-source@~5.12.0",
"ember-source-beta": "npm:ember-source@beta",
"ember-source-canary": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/756f0e3f98b8ca5edf443fe57318b4dac692bffa.tgz",
"ember-source-latest": "npm:ember-source@latest",
Expand Down
25 changes: 20 additions & 5 deletions tests/scenarios/scenarios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ async function lts_5_8(project: Project) {
project.linkDevDependency('@ember/test-waiters', { baseDir: __dirname, resolveName: '@ember/test-waiters' });
}

async function lts_5_12(project: Project) {
project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-5.12' });
project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-5.12' });
project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-5.3' });
project.linkDevDependency('ember-cli-babel', { baseDir: __dirname, resolveName: 'ember-cli-babel-latest' });
project.linkDevDependency('@ember/test-waiters', { baseDir: __dirname, resolveName: '@ember/test-waiters' });
}

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 Down Expand Up @@ -72,11 +80,17 @@ async function canary(project: Project) {
}

export function supportMatrix(scenarios: Scenarios) {
return scenarios.expand({
lts_3_28,
lts_4_4,
release,
});
return (
scenarios
.expand({
lts_3_28,
lts_4_4,
lts_5_12,
release,
})
// exceeding GitHub actions limit of 256
.skip('lts_4_4')
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Skipping these to get around Strategy expansion exceeded 256 results for job 'test', see https://github.com/embroider-build/embroider/actions/runs/12254560402

);
}

export function fullSupportMatrix(scenarios: Scenarios) {
Expand All @@ -87,6 +101,7 @@ export function fullSupportMatrix(scenarios: Scenarios) {
lts_4_12,
lts_5_4,
lts_5_8,
lts_5_12,
release,
beta,
canary,
Expand Down
2 changes: 1 addition & 1 deletion tests/scenarios/template-tag-codemod-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { join } from 'path';
const { module: Qmodule, test } = QUnit;

appScenarios
.only('release')
.only('lts_5_12')
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is failing with release, not sure why? cc @void-mAlex

.map('template-tag-codemod', project => {
project.mergeFiles({
app: {
Expand Down
4 changes: 2 additions & 2 deletions tests/scenarios/v2-addon-dev-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ appScenarios
"@babel/plugin-transform-class-static-block",
["babel-plugin-ember-template-compilation", {
targetFormat: 'hbs',
compilerPath: 'ember-source/dist/ember-template-compiler',
compilerPath: 'ember-source/dist/ember-template-compiler.js',
transforms: [
'./lib/custom-transform.js',
],
Expand Down Expand Up @@ -187,7 +187,7 @@ appScenarios
"@babel/plugin-transform-class-static-block",
["babel-plugin-ember-template-compilation", {
targetFormat: 'hbs',
compilerPath: 'ember-source/dist/ember-template-compiler',
compilerPath: 'ember-source/dist/ember-template-compiler.js',
}],
["@babel/plugin-proposal-decorators", { "legacy": true }],
[ "@babel/plugin-transform-class-properties" ]
Expand Down
Loading