@angular/pwa 18.0.0-next.0 → 18.0.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/pwa",
-  "version": "18.0.0-next.0",
+  "version": "18.0.0-next.1",
   "description": "PWA schematics for Angular",
   "keywords": [
     "Angular CLI",
@@ -17,8 +17,8 @@
     "save": false
   },
   "dependencies": {
-    "@angular-devkit/schematics": "18.0.0-next.0",
-    "@schematics/angular": "18.0.0-next.0",
+    "@angular-devkit/schematics": "18.0.0-next.1",
+    "@schematics/angular": "18.0.0-next.1",
     "parse5-html-rewriting-stream": "7.0.0"
   },
   "peerDependencies": {

package/pwa/index.js

@@ -74,21 +74,6 @@ function default_1(options) {
                 testTargets.push(target);
             }
         }
-        // Add manifest to asset configuration
-        const assetEntry = path_1.posix.join(project.sourceRoot ?? path_1.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();
         for (const target of buildTargets) {
@@ -109,10 +94,30 @@ function default_1(options) {
         // Setup service worker schematic options
         const { title, ...swOptions } = options;
         await (0, utility_1.writeWorkspace)(host, workspace);
+        let assetsDir = path_1.posix.join(sourcePath, 'assets');
+        if (host.exists(assetsDir)) {
+            // Add manifest to asset configuration
+            const assetEntry = path_1.posix.join(project.sourceRoot ?? path_1.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 = path_1.posix.join(project.root, 'public');
+        }
         return (0, schematics_1.chain)([
             (0, schematics_1.externalSchematic)('@schematics/angular', 'service-worker', swOptions),
-            (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files/root'), [(0, schematics_1.template)({ ...options }), (0, schematics_1.move)(sourcePath)])),
-            (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files/assets'), [(0, schematics_1.move)(path_1.posix.join(sourcePath, 'assets'))])),
+            (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files/assets'), [(0, schematics_1.template)({ ...options }), (0, schematics_1.move)(assetsDir)])),
             ...[...indexFiles].map((path) => updateIndexFile(path)),
         ]);
     };