@nx/angular 19.6.0-canary.20240813-c72ba9b → 19.6.0-canary.20240815-5410794

package/src/migrations/update-19-6-0/turn-off-dts-by-default.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const minimatch_1 = require("minimatch");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+async function default_1(tree) {
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (path) => {
+        const webpackConfigGlob = '**/webpack*.config*.{js,ts,mjs,cjs}';
+        const result = (0, minimatch_1.minimatch)(path, webpackConfigGlob);
+        if (!result) {
+            return;
+        }
+        let webpackConfigContents = tree.read(path, 'utf-8');
+        if (!/withModuleFederationSSR|withModuleFederation/.test(webpackConfigContents)) {
+            return;
+        }
+        const WITH_MODULE_FEDERATION_SELECTOR = 'CallExpression:has(Identifier[name=withModuleFederation]),CallExpression:has(Identifier[name=withModuleFederationForSSR])';
+        const EXISTING_MF_OVERRIDES_SELECTOR = 'ObjectLiteralExpression';
+        const ast = tsquery_1.tsquery.ast(webpackConfigContents);
+        const withModuleFederationNodes = (0, tsquery_1.tsquery)(ast, WITH_MODULE_FEDERATION_SELECTOR, { visitAllChildren: true });
+        if (!withModuleFederationNodes.length) {
+            return;
+        }
+        const withModuleFederationNode = withModuleFederationNodes[0];
+        const existingOverridesNodes = (0, tsquery_1.tsquery)(withModuleFederationNode, EXISTING_MF_OVERRIDES_SELECTOR, { visitAllChildren: true });
+        if (!existingOverridesNodes.length) {
+            // doesn't exist, add it
+            webpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationNode.getEnd() - 1)},${JSON.stringify({ dts: false })}${webpackConfigContents.slice(withModuleFederationNode.getEnd() - 1)}`;
+        }
+        else {
+            let existingOverrideNode;
+            for (const node of existingOverridesNodes) {
+                if (!existingOverrideNode) {
+                    existingOverrideNode = node;
+                }
+                if (existingOverrideNode.getText().includes(node.getText())) {
+                    continue;
+                }
+                existingOverrideNode = node;
+            }
+            const DTS_PROPERTY_SELECTOR = 'PropertyAssignment > Identifier[name=dts]';
+            const dtsPropertyNode = (0, tsquery_1.tsquery)(existingOverrideNode, DTS_PROPERTY_SELECTOR);
+            if (dtsPropertyNode.length) {
+                // dts already exists, do nothing
+                return;
+            }
+            const newOverrides = `{ dts: false, ${existingOverrideNode
+                .getText()
+                .slice(1)}`;
+            webpackConfigContents = `${webpackConfigContents.slice(0, existingOverrideNode.getStart())}${newOverrides}${webpackConfigContents.slice(existingOverrideNode.getEnd())}`;
+        }
+        tree.write(path, webpackConfigContents);
+    });
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/migrations/update-19-6-0/update-angular-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~18.2.0";
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-19-6-0/update-angular-cli.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~18.2.0';
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}

package/src/runtime/nx/data-persistence.d.ts

@@ -24,7 +24,6 @@ export type ActionOrActionWithState<T, A> = ActionOrActionWithStates<[T], A>;
 export type ActionStatesStream<T extends Array<unknown>, A> = Observable<ActionOrActionWithStates<T, A>>;
 export type ActionStateStream<T, A> = Observable<ActionOrActionWithStates<[T], A>>;
 /**
- *
  * @whatItDoes Handles pessimistic updates (updating the server first).
  *
  * Updating the server, when implemented naively, suffers from race conditions and poor error handling.
@@ -79,10 +78,11 @@ export type ActionStateStream<T, A> = Observable<ActionOrActionWithStates<[T], A
  * ```
  *
  * @param opts
+ *
+ * @deprecated This will be removed in Nx v21. Import `pessimisticUpdate` from `@ngrx/router-store/data-persistence` instead.
  */
 export declare function pessimisticUpdate<T extends Array<unknown>, A extends Action>(opts: PessimisticUpdateOpts<T, A>): (source: ActionStatesStream<T, A>) => Observable<Action>;
 /**
- *
  * @whatItDoes Handles optimistic updates (updating the client first).
  *
  * It runs all fetches in order, which removes race conditions and forces the developer to handle errors.
@@ -138,10 +138,11 @@ export declare function pessimisticUpdate<T extends Array<unknown>, A extends Ac
  * ```
  *
  * @param opts
+ *
+ * @deprecated This will be removed in Nx v21. Import `optimisticUpdate` from `@ngrx/router-store/data-persistence` instead.
  */
 export declare function optimisticUpdate<T extends Array<unknown>, A extends Action>(opts: OptimisticUpdateOpts<T, A>): (source: ActionStatesStream<T, A>) => Observable<Action>;
 /**
- *
  * @whatItDoes Handles data fetching.
  *
  * Data fetching implemented naively suffers from race conditions and poor error handling.
@@ -217,6 +218,8 @@ export declare function optimisticUpdate<T extends Array<unknown>, A extends Act
  * In addition, if there are multiple requests for Todo 1 scheduled, it will only run the last one.
  *
  * @param opts
+ *
+ * @deprecated This will be removed in Nx v21. Import `fetch` from `@ngrx/router-store/data-persistence` instead.
  */
 export declare function fetch<T extends Array<unknown>, A extends Action>(opts: FetchOpts<T, A>): (source: ActionStatesStream<T, A>) => Observable<Action>;
 /**
@@ -267,5 +270,7 @@ export declare function fetch<T extends Array<unknown>, A extends Action>(opts:
  *
  * @param component
  * @param opts
+ *
+ * @deprecated This will be removed in Nx v21. Import `navigation` from `@ngrx/router-store/data-persistence` instead.
  */
 export declare function navigation<T extends Array<unknown>, A extends Action>(component: Type<any>, opts: HandleNavigationOpts<T>): (source: ActionStatesStream<T, A>) => Observable<Action<string>>;

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~18.1.0";
-export declare const angularDevkitVersion = "~18.1.0";
-export declare const ngPackagrVersion = "~18.1.0";
+export declare const angularVersion = "~18.2.0";
+export declare const angularDevkitVersion = "~18.2.0";
+export declare const ngPackagrVersion = "~18.2.0";
 export declare const ngrxVersion = "^18.0.1";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.14.3";

package/src/utils/versions.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = 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 = '~18.1.0';
-exports.angularDevkitVersion = '~18.1.0';
-exports.ngPackagrVersion = '~18.1.0';
+exports.angularVersion = '~18.2.0';
+exports.angularDevkitVersion = '~18.2.0';
+exports.ngPackagrVersion = '~18.2.0';
 exports.ngrxVersion = '^18.0.1';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.14.3';

package/testing/src/testing-utils.d.ts

@@ -1,6 +1,7 @@
 import type { Observable } from 'rxjs';
 /**
- * @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$.pipe(toArray())) or lastValueFrom(obs$.pipe(toArray())).
+ * @deprecated This will be removed in Nx v21. If using RxJS 7, use `firstValueFrom(obs$.pipe(toArray()))`
+ * or `lastValueFrom(obs$.pipe(toArray()))`. If using RxJS 6, use `obs$.pipe(toArray()).toPromise()`.
  *
  * @whatItDoes reads all the values from an observable and returns a promise
  * with an array of all values. This should be used in combination with async/await.
@@ -15,7 +16,8 @@ import type { Observable } from 'rxjs';
  */
 export declare function readAll<T>(o: Observable<T>): Promise<T[]>;
 /**
- * @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$)
+ * @deprecated This will be removed in Nx v21. Since RxJS 7, use `firstValueFrom(obs$)`. If using RxJS 6,
+ * use `obs$.pipe(first()).toPromise()`.
  *
  * @whatItDoes reads the first value from an observable and returns a promise
  * with it. This should be used in combination with async/await.

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.d.ts

@@ -1,4 +0,0 @@
-import type { Schema } from './schema';
-export declare function executeModuleFederationDevSSRBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): import("rxjs").Observable<unknown>;
-declare const _default: any;
-export default _default;

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js

@@ -1,103 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeModuleFederationDevSSRBuilder = executeModuleFederationDevSSRBuilder;
-const devkit_1 = require("@nx/devkit");
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
-const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
-const path_1 = require("path");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
-const module_federation_1 = require("../utilities/module-federation");
-function executeModuleFederationDevSSRBuilder(schema, context) {
-    const { ...options } = schema;
-    const projectGraph = (0, devkit_1.readCachedProjectGraph)();
-    const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
-    const project = workspaceProjects[context.target.project];
-    let pathToManifestFile;
-    if (options.pathToManifestFile) {
-        const userPathToManifestFile = (0, path_1.join)(context.workspaceRoot, options.pathToManifestFile);
-        if (!(0, fs_1.existsSync)(userPathToManifestFile)) {
-            throw new Error(`The provided Module Federation manifest file path does not exist. Please check the file exists at "${userPathToManifestFile}".`);
-        }
-        else if ((0, path_1.extname)(options.pathToManifestFile) !== '.json') {
-            throw new Error(`The Module Federation manifest file must be a JSON. Please ensure the file at ${userPathToManifestFile} is a JSON.`);
-        }
-        pathToManifestFile = userPathToManifestFile;
-    }
-    else {
-        pathToManifestFile = (0, module_federation_1.getDynamicMfManifestFile)(project, context.workspaceRoot);
-    }
-    const devServeRemotes = !options.devRemotes
-        ? []
-        : Array.isArray(options.devRemotes)
-            ? options.devRemotes
-            : [options.devRemotes];
-    // Set NX_MF_DEV_REMOTES for the Nx Runtime Library Control Plugin
-    process.env.NX_MF_DEV_REMOTES = JSON.stringify(devServeRemotes);
-    (0, module_federation_1.validateDevRemotes)({ devRemotes: devServeRemotes }, workspaceProjects);
-    const remotesToSkip = new Set(options.skipRemotes ?? []);
-    const staticRemotes = (0, module_federation_1.getStaticRemotes)(project, context, workspaceProjects, remotesToSkip);
-    const dynamicRemotes = (0, module_federation_1.getDynamicRemotes)(project, context, workspaceProjects, remotesToSkip, pathToManifestFile);
-    const remotes = [...staticRemotes, ...dynamicRemotes];
-    const remoteProcessPromises = [];
-    for (const remote of remotes) {
-        const isDev = devServeRemotes.includes(remote);
-        const target = isDev ? 'serve-ssr' : 'static-server';
-        if (!workspaceProjects[remote].targets?.[target]) {
-            throw new Error(`Could not find "${target}" target in "${remote}" project.`);
-        }
-        else if (!workspaceProjects[remote].targets?.[target].executor) {
-            throw new Error(`Could not find executor for "${target}" target in "${remote}" project.`);
-        }
-        const runOptions = {};
-        if (options.verbose) {
-            const [collection, executor] = workspaceProjects[remote].targets[target].executor.split(':');
-            const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, devkit_1.workspaceRoot, workspaceProjects);
-            if (schema.additionalProperties || 'verbose' in schema.properties) {
-                runOptions.verbose = options.verbose;
-            }
-        }
-        const remotePromise = new Promise((res, rej) => {
-            if (target === 'static-server') {
-                const remoteProject = workspaceProjects[remote];
-                const remoteServerOutput = (0, path_1.join)(devkit_1.workspaceRoot, remoteProject.targets.server.options.outputPath, 'main.js');
-                const pm = (0, devkit_1.getPackageManagerCommand)();
-                (0, child_process_1.execSync)(`${pm.exec} nx run ${remote}:server${context.target.configuration
-                    ? `:${context.target.configuration}`
-                    : ''}`, { stdio: 'inherit' });
-                const child = (0, child_process_1.fork)(remoteServerOutput, {
-                    env: { PORT: remoteProject.targets['serve-ssr'].options.port },
-                });
-                child.on('message', (msg) => {
-                    if (msg === 'nx.server.ready') {
-                        res();
-                    }
-                });
-            }
-            if (target === 'serve-ssr') {
-                (0, ngcli_adapter_1.scheduleTarget)(context.workspaceRoot, {
-                    project: remote,
-                    target,
-                    configuration: context.target.configuration,
-                    runOptions,
-                    projects: workspaceProjects,
-                }, options.verbose).then((obs) => obs
-                    .pipe((0, operators_1.tap)((result) => {
-                    result.success && res();
-                }))
-                    .toPromise());
-            }
-        });
-        remoteProcessPromises.push(remotePromise);
-    }
-    const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-    const { executeSSRDevServerBuilder } = angularMajorVersion >= 17
-        ? require('@angular-devkit/build-angular')
-        : require('@nguniversal/builders');
-    return (0, rxjs_1.from)(Promise.all(remoteProcessPromises)).pipe((0, operators_1.switchMap)(() => executeSSRDevServerBuilder(options, context)));
-}
-exports.default = require('@angular-devkit/architect').createBuilder(executeModuleFederationDevSSRBuilder);