refactor(@angular-devkit/build-angular): accept boolean and string in…

… `ssr` option This is to align with the `serviceWorker` option.
angular · Sep 15, 2023 · 5a204b8 · 5a204b8
1 parent 9291dda
commit 5a204b8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/packages/angular/ssr/schematics/ng-add/index.ts b/packages/angular/ssr/schematics/ng-add/index.ts
@@ -109,7 +109,7 @@ function updateApplicationBuilderWorkspaceConfigRule(
       }
 
       prodConfig.prerender = true;
-      (prodConfig.ssr ??= {}).entry = join(normalize(projectRoot), 'server.ts');
+      prodConfig.ssr = join(normalize(projectRoot), 'server.ts');
     });
   };
 }

diff --git a/packages/angular_devkit/build_angular/src/builders/application/options.ts b/packages/angular_devkit/build_angular/src/builders/application/options.ts
@@ -197,11 +197,9 @@ export async function normalizeOptions(
   let ssrOptions;
   if (options.ssr === true) {
     ssrOptions = {};
-  } else if (typeof options.ssr === 'object') {
-    const { entry } = options.ssr;
-
+  } else if (typeof options.ssr === 'string') {
     ssrOptions = {
-      entry: entry && path.join(workspaceRoot, entry),
+      entry: path.join(workspaceRoot, options.ssr),
     };
   }
 

diff --git a/packages/angular_devkit/build_angular/src/builders/application/schema.json b/packages/angular_devkit/build_angular/src/builders/application/schema.json
@@ -452,14 +452,8 @@
           "description": "Enable the server bundles to be written to disk."
         },
         {
-          "type": "object",
-          "properties": {
-            "entry": {
-              "type": "string",
-              "description": "The server entry-point that when executed will spawn the web server."
-            }
-          },
-          "additionalProperties": false
+          "type": "string",
+          "description": "The server entry-point that when executed will spawn the web server."
         }
       ]
     },

diff --git a/packages/angular_devkit/build_angular/src/builders/application/tests/options/ssr_spec.ts b/packages/angular_devkit/build_angular/src/builders/application/tests/options/ssr_spec.ts
@@ -27,9 +27,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
       harness.useTarget('build', {
         ...BASE_OPTIONS,
         server: 'src/main.server.ts',
-        ssr: {
-          entry: 'src/server.ts',
-        },
+        ssr: 'src/server.ts',
       });
 
       const { result } = await harness.executeOnce();
@@ -45,9 +43,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
       harness.useTarget('build', {
         ...BASE_OPTIONS,
         server: 'src/main.server.ts',
-        ssr: {
-          entry: '/file.mjs',
-        },
+        ssr: '/file.mjs',
       });
 
       const { result } = await harness.executeOnce();
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,7 @@ function updateApplicationBuilderWorkspaceConfigRule( @@
           }
           prodConfig.prerender = true;
-          (prodConfig.ssr ??= {}).entry = join(normalize(projectRoot), 'server.ts');
+          prodConfig.ssr = join(normalize(projectRoot), 'server.ts');
         });
       };
     }
@@ Expand Down @@