@nrwl/angular 15.0.0-beta.4 → 15.0.0-rc.2

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [15.0.0-beta.4](https://github.com/nrwl/nx/compare/14.8.0...15.0.0-beta.4) (2022-10-11)
+# [15.0.0-rc.2](https://github.com/nrwl/nx/compare/14.8.0...15.0.0-rc.2) (2022-10-14)
 
 **Note:** Version bump only for package @nrwl/angular

package/README.md

@@ -75,7 +75,7 @@ npx add-nx-to-monorepo@latest
 A few links to help you get started:
 
 - [Nx.Dev: Documentation, Guides, Interactive Tutorials](https://nx.dev)
-- [Tutorial: Adding Nx to an Existing Monorepo](/recipe/adding-to-monorepo)
+- [Tutorial: Adding Nx to an Existing Monorepo](/recipes/adopting-nx/adding-to-monorepo)
 - [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 

package/generators.d.ts

@@ -20,6 +20,7 @@ export * from './src/generators/scam-pipe/scam-pipe';
 export * from './src/generators/scam-to-standalone/scam-to-standalone';
 export * from './src/generators/scam/scam';
 export * from './src/generators/setup-mf/setup-mf';
+export * from './src/generators/setup-ssr/setup-ssr';
 export * from './src/generators/setup-tailwind/setup-tailwind';
 export * from './src/generators/stories/stories';
 export * from './src/generators/storybook-configuration/storybook-configuration';

package/generators.js

@@ -23,6 +23,7 @@ tslib_1.__exportStar(require("./src/generators/scam-pipe/scam-pipe"), exports);
 tslib_1.__exportStar(require("./src/generators/scam-to-standalone/scam-to-standalone"), exports);
 tslib_1.__exportStar(require("./src/generators/scam/scam"), exports);
 tslib_1.__exportStar(require("./src/generators/setup-mf/setup-mf"), exports);
+tslib_1.__exportStar(require("./src/generators/setup-ssr/setup-ssr"), exports);
 tslib_1.__exportStar(require("./src/generators/setup-tailwind/setup-tailwind"), exports);
 tslib_1.__exportStar(require("./src/generators/stories/stories"), exports);
 tslib_1.__exportStar(require("./src/generators/storybook-configuration/storybook-configuration"), exports);

package/generators.js.map

@@ -1 +1 @@
-{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,mFAAyD;AACzD,6GAAmF;AACnF,yGAA+E;AAC/E,2FAAiE;AACjE,+EAAqD;AACrD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,qEAA2C;AAC3C,uFAA6D;AAC7D,uEAA6C;AAC7C,uHAA6F;AAC7F,2EAAiD;AACjD,qEAA2C;AAC3C,qEAA2C;AAC3C,yEAA+C;AAC/C,yFAA+D;AAC/D,+EAAqD;AACrD,iGAAuE;AACvE,qEAA2C;AAC3C,6EAAmD;AACnD,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,yFAA+D;AAC/D,iFAAuD;AACvD,2HAAiG;AACjG,yFAA+D;AAC/D,mEAAyC"}
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,mFAAyD;AACzD,6GAAmF;AACnF,yGAA+E;AAC/E,2FAAiE;AACjE,+EAAqD;AACrD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,qEAA2C;AAC3C,uFAA6D;AAC7D,uEAA6C;AAC7C,uHAA6F;AAC7F,2EAAiD;AACjD,qEAA2C;AAC3C,qEAA2C;AAC3C,yEAA+C;AAC/C,yFAA+D;AAC/D,+EAAqD;AACrD,iGAAuE;AACvE,qEAA2C;AAC3C,6EAAmD;AACnD,+EAAqD;AACrD,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,yFAA+D;AAC/D,iFAAuD;AACvD,2HAAiG;AACjG,yFAA+D;AAC/D,mEAAyC"}

package/generators.json

@@ -137,6 +137,11 @@
       "schema": "./src/generators/setup-mf/schema.json",
       "description": "Generate a Module Federation configuration for a given Angular application."
     },
+    "setup-ssr": {
+      "factory": "./src/generators/setup-ssr/setup-ssr.compat",
+      "schema": "./src/generators/setup-ssr/schema.json",
+      "description": "Generate Angular Universal (SSR) setup for an Angular application."
+    },
     "setup-tailwind": {
       "factory": "./src/generators/setup-tailwind/setup-tailwind.compat",
       "schema": "./src/generators/setup-tailwind/schema.json",
@@ -309,6 +314,11 @@
       "schema": "./src/generators/setup-mf/schema.json",
       "description": "Generate a Module Federation configuration for a given Angular application."
     },
+    "setup-ssr": {
+      "factory": "./src/generators/setup-ssr/setup-ssr",
+      "schema": "./src/generators/setup-ssr/schema.json",
+      "description": "Generate Angular Universal (SSR) setup for an Angular application."
+    },
     "setup-tailwind": {
       "factory": "./src/generators/setup-tailwind/setup-tailwind",
       "schema": "./src/generators/setup-tailwind/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.0.0-beta.4",
+  "version": "15.0.0-rc.2",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -67,13 +67,13 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~14.2.0",
-    "@nrwl/cypress": "15.0.0-beta.4",
-    "@nrwl/devkit": "15.0.0-beta.4",
-    "@nrwl/jest": "15.0.0-beta.4",
-    "@nrwl/linter": "15.0.0-beta.4",
-    "@nrwl/storybook": "15.0.0-beta.4",
-    "@nrwl/webpack": "15.0.0-beta.4",
-    "@nrwl/workspace": "15.0.0-beta.4",
+    "@nrwl/cypress": "15.0.0-rc.2",
+    "@nrwl/devkit": "15.0.0-rc.2",
+    "@nrwl/jest": "15.0.0-rc.2",
+    "@nrwl/linter": "15.0.0-rc.2",
+    "@nrwl/storybook": "15.0.0-rc.2",
+    "@nrwl/webpack": "15.0.0-rc.2",
+    "@nrwl/workspace": "15.0.0-rc.2",
     "@phenomnomnominal/tsquery": "4.1.1",
     "@schematics/angular": "~14.2.0",
     "chalk": "4.1.0",
@@ -99,5 +99,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "f9e57e26947a53ae5e37f70526451bcd7005331a"
+  "gitHead": "663c1fd65d3e1a60d3463316375a5c86712bb6a1"
 }

package/src/builders/module-federation-dev-server/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Module Federation Dev Server",
   "description": "The module-federation-dev-server executor is reserved exclusively for use with host Module Federation applications. It allows the user to specify which remote applications should be served with the host.",

package/src/builders/webpack-browser/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Webpack Browser",
   "description": "The webpack-browser executor is very similar to the standard browser builder provided by the Angular Devkit. It allows you to build your Angular application to a build artifact that can be hosted online. There are some key differences:   \n- Supports Custom Webpack Configurations  \n- Supports Incremental Building",

package/src/builders/webpack-dev-server/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Webpack Dev Server",
   "description": "The webpack-dev-server executor is very similar to the standard dev server builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration.",

package/src/executors/delegate-build/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for an executor which delegates a build.",
   "description": "Options for delegating a build to a different target.",

package/src/executors/file-server/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "title": "File Server",
   "description": "Serve a web application from a folder.",
   "type": "object",

package/src/executors/ng-packagr-lite/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/schema",
   "title": "ng-packagr Target",
   "description": "ng-packagr target options for Build Architect. Use to build library projects.",

package/src/executors/package/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/schema",
   "title": "ng-packagr Target",
   "description": "ng-packagr target options for Build Architect. Use to build and package library projects for publishing.",

package/src/generators/component-test/files/__componentFileName__.cy.ts__tpl__

@@ -1,4 +1,4 @@
-import { MountConfig, mount } from 'cypress/angular';
+import { MountConfig } from 'cypress/angular';
 import { <%= componentName %> } from './<%= componentFileName %>';
 
 describe(<%= componentName %>.name, () => {
@@ -9,7 +9,7 @@ describe(<%= componentName %>.name, () => {
   }
 
   it('renders', () => {
-     mount(<%= componentName %>,<% if(props.length > 0) { %> {
+     cy.mount(<%= componentName %>,<% if(props.length > 0) { %> {
            ...config,
            componentProperties: {<% for (let prop of props) { %>
                <%= prop.name %>:  <%- prop.defaultValue %>,<% } %>

package/src/generators/cypress-component-configuration/files/cypress/support/commands.ts__tpl__

@@ -0,0 +1,42 @@
+/// <reference types="cypress" />
+import { mount } from 'cypress/angular'
+
+// ***********************************************
+// This example commands.ts shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+
+declare global {
+// eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface Chainable<Subject> {
+      login(email: string, password: string): void;
+      mount: typeof mount;
+    }
+  }
+}
+
+Cypress.Commands.add('mount', mount)
+
+//
+// -- This is a parent command --
+Cypress.Commands.add('login', (email, password) => {
+  console.log('Custom command example: Login', email, password);
+});
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

package/src/generators/library/lib/add-standalone-component.js

@@ -9,11 +9,11 @@ const add_load_children_1 = require("./add-load-children");
 const add_children_1 = require("./add-children");
 function addStandaloneComponent(tree, { libraryOptions, componentOptions }) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, component_1.default)(tree, Object.assign(Object.assign({}, componentOptions), { name: componentOptions.name, standalone: true, export: true, project: libraryOptions.name }));
+        yield (0, component_1.default)(tree, Object.assign(Object.assign({}, componentOptions), { name: componentOptions.name, standalone: true, export: true, project: libraryOptions.name, flat: componentOptions.flat }));
         if (libraryOptions.routing) {
             const pathToRoutes = (0, path_1.joinPathFragments)(libraryOptions.projectRoot, 'src/lib/lib.routes.ts');
             const routesContents = `import { Route } from '@angular/router';
-    import { ${libraryOptions.standaloneComponentName} } from './${(0, path_1.joinPathFragments)(libraryOptions.fileName, `${libraryOptions.fileName}.component`)}';
+    import { ${libraryOptions.standaloneComponentName} } from './${(0, path_1.joinPathFragments)(componentOptions.flat ? '' : libraryOptions.fileName, `${libraryOptions.fileName}.component`)}';
     
         export const ${(0, devkit_1.names)(libraryOptions.name).propertyName}Routes: Route[] = [
           {path: '', component: ${libraryOptions.standaloneComponentName}}

package/src/generators/library/lib/add-standalone-component.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-standalone-component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-standalone-component.ts"],"names":[],"mappings":";;;;AAEA,yDAA2D;AAC3D,4CAAsD;AACtD,yCAAqC;AACrC,2DAAsD;AACtD,iDAA6C;AAE7C,SAAsB,sBAAsB,CAC1C,IAAU,EACV,EAAE,cAAc,EAAE,gBAAgB,EAAoB;;QAEtD,MAAM,IAAA,mBAAkB,EAAC,IAAI,kCACxB,gBAAgB,KACnB,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAC3B,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,cAAc,CAAC,IAAI,IAC5B,CAAC;QAEH,IAAI,cAAc,CAAC,OAAO,EAAE;YAC1B,MAAM,YAAY,GAAG,IAAA,wBAAiB,EACpC,cAAc,CAAC,WAAW,EAC1B,uBAAuB,CACxB,CAAC;YAEF,MAAM,cAAc,GAAG;eAErB,cAAc,CAAC,uBACjB,cAAc,IAAA,wBAAiB,EAC7B,cAAc,CAAC,QAAQ,EACvB,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC;;uBAGK,IAAA,cAAK,EAAC,cAAc,CAAC,IAAI,CAAC,CAAC,YAC7B;kCAC0B,cAAc,CAAC,uBAAuB;WAC7D,CAAC;YACR,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAEzC,MAAM,eAAe,GAAG,IAAA,wBAAiB,EACvC,cAAc,CAAC,WAAW,EAC1B,KAAK,EACL,GAAG,cAAc,CAAC,SAAS,KAAK,CACjC,CAAC;YACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,CACR,eAAe,EACf,GAAG,iBAAiB;yCACe,CACpC,CAAC;YAEF,IAAI,cAAc,CAAC,MAAM,EAAE;gBACzB,IAAI,cAAc,CAAC,IAAI,EAAE;oBACvB,IAAA,mCAAe,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACvC;qBAAM;oBACL,IAAA,0BAAW,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACnC;aACF;SACF;IACH,CAAC;CAAA;AArDD,wDAqDC"}
+{"version":3,"file":"add-standalone-component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-standalone-component.ts"],"names":[],"mappings":";;;;AAEA,yDAA2D;AAC3D,4CAAsD;AACtD,yCAAqC;AACrC,2DAAsD;AACtD,iDAA6C;AAE7C,SAAsB,sBAAsB,CAC1C,IAAU,EACV,EAAE,cAAc,EAAE,gBAAgB,EAAoB;;QAEtD,MAAM,IAAA,mBAAkB,EAAC,IAAI,kCACxB,gBAAgB,KACnB,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAC3B,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,cAAc,CAAC,IAAI,EAC5B,IAAI,EAAE,gBAAgB,CAAC,IAAI,IAC3B,CAAC;QAEH,IAAI,cAAc,CAAC,OAAO,EAAE;YAC1B,MAAM,YAAY,GAAG,IAAA,wBAAiB,EACpC,cAAc,CAAC,WAAW,EAC1B,uBAAuB,CACxB,CAAC;YAEF,MAAM,cAAc,GAAG;eAErB,cAAc,CAAC,uBACjB,cAAc,IAAA,wBAAiB,EAC7B,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EACpD,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC;;uBAGK,IAAA,cAAK,EAAC,cAAc,CAAC,IAAI,CAAC,CAAC,YAC7B;kCAC0B,cAAc,CAAC,uBAAuB;WAC7D,CAAC;YACR,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAEzC,MAAM,eAAe,GAAG,IAAA,wBAAiB,EACvC,cAAc,CAAC,WAAW,EAC1B,KAAK,EACL,GAAG,cAAc,CAAC,SAAS,KAAK,CACjC,CAAC;YACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,CACR,eAAe,EACf,GAAG,iBAAiB;yCACe,CACpC,CAAC;YAEF,IAAI,cAAc,CAAC,MAAM,EAAE;gBACzB,IAAI,cAAc,CAAC,IAAI,EAAE;oBACvB,IAAA,mCAAe,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACvC;qBAAM;oBACL,IAAA,0BAAW,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACnC;aACF;SACF;IACH,CAAC;CAAA;AAtDD,wDAsDC"}

package/src/generators/library/lib/normalize-options.js

@@ -50,7 +50,7 @@ function normalizeOptions(host, schema) {
         fileName,
         importPath,
         ngCliSchematicLibRoot, standaloneComponentName: `${(0, devkit_1.names)(name).className}Component` });
-    const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector } = allNormalizedOptions, libraryOptions = tslib_1.__rest(allNormalizedOptions, ["displayBlock", "inlineStyle", "inlineTemplate", "viewEncapsulation", "changeDetection", "style", "skipTests", "selector", "skipSelector"]);
+    const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector, flat } = allNormalizedOptions, libraryOptions = tslib_1.__rest(allNormalizedOptions, ["displayBlock", "inlineStyle", "inlineTemplate", "viewEncapsulation", "changeDetection", "style", "skipTests", "selector", "skipSelector", "flat"]);
     return {
         libraryOptions,
         componentOptions: {
@@ -65,6 +65,7 @@ function normalizeOptions(host, schema) {
             skipTests,
             selector,
             skipSelector,
+            flat,
         },
     };
 }

package/src/generators/library/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}

package/src/generators/library/lib/normalized-schema.d.ts

@@ -14,7 +14,6 @@ export interface NormalizedSchema {
         importPath?: string;
         standaloneConfig?: boolean;
         spec?: boolean;
-        flat?: boolean;
         commonModule?: boolean;
         routing?: boolean;
         lazy?: boolean;
@@ -52,5 +51,6 @@ export interface NormalizedSchema {
         skipTests?: boolean;
         selector?: string;
         skipSelector?: boolean;
+        flat?: boolean;
     };
 }

package/src/generators/library/schema.json

@@ -181,6 +181,11 @@
       "type": "boolean",
       "default": false,
       "description": "Specifies if the component should have a selector or not. Disclaimer: This option is only valid when `--standalone` is set to `true`."
+    },
+    "flat": {
+      "type": "boolean",
+      "default": false,
+      "description": "Ensure the generated standalone component is not placed in a subdirectory. Disclaimer: This option is only valid when `--standalone` is set to `true`."
     }
   },
   "additionalProperties": false,

package/src/generators/setup-ssr/files/__serverFileName__

@@ -0,0 +1,60 @@
+import 'zone.js/dist/zone-node';
+
+import {APP_BASE_HREF} from '@angular/common';
+import {ngExpressEngine} from '@nguniversal/express-engine';
+import * as express from 'express';
+import {existsSync} from 'fs';
+import {join} from 'path';
+
+import {<%= rootModuleClassName %>} from './src/<%= main.slice(0, -3) %>';
+
+// The Express app is exported so that it can be used by serverless Functions.
+export function app(): express.Express {
+  const server = express();
+  const distFolder = join(process.cwd(), 'dist/apps/<%= project %>/browser');
+  const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
+
+  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
+  server.engine('html', ngExpressEngine({
+    bootstrap: <%= rootModuleClassName %>,
+  }));
+
+  server.set('view engine', 'html');
+  server.set('views', distFolder);
+
+  // Example Express Rest API endpoints
+  // server.get('/api/**', (req, res) => { });
+  // Serve static files from /browser
+  server.get('*.*', express.static(distFolder, {
+    maxAge: '1y'
+  }));
+
+  // All regular routes use the Universal engine
+  server.get('*', (req, res) => {
+    res.render(indexHtml, { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] });
+  });
+
+  return server;
+}
+
+function run(): void {
+  const port = process.env['PORT'] || <%= serverPort %>;
+
+  // Start up the Node server
+  const server = app();
+  server.listen(port, () => {
+    console.log(`Node Express server listening on http://localhost:${port}`);
+  });
+}
+
+// Webpack will replace 'require' with '__webpack_require__'
+// '__non_webpack_require__' is a proxy to Node 'require'
+// The below code is to ensure that the server is run only when not requiring the bundle.
+declare const __non_webpack_require__: NodeRequire;
+const mainModule = __non_webpack_require__.main;
+const moduleFilename = mainModule && mainModule.filename || '';
+if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
+  run();
+}
+
+export * from './src/<%= main.slice(0, -3) %>';

package/src/generators/setup-ssr/files/src/__main__

@@ -0,0 +1,19 @@
+/***************************************************************************************************
+ * Initialize the server environment - for example, adding DOM built-in types to the global scope.
+ *
+ * NOTE:
+ * This import must come before any imports (direct or transitive) that rely on DOM built-ins being
+ * available, such as `@angular/elements`.
+ */
+import '@angular/platform-server/init';
+
+import { enableProdMode } from '@angular/core';
+
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+export { <%= rootModuleClassName %> } from './app/<%= rootModuleFileName.slice(0, -3) %>';
+export { renderModule } from '@angular/platform-server';

package/src/generators/setup-ssr/files/src/app/__rootModuleFileName__

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { ServerModule } from '@angular/platform-server';
+
+import { AppModule } from './app.module';
+import { AppComponent } from './app.component';
+
+@NgModule({
+  imports: [
+    AppModule,
+    ServerModule,
+  ],
+  bootstrap: [AppComponent],
+})
+export class <%= rootModuleClassName %> {}

package/src/generators/setup-ssr/files/src/main.ts__tpl__

@@ -0,0 +1,22 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+function bootstrap() {
+  platformBrowserDynamic()
+  .bootstrapModule(AppModule)
+  .catch((err) => console.error(err));
+};
+
+
+ if (document.readyState === 'complete') {
+   bootstrap();
+ } else {
+   document.addEventListener('DOMContentLoaded', bootstrap);
+ }

package/src/generators/setup-ssr/files/tsconfig.server.json__tpl__

@@ -0,0 +1,15 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "./tsconfig.app.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/server",
+    "target": "es2019",
+    "types": [
+      "node"
+    ]
+  },
+  "files": [
+    "src/<%= main %>",
+    "server.ts",
+  ]
+}

package/src/generators/setup-ssr/lib/generate-files.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from '../schema';
+export declare function generateSSRFiles(tree: Tree, schema: Schema): void;

package/src/generators/setup-ssr/lib/generate-files.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateSSRFiles = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function generateSSRFiles(tree, schema) {
+    const projectRoot = (0, devkit_1.readProjectConfiguration)(tree, schema.project).root;
+    const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '../', 'files');
+    (0, devkit_1.generateFiles)(tree, pathToFiles, projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
+}
+exports.generateSSRFiles = generateSSRFiles;
+//# sourceMappingURL=generate-files.js.map

package/src/generators/setup-ssr/lib/generate-files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAAc;IACzD,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;IAExE,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAEjE,IAAA,sBAAa,EAAC,IAAI,EAAE,WAAW,EAAE,WAAW,kCAAO,MAAM,KAAE,GAAG,EAAE,EAAE,IAAG,CAAC;AACxE,CAAC;AAND,4CAMC"}

package/src/generators/setup-ssr/lib/index.d.ts

@@ -0,0 +1,4 @@
+export * from './generate-files';
+export * from './normalize-options';
+export * from './update-app-module';
+export * from './update-project-config';

package/src/generators/setup-ssr/lib/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./generate-files"), exports);
+tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./update-app-module"), exports);
+tslib_1.__exportStar(require("./update-project-config"), exports);
+//# sourceMappingURL=index.js.map

package/src/generators/setup-ssr/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,8DAAoC;AACpC,8DAAoC;AACpC,kEAAwC"}

package/src/generators/setup-ssr/lib/normalize-options.d.ts

@@ -0,0 +1,12 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from '../schema';
+export declare function normalizeOptions(tree: Tree, options: Schema): {
+    project: string;
+    appId: string;
+    main: string;
+    serverFileName: string;
+    serverPort: number;
+    rootModuleFileName: string;
+    rootModuleClassName: string;
+    skipFormat: boolean;
+};

package/src/generators/setup-ssr/lib/normalize-options.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function normalizeOptions(tree, options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    return {
+        project: (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject,
+        appId: (_b = options.appId) !== null && _b !== void 0 ? _b : 'serverApp',
+        main: (_c = options.main) !== null && _c !== void 0 ? _c : 'main.server.ts',
+        serverFileName: (_d = options.serverFileName) !== null && _d !== void 0 ? _d : 'server.ts',
+        serverPort: (_e = options.serverPort) !== null && _e !== void 0 ? _e : 4000,
+        rootModuleFileName: (_f = options.rootModuleFileName) !== null && _f !== void 0 ? _f : 'app.server.module.ts',
+        rootModuleClassName: (_g = options.rootModuleClassName) !== null && _g !== void 0 ? _g : 'AppServerModule',
+        skipFormat: (_h = options.skipFormat) !== null && _h !== void 0 ? _h : false,
+    };
+}
+exports.normalizeOptions = normalizeOptions;
+//# sourceMappingURL=normalize-options.js.map

package/src/generators/setup-ssr/lib/normalize-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAA0D;AAG1D,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,OAAO;QACL,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc;QAC3E,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,WAAW;QACnC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,gBAAgB;QACtC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,WAAW;QACrD,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI;QACtC,kBAAkB,EAAE,MAAA,OAAO,CAAC,kBAAkB,mCAAI,sBAAsB;QACxE,mBAAmB,EAAE,MAAA,OAAO,CAAC,mBAAmB,mCAAI,iBAAiB;QACrE,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK;KACxC,CAAC;AACJ,CAAC;AAXD,4CAWC"}

package/src/generators/setup-ssr/lib/update-app-module.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from '../schema';
+export declare function updateAppModule(tree: Tree, schema: Schema): void;

package/src/generators/setup-ssr/lib/update-app-module.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateAppModule = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+function updateAppModule(tree, schema) {
+    // read the content of app module
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+    const pathToAppModule = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.module.ts');
+    const fileContents = tree.read(pathToAppModule, 'utf-8');
+    const ast = tsquery_1.tsquery.ast(fileContents);
+    const browserModuleImportNodes = (0, tsquery_1.tsquery)(ast, 'PropertyAssignment:has(Identifier[name=imports]) > ArrayLiteralExpression Identifier[name=BrowserModule]', { visitAllChildren: true });
+    if (browserModuleImportNodes.length === 0) {
+        throw new Error(`Could not find BrowserModule declaration in ${pathToAppModule}. Please ensure this is correct.`);
+    }
+    const browserModuleNode = browserModuleImportNodes[0];
+    const newFileContents = `${fileContents.slice(0, browserModuleNode.getEnd())}.withServerTransition({ appId: '${schema.appId}' })${fileContents.slice(browserModuleNode.getEnd(), -1)}`;
+    tree.write(pathToAppModule, newFileContents);
+}
+exports.updateAppModule = updateAppModule;
+//# sourceMappingURL=update-app-module.js.map

package/src/generators/setup-ssr/lib/update-app-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-app-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-app-module.ts"],"names":[],"mappings":";;;AACA,yCAA2E;AAE3E,uDAAoD;AAEpD,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;IACxD,iCAAiC;IACjC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,UAAU,EACxB,mBAAmB,CACpB,CAAC;IACF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEzD,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACtC,MAAM,wBAAwB,GAAG,IAAA,iBAAO,EACtC,GAAG,EACH,0GAA0G,EAC1G,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;IAEF,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC,EAAE;QACzC,MAAM,IAAI,KAAK,CACb,+CAA+C,eAAe,kCAAkC,CACjG,CAAC;KACH;IAED,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAEtD,MAAM,eAAe,GAAG,GAAG,YAAY,CAAC,KAAK,CAC3C,CAAC,EACD,iBAAiB,CAAC,MAAM,EAAE,CAC3B,mCAAmC,MAAM,CAAC,KAAK,OAAO,YAAY,CAAC,KAAK,CACvE,iBAAiB,CAAC,MAAM,EAAE,EAC1B,CAAC,CAAC,CACH,EAAE,CAAC;IAEJ,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAC/C,CAAC;AAjCD,0CAiCC"}

package/src/generators/setup-ssr/lib/update-project-config.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from '../schema';
+export declare function updateProjectConfig(tree: Tree, schema: Schema): void;

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateProjectConfig = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function updateProjectConfig(tree, schema) {
+    let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+    projectConfig.targets.build.options.outputPath = `dist/apps/${schema.project}/browser`;
+    projectConfig.targets.server = {
+        executor: '@angular-devkit/build-angular:server',
+        options: {
+            outputPath: `dist/apps/${projectConfig.root}/server`,
+            main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName),
+            tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json'),
+        },
+        configurations: {
+            production: {
+                outputHashing: 'media',
+                fileReplacements: [
+                    {
+                        replace: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'environments/environment.ts'),
+                        with: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'environments/environment.prod.ts'),
+                    },
+                ],
+            },
+            development: {
+                optimization: false,
+                sourceMap: true,
+                extractLicenses: false,
+            },
+        },
+        defaultConfiguration: 'production',
+    };
+    projectConfig.targets['serve-ssr'] = {
+        executor: '@nguniversal/builders:ssr-dev-server',
+        configurations: {
+            development: {
+                browserTarget: `${schema.project}:build:development`,
+                serverTarget: `${schema.project}:server:development`,
+            },
+            production: {
+                browserTarget: `${schema.project}:build:production`,
+                serverTarget: `${schema.project}:server:production`,
+            },
+        },
+        defaultConfiguration: 'development',
+    };
+    projectConfig.targets.prerender = {
+        executor: '@nguniversal/builders:prerender',
+        options: {
+            routes: ['/'],
+        },
+        configurations: {
+            development: {
+                browserTarget: `${schema.project}:build:development`,
+                serverTarget: `${schema.project}:server:development`,
+            },
+            production: {
+                browserTarget: `${schema.project}:build:production`,
+                serverTarget: `${schema.project}:server:production`,
+            },
+        },
+        defaultConfiguration: 'production',
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, schema.project, projectConfig);
+}
+exports.updateProjectConfig = updateProjectConfig;
+//# sourceMappingURL=update-project-config.js.map

package/src/generators/setup-ssr/lib/update-project-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;IAC5D,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnE,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,GAAG,aAAa,MAAM,CAAC,OAAO,UAAU,CAAC;IAEvF,aAAa,CAAC,OAAO,CAAC,MAAM,GAAG;QAC7B,QAAQ,EAAE,sCAAsC;QAChD,OAAO,EAAE;YACP,UAAU,EAAE,aAAa,aAAa,CAAC,IAAI,SAAS;YACpD,IAAI,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC;YAClE,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,sBAAsB,CAAC;SACxE;QACD,cAAc,EAAE;YACd,UAAU,EAAE;gBACV,aAAa,EAAE,OAAO;gBACtB,gBAAgB,EAAE;oBAChB;wBACE,OAAO,EAAE,IAAA,0BAAiB,EACxB,aAAa,CAAC,UAAU,EACxB,6BAA6B,CAC9B;wBACD,IAAI,EAAE,IAAA,0BAAiB,EACrB,aAAa,CAAC,UAAU,EACxB,kCAAkC,CACnC;qBACF;iBACF;aACF;YACD,WAAW,EAAE;gBACX,YAAY,EAAE,KAAK;gBACnB,SAAS,EAAE,IAAI;gBACf,eAAe,EAAE,KAAK;aACvB;SACF;QACD,oBAAoB,EAAE,YAAY;KACnC,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;QACnC,QAAQ,EAAE,sCAAsC;QAChD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBACpD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,qBAAqB;aACrD;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;gBACnD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;aACpD;SACF;QACD,oBAAoB,EAAE,aAAa;KACpC,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,SAAS,GAAG;QAChC,QAAQ,EAAE,iCAAiC;QAC3C,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,GAAG,CAAC;SACd;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBACpD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,qBAAqB;aACrD;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;gBACnD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;aACpD;SACF;QACD,oBAAoB,EAAE,YAAY;KACnC,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC;AAvED,kDAuEC"}

package/src/generators/setup-ssr/schema.d.ts

@@ -0,0 +1,10 @@
+export interface Schema {
+  project: string;
+  appId?: string;
+  main?: string;
+  serverFileName?: string;
+  serverPort?: number;
+  rootModuleFileName?: string;
+  rootModuleClassName?: string;
+  skipFormat?: boolean;
+}

package/src/generators/setup-ssr/schema.json

@@ -0,0 +1,59 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "GeneratorAngularUniversalSetup",
+  "cli": "nx",
+  "title": "Generate Angular Universal (SSR) setup for an Angular App",
+  "description": "Create the additional configuration required to enable SSR via Angular Universal for an Angular application.",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the application to generate the Angular Universal configuration for.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What app would you like to generate an Angular Universal configuration for?",
+      "x-dropdown": "projects"
+    },
+    "appId": {
+      "type": "string",
+      "format": "html-selector",
+      "description": "The `appId` to use with `withServerTransition`.",
+      "default": "serverApp"
+    },
+    "main": {
+      "type": "string",
+      "format": "path",
+      "description": "The name of the main entry-point file.",
+      "default": "main.server.ts"
+    },
+    "serverFileName": {
+      "type": "string",
+      "default": "server.ts",
+      "description": "The name of the Express server file."
+    },
+    "serverPort": {
+      "type": "number",
+      "default": 4000,
+      "description": "The port for the Express server."
+    },
+    "rootModuleFileName": {
+      "type": "string",
+      "format": "path",
+      "description": "The name of the root module file",
+      "default": "app.server.module.ts"
+    },
+    "rootModuleClassName": {
+      "type": "string",
+      "description": "The name of the root module class.",
+      "default": "AppServerModule"
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "description": "Skip formatting the workspace after the generator completes."
+    }
+  },
+  "required": ["project"],
+  "additionalProperties": false
+}

package/src/generators/setup-ssr/setup-ssr.compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
+export default _default;

package/src/generators/setup-ssr/setup-ssr.compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+const setup_ssr_1 = require("./setup-ssr");
+exports.default = (0, devkit_1.convertNxGenerator)(setup_ssr_1.setupSsr);
+//# sourceMappingURL=setup-ssr.compat.js.map

package/src/generators/setup-ssr/setup-ssr.compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-ssr.compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,2CAAuC;AAEvC,kBAAe,IAAA,2BAAkB,EAAC,oBAAQ,CAAC,CAAC"}

package/src/generators/setup-ssr/setup-ssr.d.ts

@@ -0,0 +1,4 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from './schema';
+export declare function setupSsr(tree: Tree, schema: Schema): Promise<() => void>;
+export default setupSsr;

package/src/generators/setup-ssr/setup-ssr.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupSsr = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const lib_1 = require("./lib");
+const versions_1 = require("../../utils/versions");
+function setupSsr(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = (0, lib_1.normalizeOptions)(tree, schema);
+        (0, lib_1.generateSSRFiles)(tree, options);
+        (0, lib_1.updateAppModule)(tree, options);
+        (0, lib_1.updateProjectConfig)(tree, options);
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {
+            '@nguniversal/express-engine': versions_1.ngUniversalVersion,
+            '@angular/platform-server': versions_1.angularVersion,
+        }, {
+            '@nguniversal/builders': versions_1.ngUniversalVersion,
+        });
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+        return () => {
+            (0, devkit_1.installPackagesTask)(tree);
+        };
+    });
+}
+exports.setupSsr = setupSsr;
+exports.default = setupSsr;
+//# sourceMappingURL=setup-ssr.js.map

