@nx/angular 0.0.0-pr-30715-a5f5e3b → 0.0.0-pr-31313-387cdca

package/src/generators/utils/storybook-ast/component-info.js

@@ -14,15 +14,15 @@ function getComponentsInfo(tree, entryPoint, moduleFilePaths, projectName) {
     return moduleFilePaths
         .flatMap((moduleFilePath) => {
         const file = (0, ast_utils_1.getTsSourceFile)(tree, moduleFilePath);
-        const moduleDeclarations = (0, module_info_1.getModuleDeclarations)(file, moduleFilePath, projectName);
-        if (moduleDeclarations.length === 0) {
+        const declaredComponents = (0, module_info_1.getModuleDeclaredComponents)(file, moduleFilePath, projectName);
+        if (declaredComponents.length === 0) {
             return undefined;
         }
         if (!tsModule) {
             tsModule = (0, ensure_typescript_1.ensureTypescript)();
         }
         const imports = file.statements.filter((statement) => statement.kind === tsModule.SyntaxKind.ImportDeclaration);
-        const componentsInfo = moduleDeclarations.map((maybeComponentName) => tryGetComponentInfo(tree, entryPoint, file, imports, moduleFilePath, maybeComponentName));
+        const componentsInfo = declaredComponents.map((componentName) => getComponentInfo(tree, entryPoint, file, imports, moduleFilePath, componentName));
         return componentsInfo;
     })
         .filter((f) => f !== undefined);
@@ -100,7 +100,7 @@ function getComponentImportPath(componentName, imports) {
         .slice(1, -1);
     return importPath;
 }
-function tryGetComponentInfo(tree, entryPoint, sourceFile, imports, moduleFilePath, symbolName) {
+function getComponentInfo(tree, entryPoint, sourceFile, imports, moduleFilePath, componentName) {
     try {
         if (!tsquery) {
             (0, ensure_typescript_1.ensureTypescript)();
@@ -108,53 +108,38 @@ function tryGetComponentInfo(tree, entryPoint, sourceFile, imports, moduleFilePa
         }
         const moduleFolderPath = (0, path_1.dirname)(moduleFilePath);
         // try to get the component from the same file (inline scam)
-        const node = tsquery(sourceFile, `ClassDeclaration:has(Decorator > CallExpression > Identifier[name=Component]):has(Identifier[name=${symbolName}])`, { visitAllChildren: true })[0];
+        const node = tsquery(sourceFile, `ClassDeclaration:has(Decorator > CallExpression > Identifier[name=Component]):has(Identifier[name=${componentName}])`, { visitAllChildren: true })[0];
         if (node) {
             return {
                 componentFileName: (0, path_1.basename)(moduleFilePath, '.ts'),
                 moduleFolderPath,
-                name: symbolName,
+                name: componentName,
                 path: '.',
                 entryPointName: entryPoint.name,
             };
         }
         // try to get the component from the imports
-        const symbolFilePathRelativeToModule = getComponentImportPath(symbolName, imports);
-        let symbolImportPath = getFullComponentFilePath(moduleFolderPath, symbolFilePathRelativeToModule);
-        if (tree.exists(symbolImportPath) && !tree.isFile(symbolImportPath)) {
-            return tryGetComponentInfoFromDir(tree, entryPoint, symbolImportPath, symbolName, moduleFolderPath);
+        const componentFilePathRelativeToModule = getComponentImportPath(componentName, imports);
+        const componentImportPath = getFullComponentFilePath(moduleFolderPath, componentFilePathRelativeToModule);
+        if (tree.exists(componentImportPath) && !tree.isFile(componentImportPath)) {
+            return getComponentInfoFromDir(tree, entryPoint, componentImportPath, componentName, moduleFolderPath);
         }
-        const candidatePaths = [
-            symbolImportPath,
-            `${symbolImportPath}.ts`,
-            `${symbolImportPath}.js`,
-        ];
-        for (const candidatePath of candidatePaths) {
-            if (!tree.exists(candidatePath)) {
-                continue;
-            }
-            const content = tree.read(candidatePath, 'utf-8');
-            const classAndComponentRegex = new RegExp(`@Component[\\s\\S\n]*?\\bclass ${symbolName}\\b`, 'g');
-            if (content.match(classAndComponentRegex)) {
-                const path = (0, path_1.dirname)(symbolFilePathRelativeToModule);
-                const componentFileName = (0, path_1.basename)(symbolFilePathRelativeToModule);
-                return {
-                    componentFileName,
-                    moduleFolderPath,
-                    name: symbolName,
-                    path,
-                    entryPointName: entryPoint.name,
-                };
-            }
-        }
-        return undefined;
+        const path = (0, path_1.dirname)(componentFilePathRelativeToModule);
+        const componentFileName = (0, path_1.basename)(componentFilePathRelativeToModule);
+        return {
+            componentFileName,
+            moduleFolderPath,
+            name: componentName,
+            path,
+            entryPointName: entryPoint.name,
+        };
     }
     catch (ex) {
-        devkit_1.logger.warn(`Could not generate a story for ${symbolName}. Error: ${ex}`);
+        devkit_1.logger.warn(`Could not generate a story for ${componentName}. Error: ${ex}`);
         return undefined;
     }
 }
-function tryGetComponentInfoFromDir(tree, entryPoint, dir, symbolName, moduleFolderPath) {
+function getComponentInfoFromDir(tree, entryPoint, dir, componentName, moduleFolderPath) {
     let path = null;
     let componentFileName = null;
     const componentImportPathChildren = [];
@@ -164,7 +149,7 @@ function tryGetComponentInfoFromDir(tree, entryPoint, dir, symbolName, moduleFol
     for (const candidateFile of componentImportPathChildren) {
         if (candidateFile.endsWith('.ts')) {
             const content = tree.read(candidateFile, 'utf-8');
-            const classAndComponentRegex = new RegExp(`@Component[\\s\\S\n]*?\\bclass ${symbolName}\\b`, 'g');
+            const classAndComponentRegex = new RegExp(`@Component[\\s\\S\n]*?\\bclass ${componentName}\\b`, 'g');
             if (content.match(classAndComponentRegex)) {
                 path = candidateFile
                     .slice(0, candidateFile.lastIndexOf('/'))
@@ -175,13 +160,12 @@ function tryGetComponentInfoFromDir(tree, entryPoint, dir, symbolName, moduleFol
         }
     }
     if (path === null) {
-        console.warn(`Couldn't resolve "${symbolName}" imported from ${dir} relative to ${moduleFolderPath}.`);
-        return undefined;
+        throw new Error(`Path to component ${componentName} couldn't be found. Please open an issue on https://github.com/nrwl/nx/issues.`);
     }
     return {
         componentFileName,
         moduleFolderPath,
-        name: symbolName,
+        name: componentName,
         path,
         entryPointName: entryPoint.name,
     };

package/src/generators/utils/storybook-ast/module-info.d.ts

@@ -1,5 +1,5 @@
 import type { Tree } from '@nx/devkit';
 import type { SourceFile } from 'typescript';
 import type { EntryPoint } from './entry-point';
-export declare function getModuleDeclarations(file: SourceFile, moduleFilePath: string, projectName: string): string[];
+export declare function getModuleDeclaredComponents(file: SourceFile, moduleFilePath: string, projectName: string): string[];
 export declare function getModuleFilePaths(tree: Tree, entryPoint: EntryPoint): string[];

package/src/generators/utils/storybook-ast/module-info.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getModuleDeclarations = getModuleDeclarations;
+exports.getModuleDeclaredComponents = getModuleDeclaredComponents;
 exports.getModuleFilePaths = getModuleFilePaths;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
@@ -8,7 +8,7 @@ const path_1 = require("path");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
-function getModuleDeclarations(file, moduleFilePath, projectName) {
+function getModuleDeclaredComponents(file, moduleFilePath, projectName) {
     const ngModuleDecorator = getNgModuleDecorator(file, moduleFilePath);
     const declarationsPropertyAssignment = getNgModuleDeclarationsPropertyAssignment(ngModuleDecorator, moduleFilePath, projectName);
     if (!declarationsPropertyAssignment) {
@@ -18,7 +18,7 @@ function getModuleDeclarations(file, moduleFilePath, projectName) {
     if (!declarationsArray) {
         return [];
     }
-    return getDeclaredComponentNodes(declarationsArray).map((node) => node.getText());
+    return getDeclaredComponentsInDeclarations(declarationsArray);
 }
 function getModuleFilePaths(tree, entryPoint) {
     let moduleFilePaths = [];
@@ -43,6 +43,11 @@ function hasNgModule(tree, filePath) {
     const ngModule = tsquery(ast, 'ClassDeclaration > Decorator > CallExpression > Identifier[name=NgModule]', { visitAllChildren: true });
     return ngModule.length > 0;
 }
+function getDeclaredComponentsInDeclarations(declarationsArray) {
+    return getDeclaredComponentNodes(declarationsArray)
+        .map((node) => node.getText())
+        .filter((name) => name.endsWith('Component'));
+}
 function getDeclaredComponentNodes(declarationsArray) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();

package/src/generators/utils/testing.js

@@ -52,24 +52,24 @@ async function createStorybookTestWorkspaceForLib(libName) {
         standalone: false,
         skipFormat: true,
     });
-    tree.write(`${libName}/src/lib/test-button/test-button.ts`, `import { Component, Input } from '@angular/core';
+    tree.write(`${libName}/src/lib/test-button/test-button.component.ts`, `import { Component, Input } from '@angular/core';
 
 export type ButtonStyle = 'default' | 'primary' | 'accent';
 
 @Component({
   selector: 'proj-test-button',
-  templateUrl: './test-button.html',
-  styleUrls: ['./test-button.css']
+  templateUrl: './test-button.component.html',
+  styleUrls: ['./test-button.component.css']
 })
-export class TestButton {
+export class TestButtonComponent {
   @Input('buttonType') type = 'button';
   @Input() style: ButtonStyle = 'default';
   @Input() age?: number;
   @Input() isOn = false;
 }`);
-    tree.write(`${libName}/src/lib/test-button/test-button.html`, `<button [attr.type]="type" [ngClass]="style"></button>`);
-    const modulePath = `${libName}/src/lib/${libName}-module.ts`;
-    tree.write(modulePath, `import * as ButtonExports from './test-button/test-button';
+    tree.write(`${libName}/src/lib/test-button/test-button.component.html`, `<button [attr.type]="type" [ngClass]="style"></button>`);
+    const modulePath = `${libName}/src/lib/${libName}.module.ts`;
+    tree.write(modulePath, `import * as ButtonExports from './test-button/test-button.component';
     ${tree.read(modulePath)}`);
     // create a module with component that gets exported in a barrel file
     generateModule(tree, {
@@ -83,14 +83,14 @@ export class TestButton {
         standalone: false,
         skipFormat: true,
     });
-    tree.write(`${libName}/src/lib/barrel/barrel-button/index.ts`, `export * from './barrel-button';`);
-    tree.write(`${libName}/src/lib/barrel/barrel-module.ts`, `import { NgModule } from '@angular/core';
+    tree.write(`${libName}/src/lib/barrel/barrel-button/index.ts`, `export * from './barrel-button.component';`);
+    tree.write(`${libName}/src/lib/barrel/barrel.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { BarrelButton } from './barrel-button';
+import { BarrelButtonComponent } from './barrel-button';
 
 @NgModule({
   imports: [CommonModule],
-  declarations: [BarrelButton],
+  declarations: [BarrelButtonComponent],
 })
 export class BarrelModule {}`);
     // create a module with components that get Angular exported and declared by variable
@@ -112,14 +112,14 @@ export class BarrelModule {}`);
         standalone: false,
         skipFormat: true,
     });
-    tree.write(`${libName}/src/lib/variable-declare/variable-declare-module.ts`, `import { NgModule } from '@angular/core';
+    tree.write(`${libName}/src/lib/variable-declare/variable-declare.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { VariableDeclareButton } from './variable-declare-button/variable-declare-button';
-import { VariableDeclareView } from './variable-declare-view/variable-declare-view';
+import { VariableDeclareButtonComponent } from './variable-declare-button/variable-declare-button.component';
+import { VariableDeclareViewComponent } from './variable-declare-view/variable-declare-view.component';
 
 const COMPONENTS = [
-  VariableDeclareButton,
-  VariableDeclareView
+  VariableDeclareButtonComponent,
+  VariableDeclareViewComponent
 ]
 
 @NgModule({
@@ -154,20 +154,20 @@ export class VariableDeclareModule {}`);
         standalone: false,
         skipFormat: true,
     });
-    tree.write(`${libName}/src/lib/variable-spread-declare/variable-spread-declare-module.ts`, `import { NgModule } from '@angular/core';
+    tree.write(`${libName}/src/lib/variable-spread-declare/variable-spread-declare.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { VariableSpreadDeclareButton } from './variable-spread-declare-button/variable-spread-declare-button';
-import { VariableSpreadDeclareView } from './variable-spread-declare-view/variable-spread-declare-view';
-import { VariableSpreadDeclareAnotherview } from './variable-spread-declare-anotherview/variable-spread-declare-anotherview';
+import { VariableSpreadDeclareButtonComponent } from './variable-spread-declare-button/variable-spread-declare-button.component';
+import { VariableSpreadDeclareViewComponent } from './variable-spread-declare-view/variable-spread-declare-view.component';
+import { VariableSpreadDeclareAnotherviewComponent } from './variable-spread-declare-anotherview/variable-spread-declare-anotherview.component';
 
 const COMPONENTS = [
-  VariableSpreadDeclareButton,
-  VariableSpreadDeclareView
+  VariableSpreadDeclareButtonComponent,
+  VariableSpreadDeclareViewComponent
 ]
 
 @NgModule({
   imports: [CommonModule],
-  declarations: [...COMPONENTS, VariableSpreadDeclareAnotherview],
+  declarations: [...COMPONENTS, VariableSpreadDeclareAnotherviewComponent],
 })
 export class VariableSpreadDeclareModule {}`);
     // create a module where declared components are pulled from a static member of the module
@@ -189,10 +189,10 @@ export class VariableSpreadDeclareModule {}`);
         standalone: false,
         skipFormat: true,
     });
-    tree.write(`${libName}/src/lib/static-member-declarations/static-member-declarations-module.ts`, `import { NgModule } from '@angular/core';
+    tree.write(`${libName}/src/lib/static-member-declarations/static-member-declarations.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { Cmp1 } from './cmp1/cmp1';
-import { Cmp2 } from './cmp2/cmp2';
+import { Cmp1Component } from './cmp1/cmp1.component';
+import { Cmp2Component } from './cmp2/cmp2.component';
 
 @NgModule({
   imports: [CommonModule],
@@ -200,7 +200,7 @@ import { Cmp2 } from './cmp2/cmp2';
   exports: StaticMemberDeclarationsModule.COMPONENTS
 })
 export class StaticMemberDeclarationsModule {
-  static readonly COMPONENTS = [Cmp1, Cmp2];
+  static readonly COMPONENTS = [Cmp1Component, Cmp2Component];
 }`);
     // create another button in a nested subpath
     generateModule(tree, {
@@ -231,7 +231,7 @@ function generateModule(tree, options) {
         options.path = `${sourceRoot}/${projectDirName}`;
     }
     const moduleNames = (0, devkit_1.names)(options.name);
-    const moduleFilePath = `${options.path}/${moduleNames.fileName}/${moduleNames.fileName}-module.ts`;
+    const moduleFilePath = `${options.path}/${moduleNames.fileName}/${moduleNames.fileName}.module.ts`;
     tree.write(moduleFilePath, `import { NgModule } from '@angular/core';
   import { CommonModule } from '@angular/common';
 

package/src/generators/utils/version-utils.js

@@ -49,10 +49,10 @@ function getInstalledPackageVersionInfo(tree, pkgName) {
 function versions(tree) {
     const majorAngularVersion = getInstalledAngularMajorVersion(tree);
     switch (majorAngularVersion) {
+        case 17:
+            return backward_compatible_versions_1.backwardCompatibleVersions.angularV17;
         case 18:
             return backward_compatible_versions_1.backwardCompatibleVersions.angularV18;
-        case 19:
-            return backward_compatible_versions_1.backwardCompatibleVersions.angularV19;
         default:
             return latestVersions;
     }

package/src/generators/web-worker/lib/add-snippet.js

@@ -4,9 +4,9 @@ exports.addSnippet = addSnippet;
 const devkit_1 = require("@nx/devkit");
 function addSnippet(tree, name, path) {
     const fileRegExp = new RegExp(`^${name}.*\\.ts`);
-    const siblingModules = tree
-        .children(path)
-        .filter((f) => fileRegExp.test(f) && !/(module|spec|config|routes)\.ts$/.test(f))
+    const children = tree.children(path);
+    const siblingModules = children
+        .filter((f) => fileRegExp.test(f) && !/(module|spec)\.ts$/.test(f))
         .sort();
     if (siblingModules.length === 0) {
         return;

package/src/plugins/plugin.js

@@ -21,14 +21,8 @@ const knownExecutors = {
         '@angular-devkit/build-angular:ng-packagr',
         '@angular/build:ng-packagr',
     ]),
-    devServer: new Set([
-        '@angular-devkit/build-angular:dev-server',
-        '@angular/build:dev-server',
-    ]),
-    extractI18n: new Set([
-        '@angular-devkit/build-angular:extract-i18n',
-        '@angular/build:extract-i18n',
-    ]),
+    devServer: new Set(['@angular-devkit/build-angular:dev-server']),
+    extractI18n: new Set(['@angular-devkit/build-angular:extract-i18n']),
     prerender: new Set([
         '@angular-devkit/build-angular:prerender',
         '@nguniversal/builders:prerender',
@@ -38,10 +32,7 @@ const knownExecutors = {
         '@angular-devkit/build-angular:ssr-dev-server',
         '@nguniversal/builders:ssr-dev-server',
     ]),
-    test: new Set([
-        '@angular-devkit/build-angular:karma',
-        '@angular/build:karma',
-    ]),
+    test: new Set(['@angular-devkit/build-angular:karma']),
 };
 const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readProjectsCache(cachePath) {
@@ -120,7 +111,7 @@ async function buildAngularProjects(configFilePath, options, angularWorkspaceRoo
                 appShellTargets.push({ target: nxTargetName, project: projectName });
             }
             else if (knownExecutors.build.has(angularTarget.builder)) {
-                await updateBuildTarget(projectName, nxTargetName, targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs);
+                await updateBuildTarget(nxTargetName, targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs);
             }
             else if (knownExecutors.devServer.has(angularTarget.builder)) {
                 targets[nxTargetName].continuous = true;
@@ -205,21 +196,21 @@ function updateAppShellTarget(projectName, targetName, projects, angularJson, an
     target.inputs = inputs;
     target.outputs = outputs;
 }
-async function updateBuildTarget(projectName, targetName, target, angularTarget, context, angularWorkspaceRoot, projectRoot, namedInputs) {
+async function updateBuildTarget(targetName, target, angularTarget, context, angularWorkspaceRoot, projectRoot, namedInputs) {
     target.dependsOn = [`^${targetName}`];
-    if (angularTarget.builder === '@angular-devkit/build-angular:ng-packagr' ||
+    if (angularTarget.options?.outputPath) {
+        const fullOutputPath = (0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot, angularTarget.options.outputPath);
+        target.outputs = [
+            getOutput(fullOutputPath, context.workspaceRoot, angularWorkspaceRoot, projectRoot),
+        ];
+    }
+    else if (angularTarget.builder === '@angular-devkit/build-angular:ng-packagr' ||
         angularTarget.builder === '@angular/build:ng-packagr') {
         const outputs = await getNgPackagrOutputs(angularTarget, angularWorkspaceRoot, projectRoot, context);
         if (outputs.length) {
             target.outputs = outputs;
         }
     }
-    else {
-        const fullOutputPath = (0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot, angularTarget.options?.outputPath ?? posix.join('dist', projectName));
-        target.outputs = [
-            getOutput(fullOutputPath, context.workspaceRoot, angularWorkspaceRoot, projectRoot),
-        ];
-    }
     if (target.outputs?.length) {
         // make it cacheable if we were able to identify outputs
         target.cache = true;
@@ -281,7 +272,7 @@ function updatePrerenderTarget(projectName, targetName, projects, angularJson) {
     target.outputs = outputs;
 }
 async function getNgPackagrOutputs(target, angularWorkspaceRoot, projectRoot, context) {
-    let ngPackageJsonPath = (0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot, target.options?.project ?? (0, node_path_1.join)(projectRoot, 'ng-package.json'));
+    let ngPackageJsonPath = (0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot, target.options.project);
     const readConfig = async (configPath) => {
         if (!(0, node_fs_1.existsSync)(configPath)) {
             return undefined;

package/src/utils/backward-compatible-versions.d.ts

@@ -1,11 +1,11 @@
 import * as latestVersions from './versions';
-type SupportedVersions = 'angularV18' | 'angularV19';
+type SupportedVersions = 'angularV17' | 'angularV18';
 type LatestPackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion'>;
 type CompatPackageVersionNames = LatestPackageVersionNames;
 export type PackageVersionNames = LatestPackageVersionNames | CompatPackageVersionNames;
 export type VersionMap = {
+    angularV17: Record<Exclude<CompatPackageVersionNames, 'typescriptEslintVersion'>, string>;
     angularV18: Record<CompatPackageVersionNames, string>;
-    angularV19: Record<CompatPackageVersionNames, string>;
 };
 export type PackageLatestVersions = Record<LatestPackageVersionNames, string>;
 export type PackageCompatVersions = VersionMap[SupportedVersions];

package/src/utils/backward-compatible-versions.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.backwardCompatibleVersions = void 0;
 exports.backwardCompatibleVersions = {
-    angularV18: {
-        angularVersion: '~18.2.0',
-        angularDevkitVersion: '~18.2.0',
-        ngPackagrVersion: '~18.2.0',
+    angularV17: {
+        angularVersion: '~17.3.0',
+        angularDevkitVersion: '~17.3.0',
+        ngPackagrVersion: '~17.3.0',
         angularRspackVersion: '~20.6.1',
-        ngrxVersion: '~18.0.2',
+        ngrxVersion: '~17.0.0',
         rxjsVersion: '~7.8.0',
         zoneJsVersion: '~0.14.3',
         angularJsVersion: '1.7.9',
@@ -17,28 +17,28 @@ exports.backwardCompatibleVersions = {
         expressVersion: '^4.21.2',
         typesExpressVersion: '^4.17.21',
         browserSyncVersion: '^3.0.0',
-        moduleFederationNodeVersion: '~2.5.0',
-        moduleFederationEnhancedVersion: '0.6.9',
-        angularEslintVersion: '^18.3.0',
-        typescriptEslintVersion: '^7.16.0',
+        moduleFederationNodeVersion: '~2.3.0',
+        moduleFederationEnhancedVersion: '~0.2.3',
+        angularEslintVersion: '~17.3.0',
         tailwindVersion: '^3.0.2',
         postcssVersion: '^8.4.5',
         postcssUrlVersion: '~10.1.3',
         autoprefixerVersion: '^10.4.0',
         tsNodeVersion: '10.9.1',
-        jestPresetAngularVersion: '~14.1.0',
+        jestPresetAngularVersion: '~14.0.3',
         typesNodeVersion: '18.16.9',
         jasmineMarblesVersion: '^0.9.2',
         jsoncEslintParserVersion: '^2.1.0',
+        webpackMergeVersion: '^5.8.0',
     },
-    angularV19: {
-        angularVersion: '~19.2.0',
-        angularDevkitVersion: '~19.2.0',
-        ngPackagrVersion: '~19.2.0',
+    angularV18: {
+        angularVersion: '~18.2.0',
+        angularDevkitVersion: '~18.2.0',
+        ngPackagrVersion: '~18.2.0',
         angularRspackVersion: '~20.6.1',
-        ngrxVersion: '~19.1.0',
+        ngrxVersion: '~18.0.2',
         rxjsVersion: '~7.8.0',
-        zoneJsVersion: '~0.15.0',
+        zoneJsVersion: '~0.14.3',
         angularJsVersion: '1.7.9',
         tsLibVersion: '^2.3.0',
         corsVersion: '~2.8.5',
@@ -46,18 +46,19 @@ exports.backwardCompatibleVersions = {
         expressVersion: '^4.21.2',
         typesExpressVersion: '^4.17.21',
         browserSyncVersion: '^3.0.0',
-        moduleFederationNodeVersion: '^2.6.26',
-        moduleFederationEnhancedVersion: '^0.9.0',
-        angularEslintVersion: '^19.2.0',
+        moduleFederationNodeVersion: '~2.5.0',
+        moduleFederationEnhancedVersion: '0.6.9',
+        angularEslintVersion: '^18.3.0',
         typescriptEslintVersion: '^7.16.0',
         tailwindVersion: '^3.0.2',
         postcssVersion: '^8.4.5',
         postcssUrlVersion: '~10.1.3',
         autoprefixerVersion: '^10.4.0',
         tsNodeVersion: '10.9.1',
-        jestPresetAngularVersion: '~14.4.0',
+        jestPresetAngularVersion: '~14.1.0',
         typesNodeVersion: '18.16.9',
         jasmineMarblesVersion: '^0.9.2',
         jsoncEslintParserVersion: '^2.1.0',
+        webpackMergeVersion: '^5.8.0',
     },
 };

package/src/utils/nx-devkit/ast-utils.js

@@ -444,18 +444,9 @@ function getListOfRoutes(source) {
 }
 function isNgStandaloneApp(tree, projectName) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    let mainFile = project.targets?.build?.options?.main ??
+    const mainFile = project.targets?.build?.options?.main ??
         project.targets?.build?.options?.browser;
-    let hasMainFile = false;
-    if (mainFile) {
-        hasMainFile = true;
-    }
-    else {
-        const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
-        mainFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
-        hasMainFile = tree.exists(mainFile);
-    }
-    if (project.projectType !== 'application' || !hasMainFile) {
+    if (project.projectType !== 'application' || !mainFile) {
         return false;
     }
     (0, ensure_typescript_1.ensureTypescript)();
@@ -557,12 +548,7 @@ function readBootstrapInfo(host, app) {
     let mainPath;
     try {
         mainPath =
-            config.targets.build.options?.main ??
-                config.targets.build.options?.browser;
-        if (!mainPath) {
-            const sourceRoot = config.sourceRoot ?? (0, devkit_1.joinPathFragments)(config.root, 'src');
-            mainPath = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
-        }
+            config.targets.build.options.main ?? config.targets.build.options.browser;
     }
     catch (e) {
         throw new Error('Main file cannot be located');

package/src/utils/nx-devkit/testing.js

@@ -18,24 +18,24 @@ function createApp(tree, appName, routing = true) {
     // save for getAppDir() lookup by external *.spec.ts tests
     appConfig = {
         appName,
-        appModule: `${appName}/src/app/app-module.ts`,
+        appModule: `${appName}/src/app/app.module.ts`,
     };
     tree.write(appConfig.appModule, `import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 ${routing ? "import { RouterModule } from '@angular/router'" : ''};
-import { App } from './app';
+import { AppComponent } from './app.component';
 @NgModule({
   imports: [BrowserModule, ${routing ? 'RouterModule.forRoot([])' : ''}],
-  declarations: [App],
-  bootstrap: [App]
+  declarations: [AppComponent],
+  bootstrap: [AppComponent]
 })
 export class AppModule {}
 `);
-    tree.write(`${appName}/src/main.ts`, `import { platformBrowser } from '@angular/platform-browser';
+    tree.write(`${appName}/src/main.ts`, `import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { AppModule } from './app/app-module';
+import { AppModule } from './app/app.module';
 
-platformBrowser()
+platformBrowserDynamic()
   .bootstrapModule(AppModule)
   .catch(err => console.log(err));
   `);
@@ -65,7 +65,7 @@ function createLib(tree, libName) {
     const { name, className, fileName, propertyName } = (0, devkit_1.names)(libName);
     libConfig = {
         name,
-        module: `${propertyName}/src/lib/${fileName}-module.ts`,
+        module: `${propertyName}/src/lib/${fileName}.module.ts`,
         barrel: `${propertyName}/src/index.ts`,
     };
     tree.write(libConfig.module, `import { NgModule } from '@angular/core';
@@ -78,6 +78,6 @@ import { CommonModule } from '@angular/common';
 })
 export class ${className}Module { }
   `);
-    tree.write(libConfig.barrel, `export * from './lib/${fileName}-module';
+    tree.write(libConfig.barrel, `export * from './lib/${fileName}.module';
 `);
 }

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "20.0.0-rc.1";
-export declare const angularDevkitVersion = "20.0.0-rc.2";
-export declare const ngPackagrVersion = "20.0.0-rc.0";
+export declare const angularVersion = "~19.2.0";
+export declare const angularDevkitVersion = "~19.2.0";
+export declare const ngPackagrVersion = "~19.2.0";
 export declare const angularRspackVersion = "^21.0.1";
 export declare const ngrxVersion = "^19.0.0";
 export declare const rxjsVersion = "~7.8.0";
@@ -15,6 +15,7 @@ export declare const typesExpressVersion = "^4.17.21";
 export declare const browserSyncVersion = "^3.0.0";
 export declare const moduleFederationNodeVersion = "^2.6.26";
 export declare const moduleFederationEnhancedVersion = "^0.9.0";
+export declare const webpackMergeVersion = "^5.8.0";
 export declare const angularEslintVersion = "^19.2.0";
 export declare const typescriptEslintVersion = "^7.16.0";
 export declare const tailwindVersion = "^3.0.2";

package/src/utils/versions.js

@@ -1,10 +1,10 @@
 "use strict";
 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.angularRspackVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.webpackMergeVersion = 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.angularRspackVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.angularVersion = '20.0.0-rc.1';
-exports.angularDevkitVersion = '20.0.0-rc.2';
-exports.ngPackagrVersion = '20.0.0-rc.0';
+exports.angularVersion = '~19.2.0';
+exports.angularDevkitVersion = '~19.2.0';
+exports.ngPackagrVersion = '~19.2.0';
 exports.angularRspackVersion = '^21.0.1';
 exports.ngrxVersion = '^19.0.0';
 exports.rxjsVersion = '~7.8.0';
@@ -18,6 +18,7 @@ exports.typesExpressVersion = '^4.17.21';
 exports.browserSyncVersion = '^3.0.0';
 exports.moduleFederationNodeVersion = '^2.6.26';
 exports.moduleFederationEnhancedVersion = '^0.9.0';
+exports.webpackMergeVersion = '^5.8.0';
 exports.angularEslintVersion = '^19.2.0';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';

package/src/executors/utilities/builder-package.d.ts

@@ -1 +0,0 @@
-export declare function assertBuilderPackageIsInstalled(packageName: string): void;