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/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');
+            },
           },
         },
       },
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;
     /**