package/src/generators/setup-ssr/setup-ssr.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AAEtB,+BAKe;AACf,mDAA0E;AAE1E,SAAsB,QAAQ,CAAC,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnC,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,6BAA6B,EAAE,6BAAkB;YACjD,0BAA0B,EAAE,yBAAc;SAC3C,EACD;YACE,uBAAuB,EAAE,6BAAkB;SAC5C,CACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAzBD,4BAyBC;AAED,kBAAe,QAAQ,CAAC"}

package/src/utils/versions.d.ts

@@ -7,6 +7,7 @@ export declare const rxjsVersion = "~7.5.0";
 export declare const zoneJsVersion = "~0.11.4";
 export declare const angularJsVersion = "1.7.9";
 export declare const tsLibVersion = "^2.3.0";
+export declare const ngUniversalVersion = "~14.2.0";
 export declare const angularEslintVersion = "~14.0.4";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.typesJasminewd2Version = exports.typesJasmineVersion = exports.jasmineSpecReporterVersion = exports.jasmineCoreVersion = exports.karmaJasmineHtmlReporterVersion = exports.karmaJasmineVersion = exports.karmaCoverageVersion = exports.karmaChromeLauncherVersion = exports.karmaVersion = exports.protractorVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.typesJasminewd2Version = exports.typesJasmineVersion = exports.jasmineSpecReporterVersion = exports.jasmineCoreVersion = exports.karmaJasmineHtmlReporterVersion = exports.karmaJasmineVersion = exports.karmaCoverageVersion = exports.karmaChromeLauncherVersion = exports.karmaVersion = exports.protractorVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.ngUniversalVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~14.2.0';
 exports.angularDevkitVersion = '~14.2.0';
@@ -10,6 +10,7 @@ exports.rxjsVersion = '~7.5.0';
 exports.zoneJsVersion = '~0.11.4';
 exports.angularJsVersion = '1.7.9';
 exports.tsLibVersion = '^2.3.0';
+exports.ngUniversalVersion = '~14.2.0';
 exports.angularEslintVersion = '~14.0.4';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEzB,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,+BAA+B,GAAG,QAAQ,CAAC;AAC3C,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,qBAAqB,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAE/B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEzB,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,+BAA+B,GAAG,QAAQ,CAAC;AAC3C,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,qBAAqB,GAAG,QAAQ,CAAC"}