nx 18.3.0-canary.20240410-7a7cbec → 18.3.0-canary.20240412-d1584f8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.3.0-canary.20240410-7a7cbec",
+  "version": "18.3.0-canary.20240412-d1584f8",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.3.0-canary.20240410-7a7cbec"
+    "@nrwl/tao": "18.3.0-canary.20240412-d1584f8"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.3.0-canary.20240410-7a7cbec",
-    "@nx/nx-darwin-arm64": "18.3.0-canary.20240410-7a7cbec",
-    "@nx/nx-linux-x64-gnu": "18.3.0-canary.20240410-7a7cbec",
-    "@nx/nx-linux-x64-musl": "18.3.0-canary.20240410-7a7cbec",
-    "@nx/nx-win32-x64-msvc": "18.3.0-canary.20240410-7a7cbec",
-    "@nx/nx-linux-arm64-gnu": "18.3.0-canary.20240410-7a7cbec",
-    "@nx/nx-linux-arm64-musl": "18.3.0-canary.20240410-7a7cbec",
-    "@nx/nx-linux-arm-gnueabihf": "18.3.0-canary.20240410-7a7cbec",
-    "@nx/nx-win32-arm64-msvc": "18.3.0-canary.20240410-7a7cbec",
-    "@nx/nx-freebsd-x64": "18.3.0-canary.20240410-7a7cbec"
+    "@nx/nx-darwin-x64": "18.3.0-canary.20240412-d1584f8",
+    "@nx/nx-darwin-arm64": "18.3.0-canary.20240412-d1584f8",
+    "@nx/nx-linux-x64-gnu": "18.3.0-canary.20240412-d1584f8",
+    "@nx/nx-linux-x64-musl": "18.3.0-canary.20240412-d1584f8",
+    "@nx/nx-win32-x64-msvc": "18.3.0-canary.20240412-d1584f8",
+    "@nx/nx-linux-arm64-gnu": "18.3.0-canary.20240412-d1584f8",
+    "@nx/nx-linux-arm64-musl": "18.3.0-canary.20240412-d1584f8",
+    "@nx/nx-linux-arm-gnueabihf": "18.3.0-canary.20240412-d1584f8",
+    "@nx/nx-win32-arm64-msvc": "18.3.0-canary.20240412-d1584f8",
+    "@nx/nx-freebsd-x64": "18.3.0-canary.20240412-d1584f8"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import type { GenerateOptions } from '../command-line/generate/generate';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { Tree } from '../generators/tree';
-import { ExecutorContext } from '../config/misc-interfaces';
+import { ExecutorContext, GeneratorCallback } from '../config/misc-interfaces';
 export declare function createBuilderContext(builderInfo: {
     builderName: string;
     description: string;
@@ -85,6 +85,6 @@ export declare function mockSchematicsForTesting(schematics: {
 }): void;
 export declare function wrapAngularDevkitSchematic(collectionName: string, generatorName: string): (host: Tree, generatorOptions: {
     [k: string]: any;
-}) => Promise<any>;
+}) => Promise<GeneratorCallback>;
 export declare const getLogger: (isVerbose?: boolean) => logging.Logger;
 export {};

package/src/adapter/ngcli-adapter.js

@@ -655,15 +655,6 @@ function wrapAngularDevkitSchematic(collectionName, generatorName) {
             mockedSchematics[`${collectionName}:${generatorName}`]) {
             return await mockedSchematics[`${collectionName}:${generatorName}`](host, generatorOptions);
         }
-        const emptyLogger = {
-            log: (e) => { },
-            info: (e) => { },
-            warn: (e) => { },
-            debug: () => { },
-            error: (e) => { },
-            fatal: (e) => { },
-        };
-        emptyLogger.createChild = () => emptyLogger;
         const recorder = (event) => {
             let eventPath = event.path.startsWith('/')
                 ? event.path.slice(1)
@@ -690,6 +681,7 @@ function wrapAngularDevkitSchematic(collectionName, generatorName) {
             }
         };
         const fsHost = new NxScopeHostUsedForWrappedSchematics(host.root, host);
+        const logger = (0, exports.getLogger)(generatorOptions.verbose);
         const options = {
             generatorOptions,
             dryRun: true,
@@ -717,10 +709,18 @@ function wrapAngularDevkitSchematic(collectionName, generatorName) {
         }
         const collection = getCollection(workflow, collectionName);
         const schematic = collection.createSchematic(generatorName, true);
-        const res = await runSchematic(fsHost, host.root, workflow, emptyLogger, options, schematic, false, recorder);
+        const res = await runSchematic(fsHost, host.root, workflow, logger, options, schematic, false, recorder);
         if (res.status !== 0) {
             throw new Error(res.loggingQueue.join('\n'));
         }
+        const { lastValueFrom } = require('rxjs');
+        const toPromise = (obs) => lastValueFrom ? lastValueFrom(obs) : obs.toPromise();
+        return async () => {
+            // https://github.com/angular/angular-cli/blob/344193f79d880177e421cff85dd3e94338d07420/packages/angular_devkit/schematics/src/workflow/base.ts#L194-L200
+            await toPromise(workflow.engine
+                .executePostTasks()
+                .pipe((0, operators_1.defaultIfEmpty)(undefined), (0, operators_1.last)()));
+        };
     };
 }
 exports.wrapAngularDevkitSchematic = wrapAngularDevkitSchematic;

package/src/core/graph/3rdpartylicenses.txt

@@ -212,6 +212,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+core-js
+MIT
+Copyright (c) 2014-2024 Denis Pushkarev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 cytoscape
 MIT
 Copyright (c) 2016-2022, The Cytoscape Consortium.
@@ -681,32 +704,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-tabbable
-MIT
-The MIT License (MIT)
-
-Copyright (c) 2015 David Clark
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-
 toggle-selection
 MIT