@nx/angular 16.7.0-beta.1 → 16.7.0-beta.4

package/generators.json

@@ -42,7 +42,8 @@
     "convert-tslint-to-eslint": {
       "factory": "./src/generators/convert-tslint-to-eslint/compat",
       "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
-      "description": "Converts a project from TSLint to ESLint."
+      "description": "Converts a project from TSLint to ESLint.",
+      "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Migrate to ESLint."
     },
     "init": {
       "factory": "./src/generators/init/init.compat#initSchematic",
@@ -194,7 +195,8 @@
     "convert-tslint-to-eslint": {
       "factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionGenerator",
       "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
-      "description": "Converts a project from TSLint to ESLint."
+      "description": "Converts a project from TSLint to ESLint.",
+      "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Migrate to ESLint."
     },
     "directive": {
       "factory": "./src/generators/directive/directive",

package/migrations.json

@@ -269,6 +269,15 @@
       "version": "16.6.0-beta.0",
       "description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
       "factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps"
+    },
+    "update-angular-cli-version-16-2-0-rc-1": {
+      "cli": "nx",
+      "version": "16.7.0-beta.2",
+      "requires": {
+        "@angular/core": ">=16.2.0-rc.0"
+      },
+      "description": "Update the @angular/cli package version to ~16.2.0-rc.1.",
+      "factory": "./src/migrations/update-16-7-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -1235,6 +1244,67 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "16.7.0": {
+      "version": "16.7.0-beta.2",
+      "packages": {
+        "@angular-devkit/architect": {
+          "version": "~0.1602.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-angular": {
+          "version": "~16.2.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.1602.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~16.2.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~16.2.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/builders": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/common": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/express-engine": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~16.2.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~16.2.0-next.1",
+          "alwaysAddToPackageJson": false
+        }
+      },
+      "x-prompt": "Do you want to update the Angular version to v16.2?",
+      "requires": {
+        "@angular/core": ">=16.1.0 <16.2.0-next.1"
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.7.0-beta.1",
+  "version": "16.7.0-beta.4",
   "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": {
@@ -66,14 +66,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.7.0-beta.1",
-    "@nx/cypress": "16.7.0-beta.1",
-    "@nx/devkit": "16.7.0-beta.1",
-    "@nx/jest": "16.7.0-beta.1",
-    "@nx/js": "16.7.0-beta.1",
-    "@nx/linter": "16.7.0-beta.1",
-    "@nx/webpack": "16.7.0-beta.1",
-    "@nx/workspace": "16.7.0-beta.1",
+    "@nrwl/angular": "16.7.0-beta.4",
+    "@nx/cypress": "16.7.0-beta.4",
+    "@nx/devkit": "16.7.0-beta.4",
+    "@nx/jest": "16.7.0-beta.4",
+    "@nx/js": "16.7.0-beta.4",
+    "@nx/linter": "16.7.0-beta.4",
+    "@nx/webpack": "16.7.0-beta.4",
+    "@nx/workspace": "16.7.0-beta.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -107,5 +107,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "50a145bb64edcf76985184a9a83d1449dcd4f3d9"
+  "gitHead": "dcbba686b182737b66ebbfb9db372769e77ba005"
 }

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

@@ -1,4 +1,5 @@
 import type { Schema } from './schema';
-export declare function executeModuleFederationDevServerBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): import("rxjs").Observable<import("@angular-devkit/build-angular").DevServerBuilderOutput>;
+import { executeWebpackDevServerBuilder } from '../webpack-dev-server/webpack-dev-server.impl';
+export declare function executeModuleFederationDevServerBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): ReturnType<typeof executeWebpackDevServerBuilder>;
 declare const _default: any;
 export default _default;

package/src/generators/convert-tslint-to-eslint/compat.d.ts

@@ -1 +1,4 @@
+/**
+ * @deprecated This generator will be removed in v17
+ */
 export declare const conversionSchematic: (generatorOptions: import("../../../../../build/packages/linter").ConvertTSLintToESLintSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/convert-tslint-to-eslint/compat.js

@@ -4,4 +4,7 @@ exports.conversionSchematic = void 0;
 const devkit_1 = require("@nx/devkit");
 const warn_for_schematic_usage_1 = require("../utils/warn-for-schematic-usage");
 const convert_tslint_to_eslint_1 = require("./convert-tslint-to-eslint");
+/**
+ * @deprecated This generator will be removed in v17
+ */
 exports.conversionSchematic = (0, warn_for_schematic_usage_1.warnForSchematicUsage)((0, devkit_1.convertNxGenerator)(convert_tslint_to_eslint_1.conversionGenerator));

package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.d.ts

@@ -1,3 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { ConvertTSLintToESLintSchema } from '@nx/linter';
+/**
+ * @deprecated This generator will be removed in v17
+ */
 export declare function conversionGenerator(host: Tree, options: ConvertTSLintToESLintSchema): Promise<() => Promise<void>>;

package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js

@@ -6,6 +6,9 @@ const cypress_1 = require("@nx/cypress");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const add_linting_1 = require("../add-linting/add-linting");
+/**
+ * @deprecated This generator will be removed in v17
+ */
 function conversionGenerator(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         /**

package/src/generators/convert-tslint-to-eslint/schema.json

@@ -4,6 +4,7 @@
   "cli": "nx",
   "title": "Convert an Angular project from TSLint to ESLint",
   "description": "Convert an Angular project from TSLint to ESLint. NOTE: Does not work in `--dry-run mode`.",
+  "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Migrate to ESLint.",
   "examples": [
     {
       "command": "nx g convert-tslint-to-eslint myapp",

package/src/generators/ng-add/utilities/workspace.js

@@ -57,7 +57,9 @@ function createNxJson(tree, options, defaultProject) {
                         '!{projectRoot}/karma.conf.js',
                     ]
                     : []),
-                targets.lint ? '!{projectRoot}/.eslintrc.json' : undefined,
+                ...(targets.lint
+                    ? ['!{projectRoot}/.eslintrc.json', '!{projectRoot}/eslint.config.js']
+                    : []),
             ].filter(Boolean),
         },
         targetDefaults: {
@@ -72,7 +74,11 @@ function createNxJson(tree, options, defaultProject) {
                 : undefined,
             lint: targets.lint
                 ? {
-                    inputs: ['default', '{workspaceRoot}/.eslintrc.json'],
+                    inputs: [
+                        'default',
+                        '{workspaceRoot}/.eslintrc.json',
+                        '{workspaceRoot}/eslint.config.js',
+                    ],
                 }
                 : undefined,
             e2e: targets.e2e

package/src/generators/setup-mf/lib/fix-bootstrap.js

@@ -25,11 +25,9 @@ function fixBootstrap(tree, appRoot, options) {
         : bootstrapImportCode);
 }
 exports.fixBootstrap = fixBootstrap;
-const standaloneBootstrapCode = (includeEnvironments = false) => `import {importProvidersFrom} from "@angular/core";
-import {bootstrapApplication} from "@angular/platform-browser";
-import {RouterModule} from "@angular/router";
-import {RemoteEntryComponent} from "./app/remote-entry/entry.component";
-import {appRoutes} from "./app/app.routes";
+const standaloneBootstrapCode = (includeEnvironments = false) => `import {bootstrapApplication} from "@angular/platform-browser";
+import {appConfig} from './app/app.config';
+import {RemoteEntryComponent} from './app/remote-entry/entry.component';
 ${includeEnvironments
     ? `import {enableProdMode} from '@angular/core';
 import {environment} from './environments/environment';
@@ -38,10 +36,6 @@ if(environment.production) {
 }
 `
     : ``}
-bootstrapApplication(RemoteEntryComponent, {
-  providers: [
-    importProvidersFrom(
-      RouterModule.forRoot(appRoutes, {initialNavigation: 'enabledBlocking'})
-    )
-  ]
-});`;
+bootstrapApplication(RemoteEntryComponent, appConfig).catch((err) =>
+  console.error(err)
+);`;

package/src/migrations/update-16-7-0/update-angular-cli.d.ts

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

package/src/migrations/update-16-7-0/update-angular-cli.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~16.2.0-rc.1';
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let shouldFormat = false;
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            var _a, _b;
+            if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
+                json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+                shouldFormat = true;
+            }
+            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
+                json.dependencies['@angular/cli'] = exports.angularCliVersion;
+                shouldFormat = true;
+            }
+            return json;
+        });
+        if (shouldFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = default_1;

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

@@ -108,7 +108,7 @@ function getDecoratorMetadata(source, identifier, module) {
 exports.getDecoratorMetadata = getDecoratorMetadata;
 function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, expression, decoratorName) {
     const nodes = getDecoratorMetadata(source, decoratorName, '@angular/core');
-    let node = nodes[0]; // tslint:disable-line:no-any
+    let node = nodes[0];
     // Find the decorator declaration.
     if (!node) {
         return source;
@@ -230,7 +230,7 @@ function _addSymbolToNgModuleMetadata(host, source, ngModulePath, metadataField,
 }
 function removeFromNgModule(host, source, modulePath, property) {
     const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
-    let node = nodes[0]; // tslint:disable-line:no-any
+    let node = nodes[0];
     // Find the decorator declaration.
     if (!node) {
         return source;
@@ -362,7 +362,7 @@ function getBootstrapComponent(source, moduleClassName) {
 exports.getBootstrapComponent = getBootstrapComponent;
 function getMatchingProperty(source, property, identifier, module) {
     const nodes = getDecoratorMetadata(source, identifier, module);
-    let node = nodes[0]; // tslint:disable-line:no-any
+    let node = nodes[0];
     if (!node)
         return null;
     // Get all the children property assignment of object literals.

package/src/utils/versions.d.ts

@@ -1,13 +1,13 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~16.1.0";
-export declare const angularDevkitVersion = "~16.1.0";
-export declare const ngPackagrVersion = "~16.1.0";
+export declare const angularVersion = "~16.2.0-rc.0";
+export declare const angularDevkitVersion = "~16.2.0-rc.1";
+export declare const ngPackagrVersion = "~16.2.0-next.1";
 export declare const ngrxVersion = "~16.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.13.0";
 export declare const angularJsVersion = "1.7.9";
 export declare const tsLibVersion = "^2.3.0";
-export declare const ngUniversalVersion = "~16.1.0";
+export declare const ngUniversalVersion = "~16.2.0-rc.0";
 export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.5";
 export declare const expressVersion = "~4.18.2";

package/src/utils/versions.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.ngUniversalVersion = 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 = '~16.1.0';
-exports.angularDevkitVersion = '~16.1.0';
-exports.ngPackagrVersion = '~16.1.0';
+exports.angularVersion = '~16.2.0-rc.0';
+exports.angularDevkitVersion = '~16.2.0-rc.1';
+exports.ngPackagrVersion = '~16.2.0-next.1';
 exports.ngrxVersion = '~16.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.13.0';
 exports.angularJsVersion = '1.7.9';
 exports.tsLibVersion = '^2.3.0';
-exports.ngUniversalVersion = '~16.1.0';
+exports.ngUniversalVersion = '~16.2.0-rc.0';
 exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '~4.18.2';