fixup! fix(@schematics/angular): avoid adding web worker snippet to server configuration files

Author: MeAkib

packages/schematics/angular/web-worker/index.ts

@@ -37,7 +37,7 @@ function addSnippet(options: WebWorkerOptions): Rule {
       return;
     }
 
-    const fileRegExp = new RegExp(`^${options.name}.*\\.ts`);
+    const fileRegExp = new RegExp(`^${options.name}(?:\\..+)?\\.ts$`);
     const siblingModules = host
       .getDir(options.path)
       .subfiles // Find all files that start with the same name, are ts files,

packages/schematics/angular/web-worker/index_spec.ts

@@ -96,8 +96,8 @@ describe('Web Worker Schematic', () => {
   });
 
   it('should add snippet to the component file and not a server configuration file', async () => {
-    const serverAppTree = await schematicRunner.runSchematic('server', { project: 'bar' }, appTree);
-    const tree = await schematicRunner.runSchematic('web-worker', defaultOptions, serverAppTree);
+    appTree.create('/projects/bar/src/app/app.config.server.ts', 'export const config = {};\n');
+    const tree = await schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
 
     const appComponent = tree.readContent('/projects/bar/src/app/app.ts');
     expect(appComponent).toContain(`new Worker(new URL('./${defaultOptions.name}.worker`);
@@ -115,6 +115,16 @@ describe('Web Worker Schematic', () => {
     expect(content).toContain(`new Worker(new URL('./observer.worker`);
   });
 
+  it('should not add snippet to a file whose name only starts with the worker name', async () => {
+    appTree.create('/projects/bar/src/app/app-header.ts', 'export class AppHeader {}\n');
+    const tree = await schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+
+    expect(tree.readContent('/projects/bar/src/app/app-header.ts')).not.toContain('new Worker');
+    expect(tree.readContent('/projects/bar/src/app/app.ts')).toContain(
+      `new Worker(new URL('./${defaultOptions.name}.worker`,
+    );
+  });
+
   it('should not add snippet to a declaration file', async () => {
     appTree.create('/projects/bar/src/app/app.d.ts', 'declare const foo: string;\n');
     const tree = await schematicRunner.runSchematic('web-worker', defaultOptions, appTree);