Skip to content

fix(@schematics/angular): skip webWorkerTsConfig for unit-test builder test targets #34386

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

Open
MeAkib wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(@schematics/angular): skip webWorkerTsConfig for unit-test builder test targets #34386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion packages/schematics/angular/web-worker/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { parseName } from '../utility/parse-name';
import { relativePathToWorkspaceRoot } from '../utility/paths';
import { createProjectSchematic } from '../utility/project';
import { buildDefaultPath, updateWorkspace } from '../utility/workspace';
import { Builders } from '../utility/workspace-models';
import { Schema as WebWorkerOptions } from './schema';

function addSnippet(options: WebWorkerOptions): Rule {
Expand Down Expand Up @@ -115,7 +116,8 @@ const webWorkerSchematic: RuleFactory<WebWorkerOptions> = createProjectSchematic

const workerConfigPath = join(root, 'tsconfig.worker.json');
(buildTarget.options ??= {}).webWorkerTsConfig ??= workerConfigPath;
if (testTarget) {
// The unit-test builder has no `webWorkerTsConfig` option and reads it from the build target.
if (testTarget && testTarget.builder !== Builders.BuildUnitTest) {
(testTarget.options ??= {}).webWorkerTsConfig ??= workerConfigPath;
}
}),
Expand Down
20 changes: 20 additions & 0 deletions packages/schematics/angular/web-worker/index_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
import { parse as parseJson } from 'jsonc-parser';
import { Schema as ApplicationOptions } from '../application/schema';
import { Builders } from '../utility/workspace-models';
import { Schema as WorkspaceOptions } from '../workspace/schema';
import { Schema as WebWorkerOptions } from './schema';

Expand Down Expand Up @@ -68,6 +69,25 @@ describe('Web Worker Schematic', () => {
);
});

it('should not add the webWorkerTsConfig option to a unit-test builder test target', async () => {
const tree = await schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
const { projects } = JSON.parse(tree.readContent('/angular.json'));
expect(projects.bar.architect.test.builder).toBe(Builders.BuildUnitTest);
expect(projects.bar.architect.test.options?.webWorkerTsConfig).toBeUndefined();
});

it('should add the webWorkerTsConfig option to a karma builder test target', async () => {
const config = JSON.parse(appTree.readContent('/angular.json'));
config.projects.bar.architect.test = { builder: Builders.BuildKarma, options: {} };
appTree.overwrite('/angular.json', JSON.stringify(config, undefined, 2));

const tree = await schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
const { projects } = JSON.parse(tree.readContent('/angular.json'));
expect(projects.bar.architect.test.options.webWorkerTsConfig).toBe(
'projects/bar/tsconfig.worker.json',
);
});

it('should add snippet to sibling file', async () => {
const tree = await schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
const appComponent = tree.readContent('/projects/bar/src/app/app.ts');
Expand Down
Loading