Skip to content

Commit 27498ea

Browse files
devversionjelbourn
authored andcommitted
build: run saucelabs and browserstack tests with ivy (#18276)
We recently regressed when we switched to the auto-generated SystemJS configuration in terms of how those legacy karma tests run. Previously they ran with Ivy, but currently they run with view engine. We should switch them back to Ivy since Ivy is the default in version 9.
1 parent ce40ec2 commit 27498ea

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

tools/gulp/tasks/unit-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ task(':test:build-system-config', () => {
4545
const configOutputPath = join(buildConfig.outputDir, 'karma-system-config.js');
4646
shelljs.cd(buildConfig.projectDir);
4747
const bazelGenfilesDir = shelljs.exec('yarn -s bazel info bazel-genfiles').stdout.trim();
48-
shelljs.exec('yarn -s bazel build //test:system-config.js --config=view-engine');
48+
shelljs.exec('yarn -s bazel build //test:system-config.js');
4949
shelljs.cp(join(bazelGenfilesDir, 'test/system-config.js'), configOutputPath);
5050
shelljs.chmod('u+w', configOutputPath);
5151
});

tools/system-config-tmpl.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,10 @@ function setupFrameworkPackages() {
121121
var entryPointName = segments.length ? moduleName + '/' + segments.join('/') : moduleName;
122122
var bundlePath = 'bundles/' + bundleName;
123123
// When running with Ivy, we need to load the ngcc processed UMD bundles.
124-
// These are stored in the "__ivy_ngcc_" folder that has been generated
125-
// since we run ngcc with "--create-ivy-entry-points".
126-
if (isRunningWithIvy) {
124+
// These are stored in the `__ivy_ngcc_` folder that has been generated
125+
// since we run ngcc with `--create-ivy-entry-points`. Filter out the compiler
126+
// package because it won't be processed by ngcc.
127+
if (isRunningWithIvy && entryPointName !== '@angular/compiler') {
127128
bundlePath = '__ivy_ngcc__/' + bundlePath;
128129
}
129130
packagesConfig[entryPointName] = {

0 commit comments

Comments
 (0)