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

Jump to bottom

enable ember-engine tests for 4.x versions as support has landed #1281

Merged
merged 6 commits into from
Nov 15, 2022
Merged

enable ember-engine tests for 4.x versions as support has landed #1281

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb0fa2d
enable ember-engine tests for 4.x versions as support has landed
void-mAlex Nov 13, 2022
9d88751
linting fixes
void-mAlex Nov 14, 2022
cd894bf
declare @ember/legacy-built-in-components as dependency of tests-scen…
void-mAlex Nov 14, 2022
cd73088
link @ember/legacy-built-in-components as dependency of the project
void-mAlex Nov 14, 2022
3050349
bump ember-engines past version 0.8.22 that has fix for ember 4.x
void-mAlex Nov 15, 2022
029b495
Merge remote-tracking branch 'origin/main' into embroider-enable-engi…
void-mAlex Nov 15, 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
89 changes: 44 additions & 45 deletions tests/scenarios/engines-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,51 +33,50 @@ function emberEngines(): Project {
return engines;
}

let engineScenarios = appScenarios
.only('lts_3_28') // ember-engines doesn't have an ember 4.0 compatible release yet.
.map('engines', project => {
let eagerEngine = baseAddon();
let lazyEngine = baseAddon();
let macroSampleAddon = baseAddon();

merge(eagerEngine.files, loadFromFixtureData('eager-engine'));
merge(lazyEngine.files, loadFromFixtureData('lazy-engine'));
merge(macroSampleAddon.files, loadFromFixtureData('macro-sample-addon'));

eagerEngine.pkg['ember-addon'] = {
configPath: 'tests/dummy/config',
paths: ['lib/eager-engine-helper'],
};

macroSampleAddon.pkg.name = 'macro-sample-addon';
eagerEngine.pkg.name = 'eager-engine';
eagerEngine.pkg.peerDependencies = { 'ember-engines': '*' };
lazyEngine.pkg.name = 'lazy-engine';
lazyEngine.pkg.peerDependencies = { 'ember-engines': '*' };

project.pkg['ember-addon'] = {
paths: ['lib/lazy-in-repo-engine'],
};

eagerEngine.pkg['keywords'] = ['ember-engine', 'ember-addon'];
lazyEngine.pkg['keywords'] = ['ember-engine', 'ember-addon'];

lazyEngine.addDependency(macroSampleAddon);
project.addDevDependency(eagerEngine);
project.addDevDependency(lazyEngine);

project.linkDependency('ember-truth-helpers', { baseDir: __dirname });
project.linkDependency('@embroider/macros', { baseDir: __dirname });
project.addDependency(emberEngines());
eagerEngine.linkDependency('ember-truth-helpers', { baseDir: __dirname });
eagerEngine.addDependency(emberEngines());
lazyEngine.linkDependency('ember-truth-helpers', { baseDir: __dirname });
lazyEngine.addDependency(emberEngines());
macroSampleAddon.linkDependency('@embroider/macros', { baseDir: __dirname });

let engineTestFiles = loadFromFixtureData('engines-host-app');
merge(project.files, engineTestFiles);
});
let engineScenarios = appScenarios.map('engines', project => {
let eagerEngine = baseAddon();
let lazyEngine = baseAddon();
let macroSampleAddon = baseAddon();

merge(eagerEngine.files, loadFromFixtureData('eager-engine'));
merge(lazyEngine.files, loadFromFixtureData('lazy-engine'));
merge(macroSampleAddon.files, loadFromFixtureData('macro-sample-addon'));

eagerEngine.pkg['ember-addon'] = {
configPath: 'tests/dummy/config',
paths: ['lib/eager-engine-helper'],
};

macroSampleAddon.pkg.name = 'macro-sample-addon';
eagerEngine.pkg.name = 'eager-engine';
eagerEngine.pkg.peerDependencies = { 'ember-engines': '*' };
lazyEngine.pkg.name = 'lazy-engine';
lazyEngine.pkg.peerDependencies = { 'ember-engines': '*' };

project.pkg['ember-addon'] = {
paths: ['lib/lazy-in-repo-engine'],
};

eagerEngine.pkg['keywords'] = ['ember-engine', 'ember-addon'];
lazyEngine.pkg['keywords'] = ['ember-engine', 'ember-addon'];

lazyEngine.addDependency(macroSampleAddon);
project.addDevDependency(eagerEngine);
project.addDevDependency(lazyEngine);

project.linkDependency('ember-truth-helpers', { baseDir: __dirname });
project.linkDependency('@embroider/macros', { baseDir: __dirname });
project.addDependency(emberEngines());
project.linkDependency('@ember/legacy-built-in-components', { baseDir: __dirname });
eagerEngine.linkDependency('ember-truth-helpers', { baseDir: __dirname });
eagerEngine.addDependency(emberEngines());
lazyEngine.linkDependency('ember-truth-helpers', { baseDir: __dirname });
lazyEngine.addDependency(emberEngines());
macroSampleAddon.linkDependency('@embroider/macros', { baseDir: __dirname });

let engineTestFiles = loadFromFixtureData('engines-host-app');
merge(project.files, engineTestFiles);
});

