nx 15.6.3 → 15.7.0-alpha.1

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [15.6.3](https://github.com/nrwl/nx/compare/15.6.2...15.6.3) (2023-01-27)
+
 
 **Note:** Version bump only for package nx

package/README.md

@@ -53,7 +53,7 @@ npx nx@latest init
 
 - [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
 - [Intro to Nx](https://nx.dev/getting-started/intro)
-- [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
+- [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <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" 

package/bin/init-local.js

@@ -165,7 +165,6 @@ function handleAngularCLIFallbacks(workspace) {
         }
     }
     else {
-        require('nx/src/adapter/compat');
         try {
             const cli = require.resolve('@angular/cli/lib/init.js', {
                 paths: [workspace.dir],

package/bin/init-local.js.map

@@ -1 +1 @@
-{"version":3,"file":"init-local.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init-local.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "15.6.3",
+  "version": "15.7.0-alpha.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,8 +32,8 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/cli": "15.6.3",
-    "@nrwl/tao": "15.6.3",
+    "@nrwl/cli": "15.7.0-alpha.1",
+    "@nrwl/tao": "15.7.0-alpha.1",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "^3.0.0-rc.18",
@@ -80,6 +80,17 @@
       "optional": true
     }
   },
+  "optionalDependencies": {
+    "@nrwl/nx-darwin-arm64": "15.7.0-alpha.1",
+    "@nrwl/nx-darwin-x64": "15.7.0-alpha.1",
+    "@nrwl/nx-linux-arm-gnueabihf": "15.7.0-alpha.1",
+    "@nrwl/nx-linux-arm64-gnu": "15.7.0-alpha.1",
+    "@nrwl/nx-linux-arm64-musl": "15.7.0-alpha.1",
+    "@nrwl/nx-linux-x64-gnu": "15.7.0-alpha.1",
+    "@nrwl/nx-linux-x64-musl": "15.7.0-alpha.1",
+    "@nrwl/nx-win32-arm64-msvc": "15.7.0-alpha.1",
+    "@nrwl/nx-win32-x64-msvc": "15.7.0-alpha.1"
+  },
   "nx-migrations": {
     "migrations": "./migrations.json",
     "packageGroup": [
@@ -119,7 +130,23 @@
   "publishConfig": {
     "access": "public"
   },
+  "napi": {
+    "name": "nx",
+    "package": {
+      "name": "@nrwl/nx"
+    },
+    "triples": {
+      "additional": [
+        "aarch64-apple-darwin",
+        "aarch64-unknown-linux-gnu",
+        "aarch64-unknown-linux-musl",
+        "aarch64-pc-windows-msvc",
+        "armv7-unknown-linux-gnueabihf",
+        "x86_64-unknown-linux-musl"
+      ]
+    }
+  },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "4a5a231a3eca0d648408941147be509cd827dd78"
+  "gitHead": "42d38047ff854942cc8832dda035e5cc7d0a2dc0"
 }

package/src/adapter/angular-json.d.ts

@@ -0,0 +1,9 @@
+import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
+export declare function shouldMergeAngularProjects(root: string, includeProjectsFromAngularJson: boolean): boolean;
+export declare function mergeAngularJsonAndGlobProjects(globProjects: {
+    [name: string]: ProjectConfiguration;
+}): {
+    [name: string]: ProjectConfiguration;
+};
+export declare function toNewFormat(w: any): ProjectsConfigurations;
+export declare function toOldFormat(w: any): any;

package/src/adapter/angular-json.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toOldFormat = exports.toNewFormat = exports.mergeAngularJsonAndGlobProjects = exports.shouldMergeAngularProjects = void 0;
+const fs_1 = require("fs");
+const path = require("path");
+const fileutils_1 = require("../utils/fileutils");
+const workspaces_1 = require("../config/workspaces");
+const workspace_root_1 = require("../utils/workspace-root");
+function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
+    if ((0, fs_1.existsSync)(path.join(root, 'angular.json')) &&
+        // Include projects from angular.json if explicitly required.
+        // e.g. when invoked from `packages/devkit/src/utils/convert-nx-executor.ts`
+        (includeProjectsFromAngularJson ||
+            // Or if a workspace has `@nrwl/angular` installed then projects from `angular.json` to be considered by Nx.
+            isNrwlAngularInstalled())) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+exports.shouldMergeAngularProjects = shouldMergeAngularProjects;
+function isNrwlAngularInstalled() {
+    try {
+        require.resolve('@nrwl/angular');
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+}
+function readAngularJson() {
+    return toNewFormat((0, fileutils_1.readJsonFile)(path.join(workspace_root_1.workspaceRoot, 'angular.json')))
+        .projects;
+}
+function mergeAngularJsonAndGlobProjects(globProjects) {
+    const res = readAngularJson();
+    const folders = new Set();
+    for (let k of Object.keys(res)) {
+        folders.add(res[k].root);
+    }
+    for (let k of Object.keys(globProjects)) {
+        if (!folders.has(globProjects[k].root)) {
+            res[k] = globProjects[k];
+        }
+    }
+    return res;
+}
+exports.mergeAngularJsonAndGlobProjects = mergeAngularJsonAndGlobProjects;
+function toNewFormat(w) {
+    Object.values(w.projects || {}).forEach((projectConfig) => {
+        if (projectConfig.architect) {
+            (0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'architect', 'targets');
+        }
+        if (projectConfig.schematics) {
+            (0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'schematics', 'generators');
+        }
+        Object.values(projectConfig.targets || {}).forEach((target) => {
+            if (target.builder !== undefined) {
+                (0, workspaces_1.renamePropertyWithStableKeys)(target, 'builder', 'executor');
+            }
+        });
+    });
+    if (w.schematics) {
+        (0, workspaces_1.renamePropertyWithStableKeys)(w, 'schematics', 'generators');
+    }
+    if (w.version !== 2) {
+        w.version = 2;
+    }
+    return w;
+}
+exports.toNewFormat = toNewFormat;
+function toOldFormat(w) {
+    Object.values(w.projects || {}).forEach((projectConfig) => {
+        if (typeof projectConfig === 'string') {
+            throw new Error("'project.json' files are incompatible with version 1 workspace schemas.");
+        }
+        if (projectConfig.targets) {
+            (0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'targets', 'architect');
+        }
+        if (projectConfig.generators) {
+            (0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'generators', 'schematics');
+        }
+        delete projectConfig.name;
+        Object.values(projectConfig.architect || {}).forEach((target) => {
+            if (target.executor !== undefined) {
+                (0, workspaces_1.renamePropertyWithStableKeys)(target, 'executor', 'builder');
+            }
+        });
+    });
+    if (w.generators) {
+        (0, workspaces_1.renamePropertyWithStableKeys)(w, 'generators', 'schematics');
+    }
+    if (w.version !== 1) {
+        w.version = 1;
+    }
+    return w;
+}
+exports.toOldFormat = toOldFormat;
+//# sourceMappingURL=angular-json.js.map

package/src/adapter/angular-json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/angular-json.ts"],"names":[],"mappings":"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"}

package/src/adapter/compat.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const logger_1 = require("../utils/logger");
-const workspaces_1 = require("../config/workspaces");
-const workspace_root_1 = require("../utils/workspace-root");
 const project_graph_1 = require("../project-graph/project-graph");
 const configuration_1 = require("../config/configuration");
+const angular_json_1 = require("./angular-json");
 /* eslint-disable */
 const Module = require('module');
 const originalRequire = Module.prototype.require;
 let patched = false;
-let loggedWriteWorkspaceWarning = false;
 const allowedProjectExtensions = [
     'tags',
     'implicitDependencies',
@@ -19,6 +16,7 @@ const allowedProjectExtensions = [
     'generators',
     'namedInputs',
     'name',
+    'files',
 ];
 const allowedWorkspaceExtensions = [
     'implicitDependencies',
@@ -36,13 +34,10 @@ if (!patched) {
     Module.prototype.require = function () {
         const result = originalRequire.apply(this, arguments);
         if (arguments[0].startsWith('@angular-devkit/core')) {
-            // Register `workspace.json` as a nonstandard workspace config file
             const ngCoreWorkspace = originalRequire.apply(this, [
                 `@angular-devkit/core/src/workspace/core`,
             ]);
-            ngCoreWorkspace._test_addWorkspaceFile('workspace.json', ngCoreWorkspace.WorkspaceFormat.JSON);
             mockReadWorkspace(ngCoreWorkspace);
-            mockWriteWorkspace(ngCoreWorkspace);
             const readJsonUtils = originalRequire.apply(this, [
                 `@angular-devkit/core/src/workspace/json/reader`,
             ]);
@@ -64,34 +59,12 @@ if (!patched) {
 }
 function mockReadWorkspace(ngCoreWorkspace) {
     mockMember(ngCoreWorkspace, 'readWorkspace', (originalReadWorkspace) => (path, ...rest) => {
-        const configFile = (0, workspaces_1.workspaceConfigName)(workspace_root_1.workspaceRoot);
-        if (!configFile) {
-            path = 'workspace.json';
-        }
+        path = 'angular.json';
         return originalReadWorkspace.apply(this, [path, ...rest]);
     });
 }
-function mockWriteWorkspace(ngCoreWorkspace) {
-    mockMember(ngCoreWorkspace, 'writeWorkspace', (originalWriteWorkspace) => (...args) => {
-        const configFile = (0, workspaces_1.workspaceConfigName)(workspace_root_1.workspaceRoot);
-        if (!loggedWriteWorkspaceWarning) {
-            if (configFile) {
-                logger_1.logger.warn(`[NX] Angular devkit called \`writeWorkspace\`, this may have had unintended consequences in ${configFile}`);
-                logger_1.logger.warn(`[NX] Double check ${configFile} before proceeding`);
-            }
-            else {
-                logger_1.logger.warn(`[NX] Angular devkit called \`writeWorkspace\`, this may have created 'workspace.json' or 'angular.json`);
-                logger_1.logger.warn(`[NX] Double check workspace configuration before proceeding`);
-            }
-            loggedWriteWorkspaceWarning = true;
-        }
-        return originalWriteWorkspace.apply(this, args);
-    });
-}
 /**
- * Patch readJsonWorkspace to inline project configurations
- * as well as work in workspaces without a central workspace file.
- *
+ * Patch readJsonWorkspace to handle workspaces without a central workspace file.
  * NOTE: We hide warnings that would be logged during this process.
  */
 function mockReadJsonWorkspace(readJsonUtils) {
@@ -105,17 +78,16 @@ function mockReadJsonWorkspace(readJsonUtils) {
         catch (_a) {
             // This failed. Its most likely due to a lack of a workspace definition file,
             // or other things that are different between NgCLI and Nx config files.
-            logger_1.logger.debug('[NX] Angular devkit readJsonWorkspace fell back to Nx workspaces logic');
             const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
             const nxJson = (0, configuration_1.readNxJson)();
             // Construct old workspace.json format from project graph
             const w = Object.assign(Object.assign({}, nxJson), (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
             // Read our v1 workspace schema
-            const workspaceConfiguration = (0, workspaces_1.resolveOldFormatWithInlineProjects)(w);
+            const workspaceConfiguration = (0, angular_json_1.toOldFormat)(w);
             // readJsonWorkspace actually has AST parsing + more, so we
             // still need to call it rather than just return our file
             return originalReadJsonWorkspace.apply(this, [
-                'workspace.json',
+                'angular.json',
                 {
                     // second arg is a host, only method used is readFile
                     readFile: () => JSON.stringify(workspaceConfiguration),

package/src/adapter/compat.js.map

@@ -1 +1 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"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"}

package/src/adapter/ngcli-adapter.d.ts

@@ -3,8 +3,6 @@ import { GenerateOptions } from '../command-line/generate';
 import { Tree } from '../generators/tree';
 import { FileBuffer } from '@angular-devkit/core/src/virtual-fs/host/interface';
 import { Observable } from 'rxjs';
-import { NxJsonConfiguration } from '../config/nx-json';
-import { RawProjectsConfigurations, ProjectsConfigurations } from '../config/workspace-json-project-json';
 export declare function scheduleTarget(root: string, opts: {
     project: string;
     target: string;
@@ -13,31 +11,14 @@ export declare function scheduleTarget(root: string, opts: {
 }, verbose: boolean): Promise<Observable<import('@angular-devkit/architect').BuilderOutput>>;
 export declare class NxScopedHost extends virtualFs.ScopedHost<any> {
     private root;
-    protected __nxInMemoryWorkspace: ProjectsConfigurations | null;
+    protected cachedConfigurationV1: any;
     constructor(root: string);
-    protected __readWorkspaceConfiguration: (configFileName: ChangeContext['actualConfigFileName'], overrides?: {
-        workspace?: Observable<RawProjectsConfigurations>;
-        nx?: Observable<NxJsonConfiguration>;
-    }) => Observable<FileBuffer>;
     read(path: Path): Observable<FileBuffer>;
     write(path: Path, content: FileBuffer): Observable<void>;
     isFile(path: Path): Observable<boolean>;
     exists(path: Path): Observable<boolean>;
-    workspaceConfigName(): Promise<string>;
-    protected context(path: string): Observable<ChangeContext>;
-    private writeWorkspaceConfiguration;
-    private __saveNxJsonProps;
-    private writeWorkspaceConfigFiles;
-    protected resolveInlineProjectConfigurations(config: RawProjectsConfigurations): Observable<ProjectsConfigurations>;
+    readExistingAngularJson(): Observable<any>;
 }
-declare type ConfigFilePath = ('/angular.json' | '/workspace.json') & {
-    __PRIVATE_DEVKIT_PATH: void;
-};
-declare type ChangeContext = {
-    isWorkspaceConfig: boolean;
-    actualConfigFileName: ConfigFilePath | null;
-    isNewFormat: boolean;
-};
 export declare class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
     private readonly host;
     constructor(root: string, host: Tree);
@@ -87,7 +68,7 @@ export declare function overrideCollectionResolutionForTesting(collections: {
  * ```typescript
  *   mockSchematicsForTesting({
  *     'mycollection:myschematic': (tree, params) => {
- *        tree.write('README.md');
+ *        tree.write("README.md");
  *     }
  *   });
  *
@@ -101,6 +82,4 @@ export declare function mockSchematicsForTesting(schematics: {
 export declare function wrapAngularDevkitSchematic(collectionName: string, generatorName: string): (host: Tree, generatorOptions: {
     [k: string]: any;
 }) => Promise<any>;
-export declare function invokeNew(root: string, opts: GenerateOptions, verbose: boolean): Promise<number>;
 export declare const getLogger: (isVerbose?: boolean) => logging.Logger;
-export {};