angular · alan-agius4 · Mar 25, 2024 · Mar 25, 2024
diff --git a/goldens/public-api/angular_devkit/build_angular/index.md b/goldens/public-api/angular_devkit/build_angular/index.md
@@ -79,7 +79,7 @@ export interface AssetPatternObject {
     glob: string;
     ignore?: string[];
     input: string;
-    output: string;
+    output?: string;
 }
 
 // @public

diff --git a/...r/pwa/pwa/files/root/manifest.webmanifest → ...pwa/pwa/files/assets/manifest.webmanifest b/...r/pwa/pwa/files/root/manifest.webmanifest → ...pwa/pwa/files/assets/manifest.webmanifest
diff --git a/packages/angular/pwa/pwa/index.ts b/packages/angular/pwa/pwa/index.ts
@@ -104,23 +104,6 @@ export default function (options: PwaOptions): Rule {
       }
     }
 
-    // Add manifest to asset configuration
-    const assetEntry = posix.join(
-      project.sourceRoot ?? posix.join(project.root, 'src'),
-      'manifest.webmanifest',
-    );
-    for (const target of [...buildTargets, ...testTargets]) {
-      if (target.options) {
-        if (Array.isArray(target.options.assets)) {
-          target.options.assets.push(assetEntry);
-        } else {
-          target.options.assets = [assetEntry];
-        }
-      } else {
-        target.options = { assets: [assetEntry] };
-      }
-    }
-
     // Find all index.html files in build targets
     const indexFiles = new Set<string>();
     for (const target of buildTargets) {
@@ -146,11 +129,32 @@ export default function (options: PwaOptions): Rule {
     const { title, ...swOptions } = options;
 
     await writeWorkspace(host, workspace);
+    let assetsDir = posix.join(sourcePath, 'assets');
+
+    if (host.exists(assetsDir)) {
+      // Add manifest to asset configuration
+      const assetEntry = posix.join(
+        project.sourceRoot ?? posix.join(project.root, 'src'),
+        'manifest.webmanifest',
+      );
+      for (const target of [...buildTargets, ...testTargets]) {
+        if (target.options) {
+          if (Array.isArray(target.options.assets)) {
+            target.options.assets.push(assetEntry);
+          } else {
+            target.options.assets = [assetEntry];
+          }
+        } else {
+          target.options = { assets: [assetEntry] };
+        }
+      }
+    } else {
+      assetsDir = posix.join(project.root, 'public');
+    }
 
     return chain([
       externalSchematic('@schematics/angular', 'service-worker', swOptions),
-      mergeWith(apply(url('./files/root'), [template({ ...options }), move(sourcePath)])),
-      mergeWith(apply(url('./files/assets'), [move(posix.join(sourcePath, 'assets'))])),
+      mergeWith(apply(url('./files/assets'), [template({ ...options }), move(assetsDir)])),
       ...[...indexFiles].map((path) => updateIndexFile(path)),
     ]);
   };

diff --git a/packages/angular/pwa/pwa/index_spec.ts b/packages/angular/pwa/pwa/index_spec.ts
@@ -54,7 +54,7 @@ describe('PWA Schematic', () => {
 
   it('should create icon files', async () => {
     const dimensions = [72, 96, 128, 144, 152, 192, 384, 512];
-    const iconPath = '/projects/bar/src/assets/icons/icon-';
+    const iconPath = '/projects/bar/public/icons/icon-';
     const tree = await schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
 
     dimensions.forEach((d) => {
@@ -74,13 +74,13 @@ describe('PWA Schematic', () => {
 
   it('should create a manifest file', async () => {
     const tree = await schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
-    expect(tree.exists('/projects/bar/src/manifest.webmanifest')).toBeTrue();
+    expect(tree.exists('/projects/bar/public/manifest.webmanifest')).toBeTrue();
   });
 
   it('should set the name & short_name in the manifest file', async () => {
     const tree = await schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
 
-    const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
+    const manifestText = tree.readContent('/projects/bar/public/manifest.webmanifest');
     const manifest = JSON.parse(manifestText);
 
     expect(manifest.name).toEqual(defaultOptions.title);
@@ -91,7 +91,7 @@ describe('PWA Schematic', () => {
     const options = { ...defaultOptions, title: undefined };
     const tree = await schematicRunner.runSchematic('ng-add', options, appTree);
 
-    const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
+    const manifestText = tree.readContent('/projects/bar/public/manifest.webmanifest');
     const manifest = JSON.parse(manifestText);
 
     expect(manifest.name).toEqual(defaultOptions.project);
@@ -125,17 +125,6 @@ describe('PWA Schematic', () => {
     expect(content).toMatch(/<noscript>NO JAVASCRIPT<\/noscript>/);
   });
 
-  it('should update the build and test assets configuration', async () => {
-    const tree = await schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
-    const configText = tree.readContent('/angular.json');
-    const config = JSON.parse(configText);
-    const targets = config.projects.bar.architect;
-
-    ['build', 'test'].forEach((target) => {
-      expect(targets[target].options.assets).toContain('projects/bar/src/manifest.webmanifest');
-    });
-  });
-
   describe('Legacy browser builder', () => {
     function convertBuilderToLegacyBrowser(): void {
       const config = JSON.parse(appTree.readContent('/angular.json'));

diff --git a/packages/angular_devkit/build_angular/src/builders/application/schema.json b/packages/angular_devkit/build_angular/src/builders/application/schema.json
@@ -560,11 +560,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/schema.json b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/schema.json
@@ -466,11 +466,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular_devkit/build_angular/src/builders/browser/schema.json b/packages/angular_devkit/build_angular/src/builders/browser/schema.json
@@ -454,11 +454,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular_devkit/build_angular/src/builders/karma/schema.json b/packages/angular_devkit/build_angular/src/builders/karma/schema.json
@@ -290,6 +290,7 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             },
             "ignore": {
@@ -301,7 +302,7 @@
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular_devkit/build_angular/src/builders/server/schema.json b/packages/angular_devkit/build_angular/src/builders/server/schema.json
@@ -251,11 +251,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular_devkit/build_angular/src/builders/web-test-runner/schema.json b/packages/angular_devkit/build_angular/src/builders/web-test-runner/schema.json
@@ -269,6 +269,7 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             },
             "ignore": {
@@ -280,7 +281,7 @@
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular_devkit/build_angular/src/tools/webpack/utils/helpers.ts b/packages/angular_devkit/build_angular/src/tools/webpack/utils/helpers.ts
@@ -231,7 +231,7 @@ export function assetPatterns(root: string, assets: AssetPatternClass[]) {
   return assets.map((asset: AssetPatternClass, index: number): ObjectPattern => {
     // Resolve input paths relative to workspace root and add slash at the end.
     // eslint-disable-next-line prefer-const
-    let { input, output, ignore = [], glob } = asset;
+    let { input, output = '', ignore = [], glob } = asset;
     input = path.resolve(root, input).replace(/\\/g, '/');
     input = input.endsWith('/') ? input : input + '/';
     output = output.endsWith('/') ? output : output + '/';

diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts b/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts
@@ -7,6 +7,7 @@
  */
 
 import { statSync } from 'fs';
+import assert from 'node:assert';
 import * as path from 'path';
 import { AssetPattern, AssetPatternClass } from '../builders/browser/schema';
 
@@ -21,7 +22,7 @@ export function normalizeAssetPatterns(
   workspaceRoot: string,
   projectRoot: string,
   projectSourceRoot: string | undefined,
-): AssetPatternClass[] {
+): (AssetPatternClass & { output: string })[] {
   if (assetPatterns.length === 0) {
     return [];
   }
@@ -67,13 +68,15 @@ export function normalizeAssetPatterns(
 
       assetPattern = { glob, input, output };
     } else {
-      assetPattern.output = path.join('.', assetPattern.output);
+      assetPattern.output = path.join('.', assetPattern.output ?? '');
     }
 
+    assert(assetPattern.output !== undefined);
+
     if (assetPattern.output.startsWith('..')) {
       throw new Error('An asset cannot be written to a location outside of the output path.');
     }
 
-    return assetPattern;
+    return assetPattern as AssetPatternClass & { output: string };
   });
 }
diff --git a/...les/common-files/src/favicon.ico.template → .../common-files/public/favicon.ico.template b/...les/common-files/src/favicon.ico.template → .../common-files/public/favicon.ico.template
diff --git a/packages/schematics/angular/application/files/common-files/src/assets/.gitkeep.template b/packages/schematics/angular/application/files/common-files/src/assets/.gitkeep.template
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
@@ -242,7 +242,7 @@ function addAppToWorkspaceFile(
           polyfills: ['zone.js'],
           tsConfig: `${projectRoot}tsconfig.app.json`,
           inlineStyleLanguage,
-          assets: [`${sourceRoot}/favicon.ico`, `${sourceRoot}/assets`],
+          assets: [{ 'glob': '**/*', 'input': 'public' }],
           styles: [`${sourceRoot}/styles.${options.style}`],
           scripts: [],
         },
@@ -285,7 +285,7 @@ function addAppToWorkspaceFile(
               polyfills: ['zone.js', 'zone.js/testing'],
               tsConfig: `${projectRoot}tsconfig.spec.json`,
               inlineStyleLanguage,
-              assets: [`${sourceRoot}/favicon.ico`, `${sourceRoot}/assets`],
+              assets: [{ 'glob': '**/*', 'input': 'public' }],
               styles: [`${sourceRoot}/styles.${options.style}`],
               scripts: [],
             },

diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
@@ -50,7 +50,7 @@ describe('Application Schematic', () => {
       jasmine.arrayContaining([
         '/projects/foo/tsconfig.app.json',
         '/projects/foo/tsconfig.spec.json',
-        '/projects/foo/src/favicon.ico',
+        '/projects/foo/public/favicon.ico',
         '/projects/foo/src/index.html',
         '/projects/foo/src/main.ts',
         '/projects/foo/src/styles.css',
@@ -263,7 +263,7 @@ describe('Application Schematic', () => {
         jasmine.arrayContaining([
           '/tsconfig.app.json',
           '/tsconfig.spec.json',
-          '/src/favicon.ico',
+          '/public/favicon.ico',
           '/src/index.html',
           '/src/main.ts',
           '/src/styles.css',
@@ -448,7 +448,7 @@ describe('Application Schematic', () => {
     expect(files).toEqual(
       jasmine.arrayContaining([
         '/projects/foo/tsconfig.app.json',
-        '/projects/foo/src/favicon.ico',
+        '/projects/foo/public/favicon.ico',
         '/projects/foo/src/index.html',
         '/projects/foo/src/main.ts',
         '/projects/foo/src/styles.css',
@@ -473,7 +473,7 @@ describe('Application Schematic', () => {
     expect(files).toEqual(
       jasmine.arrayContaining([
         '/projects/foo/tsconfig.app.json',
-        '/projects/foo/src/favicon.ico',
+        '/projects/foo/public/favicon.ico',
         '/projects/foo/src/index.html',
         '/projects/foo/src/main.ts',
         '/projects/foo/src/styles.css',
@@ -499,7 +499,7 @@ describe('Application Schematic', () => {
     expect(files).toEqual(
       jasmine.arrayContaining([
         '/projects/foo/tsconfig.app.json',
-        '/projects/foo/src/favicon.ico',
+        '/projects/foo/public/favicon.ico',
         '/projects/foo/src/index.html',
         '/projects/foo/src/main.ts',
         '/projects/foo/src/styles.css',
@@ -519,7 +519,7 @@ describe('Application Schematic', () => {
       jasmine.arrayContaining([
         '/projects/foo/tsconfig.app.json',
         '/projects/foo/tsconfig.spec.json',
-        '/projects/foo/src/favicon.ico',
+        '/projects/foo/public/favicon.ico',
         '/projects/foo/src/index.html',
         '/projects/foo/src/main.ts',
         '/projects/foo/src/styles.css',

diff --git a/packages/schematics/angular/service-worker/files/ngsw-config.json.template b/packages/schematics/angular/service-worker/files/ngsw-config.json.template
@@ -21,8 +21,7 @@
       "updateMode": "prefetch",
       "resources": {
         "files": [
-          "/assets/**",
-          "<%= resourcesOutputPath %>/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)"
+          "/**/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)"
         ]
       }
     }

diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
@@ -120,12 +120,10 @@ export default function (options: ServiceWorkerOptions): Rule {
 
     const buildOptions = buildTarget.options as Record<string, string | boolean>;
     let browserEntryPoint: string | undefined;
-    let resourcesOutputPath = '';
     const ngswConfigPath = join(normalize(project.root), 'ngsw-config.json');
 
     if (buildTarget.builder === Builders.Application) {
       browserEntryPoint = buildOptions.browser as string;
-      resourcesOutputPath = '/media';
       const productionConf = buildTarget.configurations?.production;
       if (productionConf) {
         productionConf.serviceWorker = ngswConfigPath;
@@ -134,9 +132,6 @@ export default function (options: ServiceWorkerOptions): Rule {
       browserEntryPoint = buildOptions.main as string;
       buildOptions.serviceWorker = true;
       buildOptions.ngswConfigPath = ngswConfigPath;
-      if (buildOptions.resourcesOutputPath) {
-        resourcesOutputPath = normalize(`/${buildOptions.resourcesOutputPath}`);
-      }
     }
 
     await writeWorkspace(host, workspace);
@@ -147,7 +142,6 @@ export default function (options: ServiceWorkerOptions): Rule {
         apply(url('./files'), [
           applyTemplates({
             ...options,
-            resourcesOutputPath,
             relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(project.root),
           }),
           move(project.root),