engineScenarios
.map('without-fastboot', () => {})
Expand Down
3 changes: 2 additions & 1 deletion tests/scenarios/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"@embroider/addon-shim": "1.8.3",
"@embroider/router": "1.9.0",
"@embroider/util": "1.9.0",
"@ember/legacy-built-in-components": "^0.4.1",
"@ember/string": "^3.0.0",
"@rollup/plugin-babel": "^5.3.1",
"@tsconfig/ember": "1.0.1",
Expand All @@ -58,7 +59,7 @@
"ember-data": "~3.28.0",
"ember-data-4.4": "npm:ember-data@~4.4.0",
"ember-data-latest": "npm:[email protected]",
"ember-engines": "^0.8.17",
"ember-engines": "^0.8.23",
"ember-inline-svg": "^0.2.1",
"ember-source": "~3.28.0",
"ember-source-4.4": "npm:ember-source@~4.4.0",
Expand Down
36 changes: 35 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2621,6 +2621,16 @@
jquery "^3.5.0"
resolve "^1.15.1"

"@ember/legacy-built-in-components@^0.4.1":
version "0.4.1"
resolved "https://registry.yarnpkg.com/@ember/legacy-built-in-components/-/legacy-built-in-components-0.4.1.tgz#5c0319be8f8d0b3b43c44912c3710da4fab7b274"
integrity sha512-tLxiU1YR+A+002rkGfwyB4FK8bO5qqU/3c7cZ1z2j3XG+1T28Yg2iZuMxPwFJ0LsE//mhRFkWlGzO3tJUtMHbA==
dependencies:
"@embroider/macros" "^1.0.0"
ember-cli-babel "^7.26.6"
ember-cli-htmlbars "^5.7.1"
ember-cli-typescript "^4.1.0"

"@ember/optional-features@^0.7.0":
version "0.7.0"
resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-0.7.0.tgz#f65a858007020ddfb8342f586112750c32abd2d9"
Expand Down Expand Up @@ -10073,7 +10083,7 @@ ember-element-helper@^0.6.0:
ember-cli-babel "^7.26.11"
ember-cli-htmlbars "^6.0.1"

ember-engines@^0.8.17, ember-engines@^0.8.19:
ember-engines@^0.8.19:
version "0.8.19"
resolved "https://registry.yarnpkg.com/ember-engines/-/ember-engines-0.8.19.tgz#b5c4d3a0f332172e279f7f68bab357a88ce09497"
integrity sha512-8IYHbW2z1zNCM2biREf2mHuXNpQoKc5P3yilXvGDLb5V1hujftXo5Bem038YKufp3DxRRNOHIomFKxHvDduNGQ==
Expand All @@ -10097,6 +10107,30 @@ ember-engines@^0.8.17, ember-engines@^0.8.19:
ember-cli-version-checker "^5.1.2"
lodash "^4.17.11"

ember-engines@^0.8.23:
version "0.8.23"
resolved "https://registry.yarnpkg.com/ember-engines/-/ember-engines-0.8.23.tgz#a3d87cf5682aa856d46d1e29fbdd0985c21197ae"
integrity sha512-rrvHUkZRNrf+9u/sCw7XYrITStjP/9Ypykk1nYQHoo+6Krp11e81QNVsGTXFpXtMHXbNtH5IcRyZvfSXqUOrUQ==
dependencies:
"@embroider/macros" "^1.3.0"
amd-name-resolver "1.3.1"
babel-plugin-compact-reexports "^1.1.0"
broccoli-babel-transpiler "^7.2.0"
broccoli-concat "^4.2.5"
broccoli-debug "^0.6.5"
broccoli-dependency-funnel "^2.1.2"
broccoli-file-creator "^2.1.1"
broccoli-funnel "^2.0.2"
broccoli-merge-trees "^3.0.2"
broccoli-test-helper "^2.0.0"
calculate-cache-key-for-tree "^2.0.0"
ember-asset-loader "^0.6.1"
ember-cli-babel "^7.18.0"
ember-cli-preprocess-registry "^3.3.0"
ember-cli-string-utils "^1.1.0"
ember-cli-version-checker "^5.1.2"
lodash "^4.17.11"

ember-export-application-global@^2.0.0, ember-export-application-global@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
Expand Down