From fb864f8c3edb9510974796fa7b7977aea25b4d7a Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Mon, 23 Jul 2018 16:41:41 +0300 Subject: [PATCH 1/2] docs(@schematics/angular): fix typos in property descriptions --- packages/angular/pwa/pwa/schema.d.ts | 2 +- packages/schematics/angular/service-worker/schema.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/angular/pwa/pwa/schema.d.ts b/packages/angular/pwa/pwa/schema.d.ts index 55091c336f59..d6d2d83a7a06 100644 --- a/packages/angular/pwa/pwa/schema.d.ts +++ b/packages/angular/pwa/pwa/schema.d.ts @@ -12,7 +12,7 @@ export interface Schema { */ project?: string; /** - * ": "The target to apply service worker to. + * The target to apply service worker to. */ target: string; /** diff --git a/packages/schematics/angular/service-worker/schema.d.ts b/packages/schematics/angular/service-worker/schema.d.ts index aa66e3882038..7e5b22c33e89 100644 --- a/packages/schematics/angular/service-worker/schema.d.ts +++ b/packages/schematics/angular/service-worker/schema.d.ts @@ -12,7 +12,7 @@ export interface Schema { */ project?: string; /** - * ": "The target to apply service worker to. + * The target to apply service worker to. */ target: string; /** From c41a45cc2a481792166f7df2f19f8b598c1e8ff7 Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Mon, 23 Jul 2018 16:41:47 +0300 Subject: [PATCH 2/2] fix(@angular-devkit/build-angular): do not break with Jasmine's mock clock Fixes #11164 Fixes #11626 --- .../src/angular-cli-files/models/webpack-configs/test.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts index 514161e940a1..9a2c6bf10945 100644 --- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts +++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts @@ -77,7 +77,12 @@ export function getTestConfig( vendor: { name: 'vendor', chunks: 'initial', - test: /[\\/]node_modules[\\/]/, + test: (module: { nameForCondition?: () => string }, chunks: { name: string }[]) => { + const moduleName = module.nameForCondition ? module.nameForCondition() : ''; + + return /[\\/]node_modules[\\/]/.test(moduleName) + && !chunks.some(({ name }) => name === 'polyfills'); + }, }, }, },