nx 21.1.1 → 21.2.0-beta.1

package/.eslintrc.json

@@ -105,6 +105,7 @@
               "typescript",
               "@nrwl/angular",
               "@angular-devkit/build-angular",
+              "@angular/build",
               "@angular-devkit/core",
               "@angular-devkit/architect",
               "@swc/core", //Optional, used in JS analysis if available

package/README.md

@@ -1,7 +1,7 @@
 <p style="text-align: center;">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+    <img alt="Nx - Smart Repos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
   </picture>
 </p>
 
@@ -20,7 +20,7 @@
 
 <hr>
 
-# Nx: Smart Monorepos · Fast CI
+# Nx: Smart Repos · Fast Builds
 
 Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
 
@@ -62,5 +62,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://nx.dev/blog)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
+width="100%" alt="Nx - Smart Repos · Fast Builds"></a></p>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.1.1",
+  "version": "21.2.0-beta.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.1.1",
-    "@nx/nx-darwin-x64": "21.1.1",
-    "@nx/nx-freebsd-x64": "21.1.1",
-    "@nx/nx-linux-arm-gnueabihf": "21.1.1",
-    "@nx/nx-linux-arm64-gnu": "21.1.1",
-    "@nx/nx-linux-arm64-musl": "21.1.1",
-    "@nx/nx-linux-x64-gnu": "21.1.1",
-    "@nx/nx-linux-x64-musl": "21.1.1",
-    "@nx/nx-win32-arm64-msvc": "21.1.1",
-    "@nx/nx-win32-x64-msvc": "21.1.1"
+    "@nx/nx-darwin-arm64": "21.2.0-beta.1",
+    "@nx/nx-darwin-x64": "21.2.0-beta.1",
+    "@nx/nx-freebsd-x64": "21.2.0-beta.1",
+    "@nx/nx-linux-arm-gnueabihf": "21.2.0-beta.1",
+    "@nx/nx-linux-arm64-gnu": "21.2.0-beta.1",
+    "@nx/nx-linux-arm64-musl": "21.2.0-beta.1",
+    "@nx/nx-linux-x64-gnu": "21.2.0-beta.1",
+    "@nx/nx-linux-x64-musl": "21.2.0-beta.1",
+    "@nx/nx-win32-arm64-msvc": "21.2.0-beta.1",
+    "@nx/nx-win32-x64-msvc": "21.2.0-beta.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/compat.js

@@ -93,6 +93,10 @@ if (!patched) {
             () => { };
     }
     catch (e) { }
