Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-16 18:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@schematics/angular): properly log data received in web worker snippet

Browse Source 
The generated snippet was:

    worker.onmessage = ({ data }) => {
      console.log('page got message: $\{data\}');
    };

which doesn't use a template string and so does not log `data`.
Fixes the generated snippet to be `console.log(`page got message: ${data}`);`.
Also adds a newline at the end of the web worker template to not fail the default TSLint rules if the schematic is used.
This commit is contained in:
cexbrayat 2019-04-11 09:20:41 +02:00 committed by Alex Eagle
parent 0edc095cd3
commit fcbe988d10
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/schematics/angular/web-worker/index.ts
View File

@ -150,12 +150,13 @@ function addSnippet(options: WebWorkerOptions): Rule {
} }
const siblingModulePath = `${options.path}/${siblingModules[0]}`; const siblingModulePath = `${options.path}/${siblingModules[0]}`;
const logMessage = 'console.log(`page got message: ${data}`);';
const workerCreationSnippet = tags.stripIndent` const workerCreationSnippet = tags.stripIndent`
if (typeof Worker !== 'undefined') { if (typeof Worker !== 'undefined') {
// Create a new // Create a new
const worker = new Worker('./${options.name}.worker', { type: 'module' }); const worker = new Worker('./${options.name}.worker', { type: 'module' });
worker.onmessage = ({ data }) => { worker.onmessage = ({ data }) => {
console.log('page got message: $\{data\}'); ${logMessage}
}; };
worker.postMessage('hello'); worker.postMessage('hello');
} else { } else {

1
packages/schematics/angular/web-worker/index_spec.ts
View File

@ -81,5 +81,6 @@ describe('Service Worker Schematic', () => {
const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree); const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
const appComponent = tree.readContent('/projects/bar/src/app/app.component.ts'); const appComponent = tree.readContent('/projects/bar/src/app/app.component.ts');
expect(appComponent).toContain(`new Worker('./${defaultOptions.name}.worker`); expect(appComponent).toContain(`new Worker('./${defaultOptions.name}.worker`);
expect(appComponent).toContain('console.log(`page got message: ${data}`)');
}); });
}); });