@nx/angular 19.6.0-canary.20240809-d3747e0 → 19.6.0-canary.20240814-6d83ae2

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

@@ -8,6 +8,7 @@ const test_runners_1 = require("../../../utils/test-runners");
 const selector_1 = require("../../utils/selector");
 const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
 const version_utils_1 = require("../../utils/version-utils");
+const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 async function createFiles(tree, options, rootOffset) {
     const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const isUsingApplicationBuilder = angularMajorVersion >= 17 && options.bundler === 'esbuild';
@@ -16,6 +17,9 @@ async function createFiles(tree, options, rootOffset) {
     (0, selector_1.validateHtmlSelector)(rootSelector);
     const nxWelcomeSelector = `${options.prefix}-nx-welcome`;
     (0, selector_1.validateHtmlSelector)(nxWelcomeSelector);
+    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(tree, options.nxCloudToken);
+    const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
+        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     const substitutions = {
         rootSelector,
         appName: options.name,
@@ -34,8 +38,13 @@ async function createFiles(tree, options, rootOffset) {
         disableModernClassFieldsBehavior,
         useEventCoalescing: angularMajorVersion >= 18,
         useRouterTestingModule: angularMajorVersion < 18,
+        connectCloudUrl,
+        tutorialUrl: options.standalone
+            ? 'https://nx.dev/getting-started/tutorials/angular-standalone-tutorial?utm_source=nx-project'
+            : 'https://nx.dev/getting-started/tutorials/angular-monorepo-tutorial?utm_source=nx-project',
         tpl: '',
     };
+    const angularAppType = options.standalone ? 'standalone' : 'ng-module';
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base'), options.appProjectRoot, substitutions);
     if (angularMajorVersion >= 18) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base-18+'), options.appProjectRoot, substitutions);
@@ -49,6 +58,7 @@ async function createFiles(tree, options, rootOffset) {
     else {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/ng-module'), options.appProjectRoot, substitutions);
     }
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/nx-welcome', onBoardingStatus, angularAppType), options.appProjectRoot, substitutions);
     (0, update_project_root_tsconfig_1.updateProjectRootTsConfig)(tree, options.appProjectRoot, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot), options.rootProject);
     if (!options.routing) {
         tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, '/src/app/app.routes.ts'));

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

@@ -31,4 +31,5 @@ export interface Schema {
   minimal?: boolean;
   bundler?: 'webpack' | 'esbuild';
   ssr?: boolean;
+  nxCloudToken?: string;
 }

package/src/generators/ng-add/migrators/projects/e2e.migrator.js

@@ -254,7 +254,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         this.tree.delete(newTsConfigPath);
         this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldSourceRoot, 'tsconfig.json'), newTsConfigPath);
         // replace the generated source with the project source
-        (0, devkit_1.visitNotIgnoredFiles)(this.tree, this.project.newSourceRoot, (filePath) => {
+        this.visitFiles(this.project.newSourceRoot, (filePath) => {
             this.tree.delete(filePath);
         });
         this.moveDir(this.project.oldSourceRoot, (0, devkit_1.joinPathFragments)(this.project.newSourceRoot));

package/src/generators/ng-add/migrators/projects/project.migrator.d.ts

@@ -18,6 +18,8 @@ export declare class ProjectMigrator<TargetType extends string = string> extends
     protected convertPath(originalPath: string): string;
     protected moveDir(from: string, to: string): void;
     protected shouldSkipTargetTypeMigration(targetType: TargetType): boolean;
+    protected visitFiles(dirPath: string, visitor: (path: string) => void): void;
+    private updateGitAndPrettierIgnore;
     private collectTargetNames;
     private createBuilderMigrators;
     private skipProjectMigration;

package/src/generators/ng-add/migrators/projects/project.migrator.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectMigrator = void 0;
 const devkit_1 = require("@nx/devkit");
+const node_path_1 = require("node:path");
 const utilities_1 = require("../../utilities");
 const migrator_1 = require("../migrator");
 class ProjectMigrator extends migrator_1.Migrator {
@@ -42,6 +43,7 @@ class ProjectMigrator extends migrator_1.Migrator {
     migrate() {
         const validationResult = this.validate();
         if (!validationResult) {
+            this.updateGitAndPrettierIgnore();
             return;
         }
         this.logger.warn((0, utilities_1.getProjectValidationResultMessage)(validationResult));
@@ -138,7 +140,7 @@ class ProjectMigrator extends migrator_1.Migrator {
         return originalPath;
     }
     moveDir(from, to) {
-        (0, devkit_1.visitNotIgnoredFiles)(this.tree, from, (file) => {
+        this.visitFiles(from, (file) => {
             this.moveFile(file, (0, devkit_1.normalizePath)(file).replace(from, to), true);
         });
     }
@@ -146,6 +148,41 @@ class ProjectMigrator extends migrator_1.Migrator {
         return (Array.isArray(this.skipMigration) &&
             this.skipMigration.includes(targetType));
     }
+    visitFiles(dirPath, visitor) {
+        dirPath = (0, devkit_1.normalizePath)((0, node_path_1.relative)(this.tree.root, (0, devkit_1.joinPathFragments)(this.tree.root, dirPath)));
+        for (const child of this.tree.children(dirPath)) {
+            const fullPath = (0, devkit_1.joinPathFragments)(dirPath, child);
+            if (this.tree.isFile(fullPath)) {
+                visitor(fullPath);
+            }
+            else {
+                this.visitFiles(fullPath, visitor);
+            }
+        }
+    }
+    updateGitAndPrettierIgnore() {
+        if (!this.tree.exists('.prettierignore') &&
+            !this.tree.exists('.gitignore')) {
+            return;
+        }
+        let from = this.project.oldRoot;
+        let to = this.project.newRoot;
+        if (this.project.oldRoot === '') {
+            from = this.project.oldSourceRoot;
+            to = this.project.newSourceRoot;
+        }
+        const regex = new RegExp(`(^!?\\/?)(${from})(\\/|$)`, 'gm');
+        if (this.tree.exists('.gitignore')) {
+            const gitignore = this.tree.read('.gitignore', 'utf-8');
+            const content = gitignore.replace(regex, `$1${to}$3`);
+            this.tree.write('.gitignore', content);
+        }
+        if (this.tree.exists('.prettierignore')) {
+            const prettierIgnore = this.tree.read('.prettierignore', 'utf-8');
+            const content = prettierIgnore.replace(regex, `$1${to}$3`);
+            this.tree.write('.prettierignore', content);
+        }
+    }
     collectTargetNames() {
         const targetTypes = Object.keys(this.targets);
         Object.entries(this.projectConfig.targets ?? {}).forEach(([targetName, target]) => {

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/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.