@nx/angular 16.0.3 → 16.1.0-rc.0

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.js

@@ -3,30 +3,28 @@
  * Adapted from the original ng-packagr source.
  *
  * Changes made:
- * - Made sure ngccProcessor is optional.
+ * - Remove ngccProcessor (Angular < 16)
  * - Use custom cacheCompilerHost instead of the one provided by ng-packagr.
+ * - Support Angular Compiler `incrementalDriver` for Angular < 16.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSourceFiles = void 0;
 const tslib_1 = require("tslib");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const cache_compiler_host_1 = require("ng-packagr/lib/ts/cache-compiler-host");
-const ngcc_transform_compiler_host_1 = require("ng-packagr/lib/ts/ngcc-transform-compiler-host");
 const log = require("ng-packagr/lib/utils/log");
 const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const ts = require("typescript");
+const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
 const cache_compiler_host_2 = require("../ts/cache-compiler-host");
-function compileSourceFiles(graph, tsConfig, moduleResolutionCache, extraOptions, stylesheetProcessor, ngccProcessor, watch) {
+function compileSourceFiles(graph, tsConfig, moduleResolutionCache, extraOptions, stylesheetProcessor, watch) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { NgtscProgram, formatDiagnostics } = yield (0, ng_compiler_cli_1.ngCompilerCli)();
         const tsConfigOptions = Object.assign(Object.assign({}, tsConfig.options), extraOptions);
         const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
         const ngPackageNode = graph.find(nodes_1.isPackage);
         const inlineStyleLanguage = ngPackageNode.data.inlineStyleLanguage;
-        let tsCompilerHost = (0, cache_compiler_host_2.cacheCompilerHost)(graph, entryPoint, tsConfigOptions, moduleResolutionCache, stylesheetProcessor, inlineStyleLanguage);
-        if (ngccProcessor) {
-            tsCompilerHost = (0, ngcc_transform_compiler_host_1.ngccTransformCompilerHost)(tsCompilerHost, tsConfigOptions, ngccProcessor, moduleResolutionCache);
-        }
+        const tsCompilerHost = (0, cache_compiler_host_2.cacheCompilerHost)(graph, entryPoint, tsConfigOptions, moduleResolutionCache, stylesheetProcessor, inlineStyleLanguage);
         const cache = entryPoint.cache;
         const sourceFileCache = cache.sourcesFileCache;
         // Create the Angular specific program that contains the Angular compiler
@@ -97,8 +95,12 @@ function compileSourceFiles(graph, tsConfig, moduleResolutionCache, extraOptions
                 continue;
             }
             // Collect sources that are required to be emitted
+            const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+            const incrementalCompilation = angularVersion.major < 16
+                ? angularCompiler.incrementalDriver
+                : angularCompiler.incrementalCompilation;
             if (!ignoreForEmit.has(sourceFile) &&
-                !angularCompiler.incrementalDriver.safeToSkipEmit(sourceFile)) {
+                !incrementalCompilation.safeToSkipEmit(sourceFile)) {
                 // If required to emit, diagnostics may have also changed
                 if (!ignoreForDiagnostics.has(sourceFile)) {
                     affectedFiles.add(sourceFile);

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.ts"],"names":[],"mappings":"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"}

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

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/schema",
   "title": "ng-packagr Target",
-  "description": "Builds a library with support for incremental builds.\n\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nrwl/angular:package` executor but with some key differences:\n- It doesn't run `ngcc` automatically (`ngcc` needs to be run separately beforehand if needed, this can be done in a `postinstall` hook on `package.json`).\n- It only produces ESM2020 bundles.\n- It doesn't generate package exports in the `package.json`.",
+  "description": "Builds a library with support for incremental builds.\n\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nx/angular:package` executor but with some key differences:\n- For supported Angular versions lower than v16, it doesn't run `ngcc` automatically (`ngcc` is no longer available from Angular v16 onwards, for lower versions, it needs to be run separately beforehand if needed, this can be done in a `postinstall` hook on `package.json`).\n- It only produces ESM2022 bundles (ESM2020 for supported Angular versions lower than v16).",
   "cli": "nx",
   "type": "object",
   "presets": [

package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.d.ts

@@ -3,6 +3,8 @@
  *
  * Changes made:
  * - Use our own StylesheetProcessor files instead of the ones provide by ng-packagr.
+ * - Support ngcc for Angular < 16.
+ * - Support ESM2020 for Angular < 16.
  */
 import { Transform } from 'ng-packagr/lib/graph/transform';
 import { StylesheetProcessor as StylesheetProcessorClass } from '../../styles/stylesheet-processor';

package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js

@@ -4,19 +4,21 @@
  *
  * Changes made:
  * - Use our own StylesheetProcessor files instead of the ones provide by ng-packagr.
+ * - Support ngcc for Angular < 16.
+ * - Support ESM2020 for Angular < 16.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileNgcTransformFactory = void 0;
 const tslib_1 = require("tslib");
 const transform_1 = require("ng-packagr/lib/graph/transform");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
-const ngcc_processor_1 = require("ng-packagr/lib/ngc/ngcc-processor");
 const tsconfig_1 = require("ng-packagr/lib/ts/tsconfig");
-const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const ora = require("ora");
 const path = require("path");
 const ts = require("typescript");
+const angular_version_utils_1 = require("../../../../utilities/angular-version-utils");
 const compile_source_files_1 = require("../../ngc/compile-source-files");
+const ng_compiler_cli_1 = require("../../utils/ng-compiler-cli");
 const compileNgcTransformFactory = (StylesheetProcessor, options) => {
     return (0, transform_1.transformFromPromise)((graph) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
@@ -30,22 +32,32 @@ const compileNgcTransformFactory = (StylesheetProcessor, options) => {
             const entryPoints = graph.filter(nodes_1.isEntryPoint);
             // Add paths mappings for dependencies
             const tsConfig = (0, tsconfig_1.setDependenciesTsConfigPaths)(entryPoint.data.tsConfig, entryPoints);
+            const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
             // Compile TypeScript sources
-            const { esm2020, declarations } = entryPoint.data.destinationFiles;
+            const { declarations } = entryPoint.data.destinationFiles;
+            const esmModulePath = angularVersion.major < 16
+                ? entryPoint.data.destinationFiles.esm2020
+                : entryPoint.data.destinationFiles.esm2022;
             const { basePath, cssUrl, styleIncludePaths } = entryPoint.data.entryPoint;
-            const { moduleResolutionCache, ngccProcessingCache } = entryPoint.cache;
+            const { moduleResolutionCache } = entryPoint.cache;
             spinner.start(`Compiling with Angular sources in Ivy ${tsConfig.options.compilationMode || 'full'} compilation mode.`);
-            const ngccProcessor = new ngcc_processor_1.NgccProcessor(yield (0, ng_compiler_cli_1.ngccCompilerCli)(), ngccProcessingCache, tsConfig.project, tsConfig.options, entryPoints);
-            if (!entryPoint.data.entryPoint.isSecondaryEntryPoint) {
-                // Only run the async version of NGCC during the primary entrypoint processing.
-                yield ngccProcessor.process();
+            let ngccProcessor;
+            if (angularVersion && angularVersion.major < 16) {
+                ngccProcessor =
+                    new (require('ng-packagr/lib/ngc/ngcc-processor').NgccProcessor)(yield (0, ng_compiler_cli_1.ngccCompilerCli)(), entryPoint.cache.ngccProcessingCache, tsConfig.project, tsConfig.options, entryPoints);
+                if (!entryPoint.data.entryPoint.isSecondaryEntryPoint) {
+                    // Only run the async version of NGCC during the primary entrypoint processing.
+                    yield ngccProcessor.process();
+                }
             }
             (_a = (_b = entryPoint.cache).stylesheetProcessor) !== null && _a !== void 0 ? _a : (_b.stylesheetProcessor = new StylesheetProcessor(basePath, cssUrl, styleIncludePaths, options.cacheEnabled && options.cacheDirectory, options.watch, options.tailwindConfig));
             yield (0, compile_source_files_1.compileSourceFiles)(graph, tsConfig, moduleResolutionCache, {
-                outDir: path.dirname(esm2020),
+                outDir: path.dirname(esmModulePath),
                 declarationDir: path.dirname(declarations),
                 declaration: true,
-                target: ts.ScriptTarget.ES2020,
+                target: angularVersion.major >= 16
+                    ? ts.ScriptTarget.ES2022
+                    : ts.ScriptTarget.ES2020,
             }, entryPoint.cache.stylesheetProcessor, ngccProcessor, options.watch);
         }
         catch (error) {

package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-ngc.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,8DAGwC;AACxC,2DAIyC;AACzC,sEAAkE;AAClE,yDAA0E;AAC1E,0EAAuE;AACvE,2BAA2B;AAC3B,6BAA6B;AAC7B,iCAAiC;AACjC,yEAAoE;AAI7D,MAAM,0BAA0B,GAAG,CACxC,mBAAoD,EACpD,OAAyB,EACd,EAAE;IACb,OAAO,IAAA,gCAAoB,EAAC,CAAO,KAAK,EAAE,EAAE;;;QAC1C,MAAM,OAAO,GAAG,GAAG,CAAC;YAClB,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,KAAK;SACpB,CAAC,CAAC;QAEH,IAAI;YACF,MAAM,UAAU,GAAmB,KAAK,CAAC,IAAI,CAAC,IAAA,8BAAsB,GAAE,CAAC,CAAC;YACxE,MAAM,WAAW,GAAqB,KAAK,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAC;YACjE,sCAAsC;YACtC,MAAM,QAAQ,GAAG,IAAA,uCAA4B,EAC3C,UAAU,CAAC,IAAI,CAAC,QAAQ,EACxB,WAAW,CACZ,CAAC;YAEF,6BAA6B;YAC7B,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC;YACnE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAC3C,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;YAC7B,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC;YAExE,OAAO,CAAC,KAAK,CACX,yCACE,QAAQ,CAAC,OAAO,CAAC,eAAe,IAAI,MACtC,oBAAoB,CACrB,CAAC;YACF,MAAM,aAAa,GAAG,IAAI,8BAAa,CACrC,MAAM,IAAA,iCAAe,GAAE,EACvB,mBAAmB,EACnB,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,OAAO,EAChB,WAAW,CACZ,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE;gBACrD,+EAA+E;gBAC/E,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;aAC/B;YAED,YAAA,UAAU,CAAC,KAAK,EAAC,mBAAmB,uCAAnB,mBAAmB,GAAK,IAAI,mBAAmB,CAC9D,QAAQ,EACR,MAAM,EACN,iBAAiB,EACjB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,cAAc,EAC9C,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,cAAc,CAChB,EAAC;YAET,MAAM,IAAA,yCAAkB,EACtB,KAAK,EACL,QAAQ,EACR,qBAAqB,EACrB;gBACE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC7B,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;gBAC1C,WAAW,EAAE,IAAI;gBACjB,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM;aAC/B,EACD,UAAU,CAAC,KAAK,CAAC,mBAA0B,EAC3C,aAAa,EACb,OAAO,CAAC,KAAK,CACd,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,KAAK,CAAC;SACb;QAED,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,KAAK,CAAC;IACf,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC;AAzEW,QAAA,0BAA0B,8BAyErC"}
+{"version":3,"file":"compile-ngc.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.ts"],"names":[],"mappings":"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"}

package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.d.ts

@@ -3,10 +3,11 @@
  *
  * Changes made:
  * - Use custom cacheCompilerHost instead of the one provided by ng-packagr.
+ * - Support ngcc for Angular < 16.
+ * - Support Angular Compiler `incrementalDriver` for Angular < 16.
  */
 import type { CompilerOptions, ParsedConfiguration } from '@angular/compiler-cli';
 import { BuildGraph } from 'ng-packagr/lib/graph/build-graph';
-import { NgccProcessor } from 'ng-packagr/lib/ngc/ngcc-processor';
 import * as ts from 'typescript';
 import { StylesheetProcessor } from '../styles/stylesheet-processor';
-export declare function compileSourceFiles(graph: BuildGraph, tsConfig: ParsedConfiguration, moduleResolutionCache: ts.ModuleResolutionCache, extraOptions?: Partial<CompilerOptions>, stylesheetProcessor?: StylesheetProcessor, ngccProcessor?: NgccProcessor, watch?: boolean): Promise<void>;
+export declare function compileSourceFiles(graph: BuildGraph, tsConfig: ParsedConfiguration, moduleResolutionCache: ts.ModuleResolutionCache, extraOptions?: Partial<CompilerOptions>, stylesheetProcessor?: StylesheetProcessor, ngccProcessor?: any, watch?: boolean): Promise<void>;

package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.js

@@ -4,15 +4,17 @@
  *
  * Changes made:
  * - Use custom cacheCompilerHost instead of the one provided by ng-packagr.
+ * - Support ngcc for Angular < 16.
+ * - Support Angular Compiler `incrementalDriver` for Angular < 16.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSourceFiles = void 0;
 const tslib_1 = require("tslib");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
-const ngcc_transform_compiler_host_1 = require("ng-packagr/lib/ts/ngcc-transform-compiler-host");
 const log = require("ng-packagr/lib/utils/log");
 const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const ts = require("typescript");
+const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
 const cache_compiler_host_1 = require("../ts/cache-compiler-host");
 function compileSourceFiles(graph, tsConfig, moduleResolutionCache, extraOptions, stylesheetProcessor, ngccProcessor, watch) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -21,7 +23,11 @@ function compileSourceFiles(graph, tsConfig, moduleResolutionCache, extraOptions
         const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
         const ngPackageNode = graph.find(nodes_1.isPackage);
         const inlineStyleLanguage = ngPackageNode.data.inlineStyleLanguage;
-        const tsCompilerHost = (0, ngcc_transform_compiler_host_1.ngccTransformCompilerHost)((0, cache_compiler_host_1.cacheCompilerHost)(graph, entryPoint, tsConfigOptions, moduleResolutionCache, stylesheetProcessor, inlineStyleLanguage), tsConfigOptions, ngccProcessor, moduleResolutionCache);
+        let tsCompilerHost = (0, cache_compiler_host_1.cacheCompilerHost)(graph, entryPoint, tsConfigOptions, moduleResolutionCache, stylesheetProcessor, inlineStyleLanguage);
+        if (ngccProcessor) {
+            tsCompilerHost =
+                require('ng-packagr/lib/ts/ngcc-transform-compiler-host').ngccTransformCompilerHost(tsCompilerHost, tsConfigOptions, ngccProcessor, moduleResolutionCache);
+        }
         const cache = entryPoint.cache;
         const sourceFileCache = cache.sourcesFileCache;
         // Create the Angular specific program that contains the Angular compiler
@@ -92,8 +98,12 @@ function compileSourceFiles(graph, tsConfig, moduleResolutionCache, extraOptions
                 continue;
             }
             // Collect sources that are required to be emitted
+            const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+            const incrementalCompilation = angularVersion.major < 16
+                ? angularCompiler.incrementalDriver
+                : angularCompiler.incrementalCompilation;
             if (!ignoreForEmit.has(sourceFile) &&
-                !angularCompiler.incrementalDriver.safeToSkipEmit(sourceFile)) {
+                !incrementalCompilation.safeToSkipEmit(sourceFile)) {
                 // If required to emit, diagnostics may have also changed
                 if (!ignoreForDiagnostics.has(sourceFile)) {
                     affectedFiles.add(sourceFile);

package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAOH,2DAKyC;AAEzC,iGAA2F;AAC3F,gDAAgD;AAChD,0EAAqE;AACrE,iCAAiC;AAEjC,mEAGmC;AAEnC,SAAsB,kBAAkB,CACtC,KAAiB,EACjB,QAA6B,EAC7B,qBAA+C,EAC/C,YAAuC,EACvC,mBAAyC,EACzC,aAA6B,EAC7B,KAAe;;QAEf,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,+BAAa,GAAE,CAAC;QAElE,MAAM,eAAe,mCAChB,QAAQ,CAAC,OAAO,GAChB,YAAY,CAChB,CAAC;QACF,MAAM,UAAU,GAAmB,KAAK,CAAC,IAAI,CAAC,IAAA,8BAAsB,GAAE,CAAC,CAAC;QACxE,MAAM,aAAa,GAAgB,KAAK,CAAC,IAAI,CAAC,iBAAS,CAAC,CAAC;QACzD,MAAM,mBAAmB,GAAG,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC;QAEnE,MAAM,cAAc,GAAG,IAAA,wDAAyB,EAC9C,IAAA,uCAAiB,EACf,KAAK,EACL,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,CACpB,EACD,eAAe,EACf,aAAa,EACb,qBAAqB,CACtB,CAAC;QAEF,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAC/B,MAAM,eAAe,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAE/C,yEAAyE;QACzE,MAAM,cAAc,GAAG,IAAI,YAAY,CACrC,QAAQ,CAAC,SAAS,EAClB,eAAe,EACf,cAAc,EACd,KAAK,CAAC,eAAe,CACtB,CAAC;QAEF,MAAM,eAAe,GAAG,cAAc,CAAC,QAAQ,CAAC;QAChD,MAAM,EAAE,oBAAoB,EAAE,aAAa,EAAE,GAAG,eAAe,CAAC;QAEhE,yDAAyD;QACzD,0FAA0F;QAC1F,MAAM,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;QACxD,IAAA,kDAA4B,EAAC,iBAAiB,CAAC,CAAC;QAEhD,IAAI,OAAwE,CAAC;QAC7E,IAAI,KAAK,EAAE;YACT,OAAO,GAAG,KAAK,CAAC,UAAU;gBACxB,EAAE,CAAC,8CAA8C,CAC/C,iBAAiB,EACjB,cAAc,EACd,KAAK,CAAC,UAAU,CACjB,CAAC;YACJ,KAAK,CAAC,eAAe,GAAG,cAAc,CAAC;SACxC;aAAM;YACL,yFAAyF;YACzF,kEAAkE;YAClE,OAAO,GAAG,EAAE,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;SACvE;QAED,oCAAoC;QACpC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAiB,CAAC;QAE/C,0EAA0E;QAC1E,IAAI,0CAA0C,IAAI,OAAO,EAAE;YACzD,iDAAiD;YACjD,OAAO,IAAI,EAAE;gBACX,MAAM,MAAM,GAAG,OAAO,CAAC,wCAAwC,CAC7D,SAAS,EACT,CAAC,UAAU,EAAE,EAAE;oBACb,2EAA2E;oBAC3E,kFAAkF;oBAClF,0FAA0F;oBAC1F,yFAAyF;oBACzF,YAAY;oBACZ,IACE,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC;wBACpC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAC/C;wBACA,sFAAsF;wBACtF,0EAA0E;wBAC1E,MAAM,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;wBACnE,MAAM,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;wBACnE,IAAI,kBAAkB,EAAE;4BACtB,aAAa,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;yBACvC;wBAED,OAAO,IAAI,CAAC;qBACb;oBAED,OAAO,KAAK,CAAC;gBACf,CAAC,CACF,CAAC;gBAEF,IAAI,CAAC,MAAM,EAAE;oBACX,MAAM;iBACP;gBAED,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,QAAyB,CAAC,CAAC;aACrD;SACF;QAED,oCAAoC;QACpC,MAAM,cAAc,GAAoB;YACtC,GAAG,eAAe,CAAC,oBAAoB,EAAE;YACzC,GAAG,OAAO,CAAC,qBAAqB,EAAE;YAClC,GAAG,OAAO,CAAC,oBAAoB,EAAE;SAClC,CAAC;QAEF,oDAAoD;QACpD,4EAA4E;QAC5E,MAAM,eAAe,CAAC,YAAY,EAAE,CAAC;QAErC,2CAA2C;QAC3C,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE;YACjD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACzC,cAAc,CAAC,IAAI,CACjB,GAAG,OAAO,CAAC,yBAAyB,CAAC,UAAU,CAAC,EAChD,GAAG,OAAO,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAC9C,GAAG,OAAO,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAC9C,CAAC;aACH;YAED,IAAI,UAAU,CAAC,iBAAiB,EAAE;gBAChC,SAAS;aACV;YAED,kDAAkD;YAClD,IACE,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC;gBAC9B,CAAC,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,UAAU,CAAC,EAC7D;gBACA,yDAAyD;gBACzD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;oBACzC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;iBAC/B;aACF;iBAAM,IACL,eAAe;gBACf,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC;gBAC9B,CAAC,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,EACrC;gBACA,oEAAoE;gBACpE,MAAM,kBAAkB,GACtB,eAAe,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;gBACpD,IAAI,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,EAAE;oBAC9B,cAAc,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,CAAC;iBAC5C;aACF;SACF;QAED,gEAAgE;QAChE,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACxC,MAAM,kBAAkB,GAAG,eAAe,CAAC,qBAAqB,CAC9D,YAAY;YACZ,+BAA+B,CAAC,CAAC,CAClC,CAAC;YAEF,cAAc,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,CAAC;YAC3C,eAAe,CAAC,wBAAwB,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;SAC5E;QAED,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAC5B,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAC5B,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE;YACvC,IAAI,UAAU,CAAC,QAAQ,KAAK,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE;gBACvD,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACnC;iBAAM;gBACL,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACnC;SACF;QAED,IAAI,gBAAgB,CAAC,MAAM,EAAE;YAC3B,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;SAC9C;QAED,IAAI,gBAAgB,CAAC,MAAM,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;SACtD;QAED,MAAM,YAAY,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,YAAY,CAAC;QAChE,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE;YACjD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBAClC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;aACzE;SACF;IACH,CAAC;CAAA;AAhMD,gDAgMC"}
+{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.ts"],"names":[],"mappings":"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"}

package/src/executors/package/ng-packagr-adjustments/utils/ng-compiler-cli.d.ts

@@ -0,0 +1 @@
+export declare function ngccCompilerCli(): Promise<any>;

package/src/executors/package/ng-packagr-adjustments/utils/ng-compiler-cli.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ngccCompilerCli = void 0;
+const tslib_1 = require("tslib");
+function ngccCompilerCli() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const compilerCliModule = yield new Function(`return import('@angular/compiler-cli/ngcc');`)();
+        return compilerCliModule.process
+            ? compilerCliModule
+            : compilerCliModule.default;
+    });
+}
+exports.ngccCompilerCli = ngccCompilerCli;
+//# sourceMappingURL=ng-compiler-cli.js.map

package/src/executors/package/ng-packagr-adjustments/utils/ng-compiler-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ng-compiler-cli.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/utils/ng-compiler-cli.ts"],"names":[],"mappings":";;;;AAAA,SAAsB,eAAe;;QACnC,MAAM,iBAAiB,GAAG,MAAM,IAAI,QAAQ,CAC1C,8CAA8C,CAC/C,EAAE,CAAC;QAEJ,OAAO,iBAAiB,CAAC,OAAO;YAC9B,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC;IAChC,CAAC;CAAA;AARD,0CAQC"}

package/src/executors/utilities/tailwindcss.js

@@ -41,8 +41,13 @@ function getTailwindSetup(basePath, tailwindConfig) {
 }
 exports.getTailwindSetup = getTailwindSetup;
 function getTailwindConfigPath(projectRoot, workspaceRoot) {
-    // valid tailwind config files https://github.com/tailwindlabs/tailwindcss/blob/master/src/util/resolveConfigPath.js#L46
-    const tailwindConfigFiles = ['tailwind.config.js', 'tailwind.config.cjs'];
+    // valid tailwind config files https://github.com/tailwindlabs/tailwindcss/blob/master/src/util/resolveConfigPath.js#L4
+    const tailwindConfigFiles = [
+        'tailwind.config.js',
+        'tailwind.config.cjs',
+        'tailwind.config.mjs',
+        'tailwind.config.ts',
+    ];
     for (const basePath of [projectRoot, workspaceRoot]) {
         for (const configFile of tailwindConfigFiles) {
             const fullPath = (0, path_1.join)(basePath, configFile);

package/src/executors/utilities/tailwindcss.js.map

@@ -1 +1 @@
-{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AACpC,uCAA2C;AAC3C,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAOnC,QAAA,kBAAkB,GAAG;IAChC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,aAAa;IACb,SAAS;CACV,CAAC;AAEF,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,cAAuB;IAEvB,IAAI,kBAAkB,GAAG,cAAc,CAAC;IAExC,IAAI,CAAC,kBAAkB,EAAE;QACvB,kBAAkB,GAAG,qBAAqB,CAAC,QAAQ,EAAE,sBAAa,CAAC,CAAC;KACrE;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,IAAA,eAAQ,EACzC,sBAAa,EACb,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AArCD,4CAqCC;AAED,SAAS,qBAAqB,CAC5B,WAAmB,EACnB,aAAqB;IAErB,wHAAwH;IACxH,MAAM,mBAAmB,GAAG,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,CAAC;IAE1E,KAAK,MAAM,QAAQ,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE;QACnD,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC5C,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;gBACxB,OAAO,QAAQ,CAAC;aACjB;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,yBAAyB,CACvC,EAAE,kBAAkB,EAAE,mBAAmB,EAAiB,EAC1D,YAAuB,EACvB,KAAe;IAEf,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AAhBD,8DAgBC"}
+{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AACpC,uCAA2C;AAC3C,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAOnC,QAAA,kBAAkB,GAAG;IAChC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,aAAa;IACb,SAAS;CACV,CAAC;AAEF,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,cAAuB;IAEvB,IAAI,kBAAkB,GAAG,cAAc,CAAC;IAExC,IAAI,CAAC,kBAAkB,EAAE;QACvB,kBAAkB,GAAG,qBAAqB,CAAC,QAAQ,EAAE,sBAAa,CAAC,CAAC;KACrE;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,IAAA,eAAQ,EACzC,sBAAa,EACb,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AArCD,4CAqCC;AAED,SAAS,qBAAqB,CAC5B,WAAmB,EACnB,aAAqB;IAErB,uHAAuH;IACvH,MAAM,mBAAmB,GAAG;QAC1B,oBAAoB;QACpB,qBAAqB;QACrB,qBAAqB;QACrB,oBAAoB;KACrB,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE;QACnD,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC5C,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;gBACxB,OAAO,QAAQ,CAAC;aACjB;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,yBAAyB,CACvC,EAAE,kBAAkB,EAAE,mBAAmB,EAAiB,EAC1D,YAAuB,EACvB,KAAe;IAEf,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AAhBD,8DAgBC"}

package/src/generators/application/files/standalone-components/src/app/app.config.ts__tpl__

@@ -0,0 +1,7 @@
+import { ApplicationConfig } from '@angular/core';<% if (routing) { %>
+import { provideRouter, withEnabledBlockingInitialNavigation } from '@angular/router';
+import { appRoutes } from './app.routes';<% } %>
+
+export const appConfig: ApplicationConfig = {
+  providers: [<% if (routing) { %>provideRouter(appRoutes, withEnabledBlockingInitialNavigation()) <% } %>]
+};

package/src/generators/application/files/standalone-components/src/main.ts__tpl__

@@ -1,11 +1,5 @@
-import { bootstrapApplication } from '@angular/platform-browser';<% if(routing) { %>
-import {
-  provideRouter,
-  withEnabledBlockingInitialNavigation,
-} from '@angular/router';
-import { appRoutes } from './app/app.routes';<% } %>
+import { bootstrapApplication } from '@angular/platform-browser';
+import { appConfig } from './app/app.config';
 import { AppComponent } from './app/app.component';
 
-bootstrapApplication(AppComponent, {
-  providers: [<% if(routing) { %>provideRouter(appRoutes, withEnabledBlockingInitialNavigation())<% } %>],
-}).catch((err) => console.error(err));
+bootstrapApplication(AppComponent, appConfig).catch((err) => console.error(err));

package/src/generators/component/lib/module.js

@@ -58,6 +58,6 @@ function findModule(tree, generateDir, projectRoot) {
         }
         dir = (0, path_1.dirname)(dir);
     }
-    return null;
+    throw new Error("Could not find a candidate module to add the component to. Please specify which module the component should be added to by using the '--module' option.");
 }
 //# sourceMappingURL=module.js.map

package/src/generators/component/lib/module.js.map

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

package/src/generators/host/files/src/main.server.ts__tmpl__

@@ -7,7 +7,7 @@ import * as cors from 'cors';
 import { existsSync } from 'fs';
 import { join } from 'path';
 
-import { AppServerModule } from './bootstrap.server';
+import<% if(standalone) { %> bootstrap <% } else { %> { AppServerModule } <% } %>from './bootstrap.server';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
@@ -23,7 +23,7 @@ export function app(): express.Express {
   server.engine(
     'html',
     ngExpressEngine({
-      bootstrap: AppServerModule,
+      <% if(standalone) { %>bootstrap<% } else { %>bootstrap: AppServerModule,<% } %>
     })
   );
 
@@ -63,4 +63,4 @@ function run(): void {
 
 run();
 
-export * from './bootstrap.server';
+<% if(standalone) { %>export default bootstrap;<% } else { %>export * from './bootstrap.server';<% } %>

package/src/generators/host/lib/add-ssr.js

@@ -10,13 +10,13 @@ function addSsr(tree, options, appName) {
         let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
         yield (0, setup_ssr_1.default)(tree, {
             project: appName,
+            standalone: options.standalone,
         });
         tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
         tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
-        tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.ts'));
-        tree.write((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.ts'), `import("./bootstrap")`);
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files'), project.root, {
             appName,
+            standalone: options.standalone,
             tmpl: '',
         });
         // update project.json

package/src/generators/host/lib/add-ssr.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-ssr.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/host/lib/add-ssr.ts"],"names":[],"mappings":";;;;AACA,uCAMoB;AAGpB,yDAAiD;AACjD,sDAMiC;AAEjC,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe,EAAE,OAAe;;QACvE,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC5C,8BAA8B,CAC/B,CAAC;QAEF,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,EAChD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CACtD,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,EAChD,uBAAuB,CACxB,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1E,OAAO;YACP,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,sBAAsB;QACtB,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,4BAA4B,CAAC;QAC/D,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG;YACnD,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,0BAA0B,CAAC;SAClE,CAAC;QAEF,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ;YACnC,uCAAuC,CAAC;QAE1C,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,IAAI,EAAE,sBAAW;YACjB,OAAO,EAAE,yBAAc;YACvB,yBAAyB,EAAE,sCAA2B;SACvD,EACD;YACE,aAAa,EAAE,2BAAgB;YAC/B,gBAAgB,EAAE,8BAAmB;SACtC,CACF,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAzDD,wBAyDC"}
+{"version":3,"file":"add-ssr.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/host/lib/add-ssr.ts"],"names":[],"mappings":";;;;AACA,uCAMoB;AAGpB,yDAAiD;AACjD,sDAMiC;AAEjC,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe,EAAE,OAAe;;QACvE,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE;YACnB,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC5C,8BAA8B,CAC/B,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1E,OAAO;YACP,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,sBAAsB;QACtB,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,4BAA4B,CAAC;QAC/D,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG;YACnD,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,0BAA0B,CAAC;SAClE,CAAC;QAEF,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ;YACnC,uCAAuC,CAAC;QAE1C,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,IAAI,EAAE,sBAAW;YACjB,OAAO,EAAE,yBAAc;YACvB,yBAAyB,EAAE,sCAA2B;SACvD,EACD;YACE,aAAa,EAAE,2BAAgB;YAC/B,gBAAgB,EAAE,8BAAmB;SACtC,CACF,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAlDD,wBAkDC"}

package/src/generators/init/init.js

@@ -100,10 +100,13 @@ function updateDependencies(tree, versions) {
     });
 }
 function addUnitTestRunner(tree, options, jestPresetAngularVersion) {
+    var _a;
+    var _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         switch (options.unitTestRunner) {
             case test_runners_1.UnitTestRunner.Jest:
                 if (!options.skipPackageJson) {
+                    (_a = (_b = process.env).npm_config_legacy_peer_deps) !== null && _a !== void 0 ? _a : (_b.npm_config_legacy_peer_deps = 'true');
                     (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
                         'jest-preset-angular': jestPresetAngularVersion,
                     });

package/src/generators/init/init.js.map

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

package/src/generators/library/files/base/package.json__tpl__

@@ -2,8 +2,8 @@
   "name": "<% if(npmScope) { %><%= npmScope %>/<% } %><%= libFileName %>",
   "version": "0.0.1",
   "peerDependencies": {
-    "@angular/common": "^15.2.0",
-    "@angular/core": "^15.2.0"
+    "@angular/common": "<%= angularPeerDepVersion %>",
+    "@angular/core": "<%= angularPeerDepVersion %>"
   },
   "dependencies": {
     "tslib": "^2.3.0"

package/src/generators/library/lib/create-files.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const semver_1 = require("semver");
 const test_runners_1 = require("../../../utils/test-runners");
+const version_utils_1 = require("../../utils/version-utils");
 function createFiles(tree, options, project) {
     const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.libraryOptions.projectRoot);
@@ -11,6 +13,8 @@ function createFiles(tree, options, project) {
     const pathToComponent = options.componentOptions.flat
         ? options.libraryOptions.fileName
         : (0, devkit_1.joinPathFragments)(options.libraryOptions.fileName, options.libraryOptions.fileName);
+    const version = (0, version_utils_1.getInstalledAngularVersion)(tree);
+    const { major, minor } = (0, semver_1.parse)(version);
     const substitutions = {
         libName: options.libraryOptions.name,
         libFileName: options.libraryOptions.fileName,
@@ -24,6 +28,7 @@ function createFiles(tree, options, project) {
         pathToComponent,
         npmScope,
         rootOffset,
+        angularPeerDepVersion: `^${major}.${minor}.0`,
         tpl: '',
     };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base'), options.libraryOptions.projectRoot, substitutions);

package/src/generators/library/lib/create-files.js.map

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

package/src/generators/ngrx/lib/add-imports-to-module.js

@@ -9,8 +9,8 @@ const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 let tsModule;
 function addRootStoreImport(tree, isParentStandalone, route, sourceFile, parentPath, provideRootStore, storeForRoot) {
     if (isParentStandalone) {
-        if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
-            (0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideRootStore);
+        if (tree.read(parentPath, 'utf-8').includes('ApplicationConfig')) {
+            (0, ast_utils_1.addProviderToAppConfig)(tree, parentPath, provideRootStore);
         }
         else {
             (0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideRootStore);
@@ -23,8 +23,8 @@ function addRootStoreImport(tree, isParentStandalone, route, sourceFile, parentP
 }
 function addRootEffectsImport(tree, isParentStandalone, route, sourceFile, parentPath, provideRootEffects, effectsForEmptyRoot) {
     if (isParentStandalone) {
-        if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
-            (0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideRootEffects);
+        if (tree.read(parentPath, 'utf-8').includes('ApplicationConfig')) {
+            (0, ast_utils_1.addProviderToAppConfig)(tree, parentPath, provideRootEffects);
         }
         else {
             (0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideRootEffects);
@@ -41,8 +41,8 @@ function addRouterStoreImport(tree, sourceFile, addImport, parentPath, storeRout
 }
 function addStoreForFeatureImport(tree, isParentStandalone, route, sourceFile, parentPath, provideStoreForFeature, storeForFeature) {
     if (isParentStandalone) {
-        if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
-            (0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideStoreForFeature);
+        if (tree.read(parentPath, 'utf-8').includes('ApplicationConfig')) {
+            (0, ast_utils_1.addProviderToAppConfig)(tree, parentPath, provideStoreForFeature);
         }
         else {
             (0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideStoreForFeature);
@@ -55,8 +55,8 @@ function addStoreForFeatureImport(tree, isParentStandalone, route, sourceFile, p
 }
 function addEffectsForFeatureImport(tree, isParentStandalone, route, sourceFile, parentPath, provideEffectsForFeature, effectsForFeature) {
     if (isParentStandalone) {
-        if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
-            (0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideEffectsForFeature);
+        if (tree.read(parentPath, 'utf-8').includes('ApplicationConfig')) {
+            (0, ast_utils_1.addProviderToAppConfig)(tree, parentPath, provideEffectsForFeature);
         }
         else {
             (0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideEffectsForFeature);
@@ -132,8 +132,8 @@ function addImportsToModule(tree, options) {
             if (options.facade) {
                 sourceFile = addImport(sourceFile, facadeName, facadePath);
                 if (isParentStandalone) {
-                    if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
-                        (0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, facadeName);
+                    if (tree.read(parentPath, 'utf-8').includes('ApplicationConfig')) {
+                        (0, ast_utils_1.addProviderToAppConfig)(tree, parentPath, facadeName);
                     }
                     else {
                         (0, route_utils_1.addProviderToRoute)(tree, parentPath, options.route, facadeName);