Skip to content

fix for #14467 - fix(@schematics/angular): webworker snippet should not generate to module #14468

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

Merged
merged 2 commits into from
May 21, 2019
Merged

fix for #14467 - fix(@schematics/angular): webworker snippet should not generate to module #14468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a155cab
fix(@schematics/angular): webworker snippet should not generate to mo…
santoshyadavdev May 20, 2019
50ceb4d
refactor: update file filtering logic for webworker snippet Insertion
May 21, 2019
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: 4 additions & 2 deletions packages/schematics/angular/web-worker/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ function addSnippet(options: WebWorkerOptions): Rule {
return;
}

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, and aren't spec files.
.filter(f => f.startsWith(options.name) && f.endsWith('.ts') && !f.endsWith('spec.ts'))
// Find all files that start with the same name, are ts files,
// and aren't spec or module files.
.filter(f => fileRegExp.test(f) && !/(module|spec)\.ts$/.test(f))
// Sort alphabetically for consistency.
.sort();

Expand Down
4 changes: 2 additions & 2 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 @@ -11,7 +11,7 @@ import { Schema as WorkspaceOptions } from '../workspace/schema';
import { Schema as WebWorkerOptions } from './schema';


describe('Service Worker Schematic', () => {
describe('Web Worker Schematic', () => {
const schematicRunner = new SchematicTestRunner(
'@schematics/angular',
require.resolve('../collection.json'),
Expand All @@ -35,7 +35,7 @@ describe('Service Worker Schematic', () => {
name: 'bar',
inlineStyle: false,
inlineTemplate: false,
routing: false,
routing: true,
Copy link
Collaborator

@alan-agius4 alan-agius4 May 21, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Changing this value, will ensure that the improved logic is tested.

skipTests: false,
skipPackageJson: false,
};
Expand Down