+    try {
+        require('@angular/build/private').assertCompatibleAngularVersion = () => { };
+    }
+    catch (e) { }
     patched = true;
 }
 function mockReadWorkspace(ngCoreWorkspace) {

package/src/command-line/init/implementation/angular/index.js

@@ -95,7 +95,9 @@ function addPluginDependencies() {
     const angularCliVersion = packageJson.devDependencies['@angular/cli'] ??
         packageJson.dependencies?.['@angular/cli'] ??
         packageJson.devDependencies['@angular-devkit/build-angular'] ??
-        packageJson.dependencies?.['@angular-devkit/build-angular'];
+        packageJson.dependencies?.['@angular-devkit/build-angular'] ??
+        packageJson.devDependencies['@angular/build'] ??
+        packageJson.dependencies?.['@angular/build'];
     for (const dep of peerDepsToInstall) {
         if (!packageJson.devDependencies[dep] && !packageJson.dependencies?.[dep]) {
             packageJson.devDependencies[dep] = angularCliVersion;

package/src/command-line/init/implementation/angular/standalone-workspace.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupStandaloneWorkspace = setupStandaloneWorkspace;
 const fs_1 = require("fs");
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const angular_json_1 = require("../../../../adapter/angular-json");
 const fileutils_1 = require("../../../../utils/fileutils");
-const path_2 = require("../../../../utils/path");
+const path_1 = require("../../../../utils/path");
 const utils_1 = require("../utils");
 async function setupStandaloneWorkspace(repoRoot, cacheableOperations, workspaceTargets) {
-    const angularJsonPath = (0, path_1.join)(repoRoot, 'angular.json');
+    const angularJsonPath = (0, node_path_1.join)(repoRoot, 'angular.json');
     const angularJson = (0, fileutils_1.readJsonFile)(angularJsonPath);
     const workspaceCapabilities = getWorkspaceCapabilities(angularJson.projects);
     createNxJson(repoRoot, angularJson, cacheableOperations, workspaceCapabilities, workspaceTargets);
@@ -24,9 +24,9 @@ async function setupStandaloneWorkspace(repoRoot, cacheableOperations, workspace
     // update its targets outputs and delete angular.json
     const projects = (0, angular_json_1.toNewFormat)(angularJson).projects;
     for (const [projectName, project] of Object.entries(projects ?? {})) {
-        updateProjectOutputs(repoRoot, project);
-        (0, fileutils_1.writeJsonFile)((0, path_1.join)(project.root, 'project.json'), {
-            $schema: (0, path_2.normalizePath)((0, path_1.relative)((0, path_1.join)(repoRoot, project.root), (0, path_1.join)(repoRoot, 'node_modules/nx/schemas/project-schema.json'))),
+        updateProjectOutputs(repoRoot, projectName, project, cacheableOperations);
+        (0, fileutils_1.writeJsonFile)((0, node_path_1.join)(project.root, 'project.json'), {
+            $schema: (0, path_1.normalizePath)((0, node_path_1.relative)((0, node_path_1.join)(repoRoot, project.root), (0, node_path_1.join)(repoRoot, 'node_modules/nx/schemas/project-schema.json'))),
             name: projectName,
             ...project,
             root: undefined,
@@ -36,7 +36,7 @@ async function setupStandaloneWorkspace(repoRoot, cacheableOperations, workspace
 }
 function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjectConfigFile, test, karmaProjectConfigFile, }, workspaceTargets) {
     (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, {});
-    const nxJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(repoRoot, 'nx.json'));
+    const nxJson = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(repoRoot, 'nx.json'));
     nxJson.namedInputs = {
         sharedGlobals: [],
         default: ['{projectRoot}/**/*', 'sharedGlobals'],
@@ -70,7 +70,7 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
     }
     if (workspaceTargets.includes('test')) {
         const inputs = ['default', '^production'];
-        if ((0, fileutils_1.fileExists)((0, path_1.join)(repoRoot, 'karma.conf.js'))) {
+        if ((0, fileutils_1.fileExists)((0, node_path_1.join)(repoRoot, 'karma.conf.js'))) {
             inputs.push('{workspaceRoot}/karma.conf.js');
         }
         nxJson.targetDefaults.test = {
@@ -80,10 +80,10 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
     }
     if (workspaceTargets.includes('lint')) {
         const inputs = ['default'];
-        if ((0, fileutils_1.fileExists)((0, path_1.join)(repoRoot, '.eslintrc.json'))) {
+        if ((0, fileutils_1.fileExists)((0, node_path_1.join)(repoRoot, '.eslintrc.json'))) {
             inputs.push('{workspaceRoot}/.eslintrc.json');
         }
-        if ((0, fileutils_1.fileExists)((0, path_1.join)(repoRoot, 'eslint.config.cjs'))) {
+        if ((0, fileutils_1.fileExists)((0, node_path_1.join)(repoRoot, 'eslint.config.cjs'))) {
             inputs.push('{workspaceRoot}/eslint.config.cjs');
         }
         nxJson.targetDefaults.lint = {
@@ -97,11 +97,30 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
             inputs: ['default', '^production'],
         };
     }
-    (0, fileutils_1.writeJsonFile)((0, path_1.join)(repoRoot, 'nx.json'), nxJson);
+    (0, fileutils_1.writeJsonFile)((0, node_path_1.join)(repoRoot, 'nx.json'), nxJson);
 }
-function updateProjectOutputs(repoRoot, project) {
-    Object.values(project.targets ?? {}).forEach((target) => {
-        if ([
+function updateProjectOutputs(repoRoot, projectName, project, cacheableOperations) {
+    Object.entries(project.targets ?? {}).forEach(([targetName, target]) => {
+        if (target.executor === '@angular/build:application' ||
+            target.executor === '@angular-devkit/build-angular:application') {
+            if (target.options.outputPath) {
+                if (typeof target.options.outputPath === 'string') {
+                    target.outputs = ['{options.outputPath}'];
+                }
+                else if (target.options.outputPath.base) {
+                    target.outputs = ['{options.outputPath.base}'];
+                }
+                else if (cacheableOperations.includes(targetName)) {
+                    target.cache = false;
+                }
+            }
+            else {
+                target.options.outputPath = node_path_1.posix.join('dist', projectName);
+                target.outputs = ['{options.outputPath}'];
+            }
+        }
+        else if ([
+            '@angular-devkit/build-angular:browser-esbuild',
             '@angular-devkit/build-angular:browser',
             '@angular-builders/custom-webpack:browser',
             'ngx-build-plus:browser',
@@ -109,7 +128,12 @@ function updateProjectOutputs(repoRoot, project) {
             '@angular-builders/custom-webpack:server',
             'ngx-build-plus:server',
         ].includes(target.executor)) {
-            target.outputs = ['{options.outputPath}'];
+            if (target.options.outputPath) {
+                target.outputs = ['{options.outputPath}'];
+            }
+            else if (cacheableOperations.includes(targetName)) {
+                target.cache = false;
+            }
         }
         else if (target.executor === '@angular-eslint/builder:lint') {
             target.outputs = ['{options.outputFile}'];
@@ -117,10 +141,11 @@ function updateProjectOutputs(repoRoot, project) {
         else if (target.executor === '@angular-devkit/build-angular:ng-packagr' ||
             target.executor === '@angular/build:ng-packagr') {
             try {
-                const ngPackageJsonPath = (0, path_1.join)(repoRoot, target.options.project);
+                const ngPackagrProject = target.options.project ?? node_path_1.posix.join(project.root, 'ng-package.json');
+                const ngPackageJsonPath = (0, node_path_1.join)(repoRoot, ngPackagrProject);
                 const ngPackageJson = (0, fileutils_1.readJsonFile)(ngPackageJsonPath);
-                const outputPath = (0, path_1.relative)(repoRoot, (0, path_1.resolve)((0, path_1.dirname)(ngPackageJsonPath), ngPackageJson.dest));
-                target.outputs = [`{workspaceRoot}/${(0, path_2.normalizePath)(outputPath)}`];
+                const outputPath = (0, node_path_1.relative)(repoRoot, (0, node_path_1.resolve)((0, node_path_1.dirname)(ngPackageJsonPath), ngPackageJson.dest));
+                target.outputs = [`{workspaceRoot}/${(0, path_1.normalizePath)(outputPath)}`];
             }
             catch { }
         }
@@ -153,19 +178,20 @@ function getWorkspaceCapabilities(projects) {
     return capabilities;
 }
 function projectUsesKarmaBuilder(project) {
-    return Object.values(project.architect ?? {}).some((target) => target.builder === '@angular-devkit/build-angular:karma');
+    return Object.values(project.architect ?? {}).some((target) => target.builder === '@angular/build:karma' ||
+        target.builder === '@angular-devkit/build-angular:karma');
 }
 function projectHasKarmaConfig(project) {
-    return (0, fileutils_1.fileExists)((0, path_1.join)(project.root, 'karma.conf.js'));
+    return (0, fileutils_1.fileExists)((0, node_path_1.join)(project.root, 'karma.conf.js'));
 }
 function projectHasEslintConfig(project) {
-    return ((0, fileutils_1.fileExists)((0, path_1.join)(project.root, '.eslintrc.json')) ||
-        (0, fileutils_1.fileExists)((0, path_1.join)(project.root, 'eslint.config.js')) ||
-        (0, fileutils_1.fileExists)((0, path_1.join)(project.root, 'eslint.config.mjs')) ||
-        (0, fileutils_1.fileExists)((0, path_1.join)(project.root, 'eslint.config.cjs')));
+    return ((0, fileutils_1.fileExists)((0, node_path_1.join)(project.root, '.eslintrc.json')) ||
+        (0, fileutils_1.fileExists)((0, node_path_1.join)(project.root, 'eslint.config.js')) ||
+        (0, fileutils_1.fileExists)((0, node_path_1.join)(project.root, 'eslint.config.mjs')) ||
+        (0, fileutils_1.fileExists)((0, node_path_1.join)(project.root, 'eslint.config.cjs')));
 }
 function replaceNgWithNxInPackageJsonScripts(repoRoot) {
-    const packageJsonPath = (0, path_1.join)(repoRoot, 'package.json');
+    const packageJsonPath = (0, node_path_1.join)(repoRoot, 'package.json');
     const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
     packageJson.scripts ??= {};
     Object.keys(packageJson.scripts).forEach((script) => {

package/src/command-line/nx-commands.js

@@ -44,7 +44,7 @@ exports.parserConfiguration = {
  */
 exports.commandsObject = yargs
     .parserConfiguration(exports.parserConfiguration)
-    .usage(chalk.bold('Smart Monorepos · Fast CI'))
+    .usage(chalk.bold('Smart Repos · Fast Builds'))
     .demandCommand(1, '')
     .command(command_object_1.yargsRegisterCommand)
     .command(command_object_22.yargsAddCommand)