@nx/angular 17.3.0-beta.5 → 17.3.0-beta.8

package/ng-package.json

@@ -24,7 +24,8 @@
     "http-server",
     "magic-string",
     "enquirer",
-    "find-cache-dir"
+    "find-cache-dir",
+    "piscina"
   ],
   "keepLifecycleScripts": true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.3.0-beta.5",
+  "version": "17.3.0-beta.8",
   "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, and Cypress. \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": {
@@ -73,20 +73,21 @@
     "find-cache-dir": "^3.3.2",
     "ignore": "^5.0.4",
     "magic-string": "~0.30.2",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "17.3.0-beta.5",
-    "@nx/cypress": "17.3.0-beta.5",
-    "@nx/jest": "17.3.0-beta.5",
-    "@nx/js": "17.3.0-beta.5",
-    "@nx/eslint": "17.3.0-beta.5",
-    "@nx/webpack": "17.3.0-beta.5",
-    "@nx/web": "17.3.0-beta.5",
-    "@nx/workspace": "17.3.0-beta.5",
-    "@nrwl/angular": "17.3.0-beta.5"
+    "@nx/devkit": "17.3.0-beta.8",
+    "@nx/cypress": "17.3.0-beta.8",
+    "@nx/jest": "17.3.0-beta.8",
+    "@nx/js": "17.3.0-beta.8",
+    "@nx/eslint": "17.3.0-beta.8",
+    "@nx/webpack": "17.3.0-beta.8",
+    "@nx/web": "17.3.0-beta.8",
+    "@nx/workspace": "17.3.0-beta.8",
+    "piscina": "^4.2.1",
+    "@nrwl/angular": "17.3.0-beta.8"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/builders/dev-server/dev-server.impl.js

@@ -16,6 +16,13 @@ const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
 const lib_1 = require("./lib");
 function executeDevServerBuilder(rawOptions, context) {
+    if (rawOptions.esbuildMiddleware) {
+        const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+        if (angularMajorVersion < 17) {
+            throw new Error((0, devkit_1.stripIndents) `The "esbuildMiddleware" option is only supported in Angular >= 17.0.0. You are currently using "${angularVersion}".
+        You can resolve this error by removing the "esbuildMiddleware" option or by migrating to Angular 17.0.0.`);
+        }
+    }
     process.env.NX_TSCONFIG_PATH = (0, js_1.getRootTsConfigPath)();
     const options = (0, lib_1.normalizeOptions)(rawOptions);
     const parsedBuildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, {
@@ -96,7 +103,8 @@ function executeDevServerBuilder(rawOptions, context) {
     return (0, rxjs_1.combineLatest)([
         (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))),
         (0, rxjs_1.from)((0, esbuild_extensions_1.loadPlugins)(buildTargetOptions.plugins, buildTargetOptions.tsConfig)),
-    ]).pipe((0, operators_2.switchMap)(([{ executeDevServerBuilder }, plugins]) => executeDevServerBuilder(delegateBuilderOptions, context, {
+        (0, rxjs_1.from)((0, esbuild_extensions_1.loadMiddleware)(options.esbuildMiddleware, buildTargetOptions.tsConfig)),
+    ]).pipe((0, operators_2.switchMap)(([{ executeDevServerBuilder }, plugins, middleware]) => executeDevServerBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: isUsingWebpackBuilder
             ? async (baseWebpackConfig) => {
                 if (!buildLibsFromSource) {
@@ -126,6 +134,7 @@ function executeDevServerBuilder(rawOptions, context) {
             : {}),
     }, {
         buildPlugins: plugins,
+        middleware,
     })));
 }
 exports.executeDevServerBuilder = executeDevServerBuilder;

package/src/builders/dev-server/schema.d.ts

@@ -17,6 +17,7 @@ interface BaseSchema {
   watch?: boolean;
   poll?: number;
   buildLibsFromSource?: boolean;
+  esbuildMiddleware?: string[];
 }
 
 export type SchemaWithBrowserTarget = BaseSchema & {

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

@@ -115,6 +115,14 @@
       "type": "boolean",
       "description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options.",
       "x-priority": "important"
+    },
+    "esbuildMiddleware": {
+      "description": "A list of HTTP request middleware functions. _Note: this is only supported in Angular versions >= 17.0.0_.",
+      "type": "array",
+      "items": {
+        "type": "string",
+        "description": "The path to the middleware function. Relative to the workspace root."
+      }
     }
   },
   "additionalProperties": false,

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -19,7 +19,7 @@ const path_1 = require("path");
 const postcssPresetEnv = require("postcss-preset-env");
 const postcssUrl = require("postcss-url");
 const node_url_1 = require("node:url");
-const tailwindcss_1 = require("../../../utilities/tailwindcss");
+const tailwindcss_1 = require("../../../utilities/ng-packagr/tailwindcss");
 const postcss = require('postcss');
 var CssUrl;
 (function (CssUrl) {
@@ -222,14 +222,3 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
     }
     return transformed.length ? transformed : undefined;
 }
-function customSassImporter(url, prev) {
-    // NB: Sass importer should always be sync as otherwise it will cause
-    // sass to go in the async path which is slower.
-    if (url[0] !== '~') {
-        return undefined;
-    }
-    return {
-        file: url.slice(1),
-        prev,
-    };
-}

package/src/executors/package/ng-packagr-adjustments/ng-packagr.d.ts

@@ -0,0 +1,3 @@
+import { NgPackagr } from 'ng-packagr';
+import type { BuildAngularLibraryExecutorOptions } from '../../package/schema';
+export declare function getNgPackagrInstance(options: BuildAngularLibraryExecutorOptions): Promise<NgPackagr>;

package/src/executors/package/ng-packagr-adjustments/ng-packagr.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNgPackagrInstance = void 0;
+const ng_packagr_1 = require("ng-packagr");
+const angular_version_utils_1 = require("../../utilities/angular-version-utils");
+const stylesheet_processor_di_1 = require("../../utilities/ng-packagr/stylesheet-processor.di");
+async function getNgPackagrInstance(options) {
+    const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    if (angularMajorVersion >= 17) {
+        const packagr = (0, ng_packagr_1.ngPackagr)();
+        packagr.withProviders([stylesheet_processor_di_1.STYLESHEET_PROCESSOR]);
+        return packagr;
+    }
+    const { NX_ENTRY_POINT_PROVIDERS } = await Promise.resolve().then(() => require('./ng-package/entry-point/entry-point.di'));
+    const { nxProvideOptions } = await Promise.resolve().then(() => require('./ng-package/options.di'));
+    const { NX_PACKAGE_PROVIDERS, NX_PACKAGE_TRANSFORM } = await Promise.resolve().then(() => require('./ng-package/package.di'));
+    const packagr = new ng_packagr_1.NgPackagr([
+        ...NX_PACKAGE_PROVIDERS,
+        ...NX_ENTRY_POINT_PROVIDERS,
+        nxProvideOptions({
+            tailwindConfig: options.tailwindConfig,
+            watch: options.watch,
+        }),
+    ]);
+    packagr.withBuildTransform(NX_PACKAGE_TRANSFORM.provide);
+    return packagr;
+}
+exports.getNgPackagrInstance = getNgPackagrInstance;

package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -19,7 +19,7 @@ const path_1 = require("path");
 const postcssPresetEnv = require("postcss-preset-env");
 const postcssUrl = require("postcss-url");
 const node_url_1 = require("node:url");
-const tailwindcss_1 = require("../../../utilities/tailwindcss");
+const tailwindcss_1 = require("../../../utilities/ng-packagr/tailwindcss");
 const postcss = require('postcss');
 var CssUrl;
 (function (CssUrl) {
@@ -215,14 +215,3 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
     }
     return transformed.length ? transformed : undefined;
 }
-function customSassImporter(url, prev) {
-    // NB: Sass importer should always be sync as otherwise it will cause
-    // sass to go in the async path which is slower.
-    if (url[0] !== '~') {
-        return undefined;
-    }
-    return {
-        file: url.slice(1),
-        prev,
-    };
-}

package/src/executors/package/package.impl.d.ts

@@ -1,5 +1,5 @@
 import type { ExecutorContext } from '@nx/devkit';
-import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { type DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
 import type { NgPackagr } from 'ng-packagr';
 import type { BuildAngularLibraryExecutorOptions } from './schema';
 /**

package/src/executors/package/package.impl.js

@@ -7,26 +7,16 @@ const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const typescript_1 = require("../utilities/typescript");
-const entry_point_di_1 = require("./ng-packagr-adjustments/ng-package/entry-point/entry-point.di");
-const options_di_1 = require("./ng-packagr-adjustments/ng-package/options.di");
-const package_di_1 = require("./ng-packagr-adjustments/ng-package/package.di");
+const ng_packagr_1 = require("./ng-packagr-adjustments/ng-packagr");
 async function initializeNgPackagr(options, context, projectDependencies) {
-    const packager = new (await Promise.resolve().then(() => require('ng-packagr'))).NgPackagr([
-        ...package_di_1.NX_PACKAGE_PROVIDERS,
-        ...entry_point_di_1.NX_ENTRY_POINT_PROVIDERS,
-        (0, options_di_1.nxProvideOptions)({
-            tailwindConfig: options.tailwindConfig,
-            watch: options.watch,
-        }),
-    ]);
-    packager.forProject((0, path_1.resolve)(context.root, options.project));
-    packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
+    const ngPackagr = await (0, ng_packagr_1.getNgPackagrInstance)(options);
+    ngPackagr.forProject((0, path_1.resolve)(context.root, options.project));
     if (options.tsConfig) {
         const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
         const tsConfig = await (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
-        packager.withTsConfig(tsConfig);
+        ngPackagr.withTsConfig(tsConfig);
     }
-    return packager;
+    return ngPackagr;
 }
 /**
  * Creates an executor function that executes the library build of an Angular

package/src/executors/package/schema.json

@@ -35,9 +35,9 @@
     },
     "tailwindConfig": {
       "type": "string",
-      "description": "The full path for the Tailwind configuration file, relative to the workspace root. If not provided and a `tailwind.config.js` file exists in the project or workspace root, it will be used. Otherwise, Tailwind will not be configured.",
+      "description": "The full path for the Tailwind configuration file, relative to the workspace root. If not provided and a `tailwind.config.js` file exists in the project or workspace root, it will be used. Otherwise, Tailwind will not be configured. _Note: starting with Angular v17, this option is no longer used and the configuration will be picked up if exists at the project or workspace root_.",
       "x-completion-type": "file",
-      "x-completion-glob": "tailwind.config.js"
+      "x-completion-glob": "tailwind.config@(.js|.cjs|.mjs|.ts)"
     }
   },
   "additionalProperties": false,

package/src/executors/utilities/esbuild-extensions.d.ts

@@ -1,6 +1,8 @@
 import type { Plugin } from 'esbuild';
+import type { Connect } from 'vite';
 export type PluginSpec = {
     path: string;
     options: any;
 };
 export declare function loadPlugins(plugins: string[] | PluginSpec[] | undefined, tsConfig: string): Promise<Plugin[]>;
+export declare function loadMiddleware(middlewareFns: string[] | undefined, tsConfig: string): Promise<Connect.NextHandleFunction[]>;

package/src/executors/utilities/esbuild-extensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPlugins = void 0;
+exports.loadMiddleware = exports.loadPlugins = void 0;
 const internal_1 = require("@nx/js/src/internal");
 const module_loader_1 = require("./module-loader");
 async function loadPlugins(plugins, tsConfig) {
@@ -25,3 +25,16 @@ async function loadPlugin(pluginSpec) {
     }
     return plugin;
 }
+async function loadMiddleware(middlewareFns, tsConfig) {
+    if (!middlewareFns?.length) {
+        return [];
+    }
+    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
+    try {
+        return await Promise.all(middlewareFns.map((fnPath) => (0, module_loader_1.loadModule)(fnPath)));
+    }
+    finally {
+        cleanupTranspiler();
+    }
+}
+exports.loadMiddleware = loadMiddleware;

package/src/executors/utilities/ng-packagr/stylesheet-processor.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Adapted from the original ng-packagr source.
+ *
+ * Changes made:
+ * - Use our own function to get the TailwindCSS config path to support a
+ * config at the root of the workspace.
+ */
+export declare enum CssUrl {
+    inline = "inline",
+    none = "none"
+}
+export declare class StylesheetProcessor {
+    private readonly projectBasePath;
+    private readonly basePath;
+    private readonly cssUrl?;
+    private readonly includePaths?;
+    private readonly cacheDirectory?;
+    private renderWorker;
+    constructor(projectBasePath: string, basePath: string, cssUrl?: CssUrl, includePaths?: string[], cacheDirectory?: string | false);
+    process({ filePath, content, }: {
+        filePath: string;
+        content: string;
+    }): Promise<string>;
+    /** Destory workers in pool. */
+    destroy(): void;
+    private createRenderWorker;
+}

package/src/executors/utilities/ng-packagr/stylesheet-processor.di.d.ts

@@ -0,0 +1,2 @@
+import { FactoryProvider } from 'injection-js';
+export declare const STYLESHEET_PROCESSOR: FactoryProvider;

package/src/executors/utilities/ng-packagr/stylesheet-processor.di.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STYLESHEET_PROCESSOR = void 0;
+const stylesheet_processor_di_1 = require("ng-packagr/lib/styles/stylesheet-processor.di");
+const stylesheet_processor_1 = require("./stylesheet-processor");
+exports.STYLESHEET_PROCESSOR = {
+    provide: stylesheet_processor_di_1.STYLESHEET_PROCESSOR_TOKEN,
+    useFactory: () => stylesheet_processor_1.StylesheetProcessor,
+    deps: [],
+};

package/src/executors/utilities/ng-packagr/stylesheet-processor.js

@@ -0,0 +1,121 @@
+"use strict";
+/**
+ * Adapted from the original ng-packagr source.
+ *
+ * Changes made:
+ * - Use our own function to get the TailwindCSS config path to support a
+ * config at the root of the workspace.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StylesheetProcessor = exports.CssUrl = void 0;
+const browserslist = require("browserslist");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const Piscina = require('piscina');
+const color_1 = require("ng-packagr/lib/utils/color");
+// using this instead of the one from ng-packagr
+const tailwindcss_1 = require("./tailwindcss");
+const devkit_1 = require("@nx/devkit");
+const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
+const maxThreads = typeof maxWorkersVariable === 'string' && maxWorkersVariable !== ''
+    ? +maxWorkersVariable
+    : 4;
+var CssUrl;
+(function (CssUrl) {
+    CssUrl["inline"] = "inline";
+    CssUrl["none"] = "none";
+})(CssUrl || (exports.CssUrl = CssUrl = {}));
+class StylesheetProcessor {
+    constructor(projectBasePath, basePath, cssUrl, includePaths, cacheDirectory) {
+        this.projectBasePath = projectBasePath;
+        this.basePath = basePath;
+        this.cssUrl = cssUrl;
+        this.includePaths = includePaths;
+        this.cacheDirectory = cacheDirectory;
+        // By default, browserslist defaults are too inclusive
+        // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
+        // We change the default query to browsers that Angular support.
+        // https://angular.io/guide/browser-support
+        browserslist.defaults = [
+            'last 2 Chrome versions',
+            'last 1 Firefox version',
+            'last 2 Edge major versions',
+            'last 2 Safari major versions',
+            'last 2 iOS major versions',
+            'Firefox ESR',
+        ];
+    }
+    async process({ filePath, content, }) {
+        this.createRenderWorker();
+        return this.renderWorker.run({ content, filePath });
+    }
+    /** Destory workers in pool. */
+    destroy() {
+        void this.renderWorker?.destroy();
+    }
+    createRenderWorker() {
+        if (this.renderWorker) {
+            return;
+        }
+        const styleIncludePaths = [...this.includePaths];
+        let prevDir = null;
+        let currentDir = this.basePath;
+        while (currentDir !== prevDir) {
+            const p = (0, path_1.join)(currentDir, 'node_modules');
+            if ((0, fs_1.existsSync)(p)) {
+                styleIncludePaths.push(p);
+            }
+            prevDir = currentDir;
+            currentDir = (0, path_1.dirname)(prevDir);
+        }
+        const browserslistData = browserslist(undefined, { path: this.basePath });
+        this.renderWorker = new Piscina({
+            filename: require.resolve('ng-packagr/lib/styles/stylesheet-processor-worker'),
+            maxThreads,
+            env: {
+                ...process.env,
+                FORCE_COLOR: '' + color_1.colors.enabled,
+            },
+            workerData: {
+                tailwindConfigPath: (0, tailwindcss_1.getTailwindConfigPath)(this.projectBasePath, devkit_1.workspaceRoot),
+                projectBasePath: this.projectBasePath,
+                browserslistData,
+                targets: transformSupportedBrowsersToTargets(browserslistData),
+                cacheDirectory: this.cacheDirectory,
+                cssUrl: this.cssUrl,
+                styleIncludePaths,
+            },
+        });
+    }
+}
+exports.StylesheetProcessor = StylesheetProcessor;
+function transformSupportedBrowsersToTargets(supportedBrowsers) {
+    const transformed = [];
+    // https://esbuild.github.io/api/#target
+    const esBuildSupportedBrowsers = new Set([
+        'safari',
+        'firefox',
+        'edge',
+        'chrome',
+        'ios',
+    ]);
+    for (const browser of supportedBrowsers) {
+        let [browserName, version] = browser.split(' ');
+        // browserslist uses the name `ios_saf` for iOS Safari whereas esbuild uses `ios`
+        if (browserName === 'ios_saf') {
+            browserName = 'ios';
+        }
+        // browserslist uses ranges `15.2-15.3` versions but only the lowest is required
+        // to perform minimum supported feature checks. esbuild also expects a single version.
+        [version] = version.split('-');
+        if (esBuildSupportedBrowsers.has(browserName)) {
+            if (browserName === 'safari' && version === 'tp') {
+                // esbuild only supports numeric versions so `TP` is converted to a high number (999) since
+                // a Technology Preview (TP) of Safari is assumed to support all currently known features.
+                version = '999';
+            }
+            transformed.push(browserName + version);
+        }
+    }
+    return transformed.length ? transformed : undefined;
+}

package/src/executors/utilities/{tailwindcss.d.ts → ng-packagr/tailwindcss.d.ts}

@@ -4,4 +4,5 @@ export interface TailwindSetup {
 }
 export declare const tailwindDirectives: string[];
 export declare function getTailwindSetup(basePath: string, tailwindConfig?: string): TailwindSetup | undefined;
+export declare function getTailwindConfigPath(projectRoot: string, workspaceRoot: string): string | undefined;
 export declare function getTailwindPostCssPlugins({ tailwindConfigPath, tailwindPackagePath }: TailwindSetup, includePaths?: string[], watch?: boolean): any[];

package/src/executors/utilities/{tailwindcss.js → ng-packagr/tailwindcss.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTailwindPostCssPlugins = exports.getTailwindSetup = exports.tailwindDirectives = void 0;
+exports.getTailwindPostCssPlugins = exports.getTailwindConfigPath = exports.getTailwindSetup = exports.tailwindDirectives = void 0;
 const devkit_1 = require("@nx/devkit");
 const devkit_2 = require("@nx/devkit");
 const fs_1 = require("fs");
@@ -58,6 +58,7 @@ function getTailwindConfigPath(projectRoot, workspaceRoot) {
     }
     return undefined;
 }
+exports.getTailwindConfigPath = getTailwindConfigPath;
 function getTailwindPostCssPlugins({ tailwindConfigPath, tailwindPackagePath }, includePaths, watch) {
     if (process.env['TAILWIND_MODE'] === undefined) {
         process.env['TAILWIND_MODE'] = watch ? 'watch' : 'build';

package/src/generators/add-linting/lib/create-eslint-configuration.d.ts

@@ -29,7 +29,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
             [name: string]: boolean;
         };
         globals?: {
-            [name: string]: boolean | "off" | "readonly" | "readable" | "writable" | "writeable";
+            [name: string]: boolean | "readable" | "off" | "readonly" | "writable" | "writeable";
         };
         noInlineConfig?: boolean;
         overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
@@ -61,7 +61,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
     };
     extends?: string | string[];
     globals?: {
-        [name: string]: boolean | "off" | "readonly" | "readable" | "writable" | "writeable";
+        [name: string]: boolean | "readable" | "off" | "readonly" | "writable" | "writeable";
     };
     noInlineConfig?: boolean;
     parser?: string;

package/src/generators/application/lib/create-project.d.ts

@@ -1,3 +1,3 @@
-import type { Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import type { NormalizedSchema } from './normalized-schema';
 export declare function createProject(tree: Tree, options: NormalizedSchema): void;

package/src/generators/application/lib/create-project.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProject = void 0;
 const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../../utils/version-utils");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 function createProject(tree, options) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const buildExecutor = options.bundler === 'webpack'
@@ -14,6 +15,7 @@ function createProject(tree, options) {
     const buildMainOptionName = angularMajorVersion >= 17 && options.bundler === 'esbuild'
         ? 'browser'
         : 'main';
+    (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, buildExecutor);
     let budgets = undefined;
     if (options.bundler === 'webpack' || angularMajorVersion >= 17) {
         if (options.strict) {

package/src/generators/init/init.js

@@ -25,7 +25,7 @@ function installAngularDevkitCoreIfMissing(tree, options) {
             // @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
         }
         if (!options.skipPackageJson) {
-            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { ['@angular-devkit/core']: devkitVersion });
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { ['@angular-devkit/core']: devkitVersion }, undefined, options.keepExistingVersions);
         }
     }
     return () => { };

package/src/generators/init/schema.d.ts

@@ -2,4 +2,5 @@ export interface Schema {
   skipFormat?: boolean;
   skipInstall?: boolean;
   skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
 }

package/src/generators/init/schema.json

@@ -23,7 +23,12 @@
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
     }
-  },
-  "additionalProperties": false
+  }
 }

package/src/generators/setup-ssr/files/server/application-builder/__serverFileName__

@@ -52,3 +52,5 @@ function run(): void {
     console.log(`Node Express server listening on http://localhost:${port}`);
   });
 }
+
+run();

package/src/generators/stories/stories.js

@@ -8,7 +8,7 @@ const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const get_e2e_project_1 = require("./lib/get-e2e-project");
 const module_info_1 = require("../utils/storybook-ast/module-info");
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const versions_1 = require("../../utils/versions");
 async function angularStoriesGenerator(tree, options) {
     const e2eProjectName = options.cypressProject ?? `${options.name}-e2e`;
@@ -23,7 +23,7 @@ async function angularStoriesGenerator(tree, options) {
         devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
     }
     const componentInfos = componentsInfo.filter((f) => !options.ignorePaths?.some((pattern) => {
-        const shouldIgnorePath = minimatch((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
+        const shouldIgnorePath = (0, minimatch_1.minimatch)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
         return shouldIgnorePath;
     }));
     for (const info of componentInfos) {