@nrwl/js 14.8.7 → 14.9.0-beta.1

package/src/migrations/update-14-0-0/exclude-jest-config-swcrc.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.excludeJestConfigSwcrc = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
 const path_1 = require("path");
 function excludeJestConfigSwcrc(tree) {
     (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (config, projectName) => {

package/src/migrations/update-14-0-0/exclude-jest-config-swcrc.js.map

@@ -1 +1 @@
-{"version":3,"file":"exclude-jest-config-swcrc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-14-0-0/exclude-jest-config-swcrc.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAE1E,iGAA8F;AAC9F,+BAA4B;AAE5B,SAAgB,sBAAsB,CAAC,IAAU;IAC/C,IAAA,+CAAsB,EACpB,IAAI,EACJ,cAAc,EACd,CAAC,MAA0B,EAAE,WAAW,EAAE,EAAE;QAC1C,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAE1D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;YAAE,OAAO;QAErC,IAAA,mBAAU,EACR,IAAI,EACJ,UAAU,EACV,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC;oBAC9B,gBAAgB;oBAChB,GAAG,IAAI,CAAC,OAAO;iBAChB,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;aACrC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,CACzB,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AA3BD,wDA2BC;AAED,kBAAe,sBAAsB,CAAC"}
+{"version":3,"file":"exclude-jest-config-swcrc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-14-0-0/exclude-jest-config-swcrc.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAC1E,+FAA4F;AAE5F,+BAA4B;AAE5B,SAAgB,sBAAsB,CAAC,IAAU;IAC/C,IAAA,+CAAsB,EACpB,IAAI,EACJ,cAAc,EACd,CAAC,MAA0B,EAAE,WAAW,EAAE,EAAE;QAC1C,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAE1D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;YAAE,OAAO;QAErC,IAAA,mBAAU,EACR,IAAI,EACJ,UAAU,EACV,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC;oBAC9B,gBAAgB;oBAChB,GAAG,IAAI,CAAC,OAAO;iBAChB,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;aACrC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,CACzB,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AA3BD,wDA2BC;AAED,kBAAe,sBAAsB,CAAC"}

package/src/migrations/update-14-1-5/update-swcrc-path.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSwcrcPath = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
 function updateSwcrcPath(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let changesMade = false;

package/src/migrations/update-14-1-5/update-swcrc-path.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-swcrc-path.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-14-1-5/update-swcrc-path.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,iGAA8F;AAK9F,SAAsB,eAAe,CAAC,IAAU;;QAC9C,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAA,+CAAsB,EACpB,IAAI,EACJ,cAAc,EACd,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;YAChD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAClE,MAAM,eAAe,GAA0B,iBAAiB;gBAC9D,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC;gBACrE,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YAE9C,IAAI,CAAC,eAAe,CAAC,SAAS;gBAAE,OAAO;YAEvC,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,eAAe,CAAC,SAAS,CAC1B,CAAC;YAEF,OAAO,eAAe,CAAC,SAAS,CAAC;YACjC,eAAe,CAAC,KAAK,GAAG,YAAY,CAAC;YAErC,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;YAE7D,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC,CACF,CAAC;QAEF,IAAI,WAAW,EAAE;YACf,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AA/BD,0CA+BC;AAED,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"update-swcrc-path.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-14-1-5/update-swcrc-path.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,+FAA4F;AAK5F,SAAsB,eAAe,CAAC,IAAU;;QAC9C,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAA,+CAAsB,EACpB,IAAI,EACJ,cAAc,EACd,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;YAChD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAClE,MAAM,eAAe,GAA0B,iBAAiB;gBAC9D,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC;gBACrE,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YAE9C,IAAI,CAAC,eAAe,CAAC,SAAS;gBAAE,OAAO;YAEvC,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,eAAe,CAAC,SAAS,CAC1B,CAAC;YAEF,OAAO,eAAe,CAAC,SAAS,CAAC;YACjC,eAAe,CAAC,KAAK,GAAG,YAAY,CAAC;YAErC,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;YAE7D,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC,CACF,CAAC;QAEF,IAAI,WAAW,EAAE;YACf,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AA/BD,0CA+BC;AAED,kBAAe,eAAe,CAAC"}

package/src/migrations/update-15-8-0/rename-swcrc-config.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-15-8-0/rename-swcrc-config.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let changesMade = false;
+        const projects = (0, devkit_1.getProjects)(tree);
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (_, projectName, target, configurationName) => {
+            const projectConfiguration = projects.get(projectName);
+            const executorOptions = configurationName
+                ? projectConfiguration.targets[target].configurations[configurationName]
+                : projectConfiguration.targets[target].options;
+            // if the project uses a custom path to swcrc file
+            // and only if it's the default name
+            if (executorOptions.swcrc &&
+                executorOptions.swcrc.includes('.lib.swcrc')) {
+                const newSwcrc = executorOptions.swcrc.replace('.lib.swcrc', '.swcrc');
+                // rename the swcrc file first
+                tree.rename(executorOptions.swcrc, newSwcrc);
+                // then update the executor options
+                executorOptions.swcrc = newSwcrc;
+                changesMade = true;
+            }
+            const libSwcrcPath = (0, devkit_1.joinPathFragments)(projectConfiguration.root, '.lib.swcrc') ||
+                (0, devkit_1.joinPathFragments)(projectConfiguration.sourceRoot, '.lib.swcrc');
+            const isLibSwcrcExist = tree.exists(libSwcrcPath);
+            if (isLibSwcrcExist) {
+                tree.rename(libSwcrcPath, libSwcrcPath.replace('.lib.swcrc', '.swcrc'));
+                changesMade = true;
+            }
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+        });
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (_, projectName, target, configurationName) => {
+            const projectConfiguration = projects.get(projectName);
+            const executorOptions = configurationName
+                ? projectConfiguration.targets[target].configurations[configurationName]
+                : projectConfiguration.targets[target].options;
+            const isJestConfigExist = executorOptions.jestConfig && tree.exists(executorOptions.jestConfig);
+            if (isJestConfigExist) {
+                const jestConfig = tree.read(executorOptions.jestConfig, 'utf-8');
+                const jsonParseNodes = tsquery_1.tsquery.query(jestConfig, ':matches(CallExpression:has(Identifier[name="JSON"]):has(Identifier[name="parse"]))');
+                if (jsonParseNodes.length) {
+                    // if we already assign false to swcrc, skip
+                    if (jestConfig.includes('.swcrc = false')) {
+                        return;
+                    }
+                    let updatedJestConfig = tsquery_1.tsquery.replace(jestConfig, 'CallExpression:has(Identifier[name="JSON"]):has(Identifier[name="parse"]) TemplateSpan', (templateSpan) => {
+                        if (templateSpan.literal.text === '/.lib.swcrc') {
+                            return templateSpan
+                                .getFullText()
+                                .replace('.lib.swcrc', '.swcrc');
+                        }
+                        return '';
+                    });
+                    updatedJestConfig = tsquery_1.tsquery.replace(updatedJestConfig, ':matches(ExportAssignment, BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"]))', (node) => {
+                        return `
+
+// disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves.
+// If we do not disable this, SWC Core will read .swcrc and won't transform our test files due to "exclude"
+if (swcJestConfig.swcrc === undefined) {
+  swcJestConfig.swcrc = false;
+}
+
+${node.getFullText()}
+`;
+                    });
+                    tree.write(executorOptions.jestConfig, updatedJestConfig);
+                    changesMade = true;
+                }
+            }
+        });
+        if (changesMade) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=rename-swcrc-config.js.map

package/src/migrations/update-15-8-0/rename-swcrc-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rename-swcrc-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-15-8-0/rename-swcrc-config.ts"],"names":[],"mappings":"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"}

package/src/utils/add-babel-inputs.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export declare function addBabelInputs(tree: Tree): Promise<void>;

package/src/utils/add-babel-inputs.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addBabelInputs = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+function addBabelInputs(tree) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const nxJson = (0, devkit_1.readNxJson)(tree);
+        let globalBabelFile = ['babel.config.js', 'babel.config.json'].find((file) => tree.exists(file));
+        if (!globalBabelFile) {
+            (0, devkit_1.writeJson)(tree, '/babel.config.json', {
+                babelrcRoots: ['*'], // Make sure .babelrc files other than root can be loaded in a monorepo
+            });
+            globalBabelFile = 'babel.config.json';
+        }
+        if ((_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.sharedGlobals) {
+            const sharedGlobalFileset = new Set(nxJson.namedInputs.sharedGlobals);
+            sharedGlobalFileset.add((0, devkit_1.joinPathFragments)('{workspaceRoot}', globalBabelFile));
+            nxJson.namedInputs.sharedGlobals = Array.from(sharedGlobalFileset);
+        }
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.addBabelInputs = addBabelInputs;
+//# sourceMappingURL=add-babel-inputs.js.map

package/src/utils/add-babel-inputs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-babel-inputs.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/add-babel-inputs.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAEtB,SAAsB,cAAc,CAAC,IAAU;;;QAC7C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAI,eAAe,GAAG,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAClB,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE;YACpB,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE;gBACpC,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,uEAAuE;aAC7F,CAAC,CAAC;YACH,eAAe,GAAG,mBAAmB,CAAC;SACvC;QAED,IAAI,MAAA,MAAM,CAAC,WAAW,0CAAE,aAAa,EAAE;YACrC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YACtE,mBAAmB,CAAC,GAAG,CACrB,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,eAAe,CAAC,CACtD,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SACpE;QAED,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAxBD,wCAwBC"}

package/src/utils/assets/copy-assets-handler.d.ts

@@ -1,5 +1,5 @@
 import { AssetGlob } from '@nrwl/workspace/src/utilities/assets';
-export declare type FileEventType = 'create' | 'update' | 'delete';
+export type FileEventType = 'create' | 'update' | 'delete';
 export interface FileEvent {
     type: FileEventType;
     src: string;
@@ -22,7 +22,7 @@ export declare class CopyAssetsHandler {
     private readonly callback;
     constructor(opts: CopyAssetHandlerOptions);
     processAllAssetsOnce(): Promise<void>;
-    watchAndProcessOnAssetChange(): Promise<() => Promise<void>>;
+    watchAndProcessOnAssetChange(): Promise<() => void>;
     private processEvents;
 }
 export {};

package/src/utils/assets/copy-assets-handler.js

@@ -8,6 +8,7 @@ const fse = require("fs-extra");
 const ignore_1 = require("ignore");
 const fg = require("fast-glob");
 const devkit_1 = require("@nrwl/devkit");
+const client_1 = require("nx/src/daemon/client/client");
 const defaultFileEventHandler = (events) => {
     const dirs = new Set(events.map((event) => path.dirname(event.dest)));
     dirs.forEach((d) => fse.ensureDirSync(d));
@@ -104,17 +105,23 @@ class CopyAssetsHandler {
     }
     watchAndProcessOnAssetChange() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const watcher = yield Promise.resolve().then(() => require('@parcel/watcher'));
-            const subscription = yield watcher.subscribe(this.rootDir, (err, events) => {
+            const unregisterFileWatcher = yield client_1.daemonClient.registerFileWatcher({
+                watchProjects: 'all',
+                includeGlobalWorkspaceFiles: true,
+            }, (err, data) => {
                 var _a;
-                if (err) {
+                if (err === 'closed') {
+                    devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+                    process.exit(1);
+                }
+                else if (err) {
                     devkit_1.logger.error(`Watch error: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : 'Unknown'}`);
                 }
                 else {
-                    this.processEvents(events);
+                    this.processEvents(data.changedFiles);
                 }
             });
-            return () => subscription.unsubscribe();
+            return () => unregisterFileWatcher();
         });
     }
     processEvents(events) {

package/src/utils/assets/copy-assets-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"copy-assets-handler.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":";;;;AACA,uCAAuC;AACvC,6BAA6B;AAC7B,gCAAgC;AAChC,mCAAwC;AACxC,gCAAgC;AAEhC,yCAAsC;AA0B/B,MAAM,uBAAuB,GAAG,CAAC,MAAmB,EAAE,EAAE;IAC7D,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YACtD,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBACrC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;aACzC;SACF;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAClC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SAC5B;aAAM;YACL,eAAM,CAAC,KAAK,CAAC,uBAAuB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,uBAAuB,2BAclC;AAEF,MAAa,iBAAiB;IAQ5B,YAAY,IAA6B;;QACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,MAAA,IAAI,CAAC,QAAQ,mCAAI,+BAAuB,CAAC;QAEzD,oDAAoD;QACpD,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACtD,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1D,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEzD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACtC,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,IAAI,OAAe,CAAC;YACpB,qEAAqE;YACrE,IAAI,KAAa,CAAC;YAClB,IAAI,MAAc,CAAC;YACnB,IAAI,MAAM,GAAoB,IAAI,CAAC;YACnC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;gBACzB,OAAO,GAAG,CAAC,CAAC;gBACZ,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;gBACrD,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;aACtD;iBAAM;gBACL,MAAM,GAAG,IAAI,CAAC;gBACd,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;gBACrC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;gBAChB,MAAM,GAAG,IAAI,CAAC,IAAI,CAChB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAC3C,CAAC,CAAC,MAAM,CACT,CAAC;gBACF,IAAI,CAAC,CAAC,MAAM;oBAAE,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;aACrE;YACD,OAAO;gBACL,MAAM;gBACN,KAAK;gBACL,OAAO;gBACP,MAAM;gBACN,MAAM;aACP,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAEK,oBAAoB;;YACxB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAO,EAAE,EAAE,EAAE;gBAC/B,IAAI,OAAe,CAAC;gBACpB,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;oBAC1B,OAAO,GAAG,EAAE,CAAC;iBACd;qBAAM;oBACL,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;iBACtB;gBAED,qCAAqC;gBACrC,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;oBAClD,GAAG,EAAE,IAAI,CAAC,OAAO;oBACjB,GAAG,EAAE,IAAI,EAAE,sBAAsB;iBAClC,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,CACX,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;oBACxB,IACE,CAAC,CAAA,MAAA,EAAE,CAAC,MAAM,0CAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;wBAC5C,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EACzB;wBACA,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;wBAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;wBACtD,GAAG,CAAC,IAAI,CAAC;4BACP,IAAI,EAAE,QAAQ;4BACd,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC;4BACjC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC;yBAC/C,CAAC,CAAC;qBACJ;oBACD,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;YACJ,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEK,4BAA4B;;YAChC,MAAM,OAAO,GAAG,2CAAa,iBAAiB,EAAC,CAAC;YAChD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,SAAS,CAC1C,IAAI,CAAC,OAAO,EACZ,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;;gBACd,IAAI,GAAG,EAAE;oBACP,eAAM,CAAC,KAAK,CAAC,gBAAgB,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,mCAAI,SAAS,EAAE,CAAC,CAAC;iBAC3D;qBAAM;oBACL,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;iBAC5B;YACH,CAAC,CACF,CAAC;YAEF,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAC1C,CAAC;KAAA;IAEa,aAAa,CAAC,MAAe;;;YACzC,MAAM,UAAU,GAAgB,EAAE,CAAC;YACnC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC7D,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE;oBAChC,IACE,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,OAAO,CAAC;wBACnC,CAAC,CAAA,MAAA,EAAE,CAAC,MAAM,0CAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAA;wBACrD,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAClC;wBACA,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;wBACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;wBACnE,UAAU,CAAC,IAAI,CAAC;4BACd,IAAI,EAAE,KAAK,CAAC,IAAI;4BAChB,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC;4BAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;yBACnD,CAAC,CAAC;wBACH,qDAAqD;wBACrD,MAAM;qBACP;iBACF;aACF;YAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;gBAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;;KACtD;CACF;AApID,8CAoIC"}
+{"version":3,"file":"copy-assets-handler.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":"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"}

package/src/utils/assets/index.js

@@ -6,28 +6,25 @@ const copy_assets_handler_1 = require("./copy-assets-handler");
 function copyAssets(options, context) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const assetHandler = new copy_assets_handler_1.CopyAssetsHandler({
-            projectDir: context.workspace.projects[context.projectName].root,
+            projectDir: context.projectsConfigurations.projects[context.projectName].root,
             rootDir: context.root,
             outputDir: options.outputPath,
             assets: options.assets,
             callback: typeof (options === null || options === void 0 ? void 0 : options.watch) === 'object' ? options.watch.onCopy : undefined,
         });
+        const result = {
+            success: true,
+        };
         if (options.watch) {
-            const dispose = yield assetHandler.watchAndProcessOnAssetChange();
-            return {
-                success: true,
-                stop: dispose,
-            };
+            result.stop = yield assetHandler.watchAndProcessOnAssetChange();
         }
-        else {
-            try {
-                yield assetHandler.processAllAssetsOnce();
-            }
-            catch (_a) {
-                return { success: false };
-            }
-            return { success: true };
+        try {
+            yield assetHandler.processAllAssetsOnce();
         }
+        catch (_a) {
+            result.success = false;
+        }
+        return result;
     });
 }
 exports.copyAssets = copyAssets;

package/src/utils/assets/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/index.ts"],"names":[],"mappings":";;;;AACA,+DAAqE;AAmBrE,SAAsB,UAAU,CAC9B,OAA0B,EAC1B,OAAwB;;QAExB,MAAM,YAAY,GAAG,IAAI,uCAAiB,CAAC;YACzC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI;YAChE,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,SAAS,EAAE,OAAO,CAAC,UAAU;YAC7B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EACN,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;SACxE,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,4BAA4B,EAAE,CAAC;YAClE,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,OAAO;aACd,CAAC;SACH;aAAM;YACL,IAAI;gBACF,MAAM,YAAY,CAAC,oBAAoB,EAAE,CAAC;aAC3C;YAAC,WAAM;gBACN,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;aAC3B;YACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;IACH,CAAC;CAAA;AA1BD,gCA0BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/index.ts"],"names":[],"mappings":";;;;AACA,+DAAqE;AAmBrE,SAAsB,UAAU,CAC9B,OAA0B,EAC1B,OAAwB;;QAExB,MAAM,YAAY,GAAG,IAAI,uCAAiB,CAAC;YACzC,UAAU,EACR,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI;YACnE,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,SAAS,EAAE,OAAO,CAAC,UAAU;YAC7B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EACN,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;SACxE,CAAC,CAAC;QACH,MAAM,MAAM,GAAqB;YAC/B,OAAO,EAAE,IAAI;SACd,CAAC;QAEF,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,MAAM,CAAC,IAAI,GAAG,MAAM,YAAY,CAAC,4BAA4B,EAAE,CAAC;SACjE;QAED,IAAI;YACF,MAAM,YAAY,CAAC,oBAAoB,EAAE,CAAC;SAC3C;QAAC,WAAM;YACN,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC;SACxB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CAAA;AA5BD,gCA4BC"}

package/src/utils/buildable-libs-utils.d.ts

@@ -0,0 +1,32 @@
+import type { ProjectGraph, ProjectGraphProjectNode } from '@nrwl/devkit';
+import { ProjectGraphExternalNode } from '@nrwl/devkit';
+import type * as ts from 'typescript';
+export type DependentBuildableProjectNode = {
+    name: string;
+    outputs: string[];
+    node: ProjectGraphProjectNode | ProjectGraphExternalNode;
+};
+export declare function calculateProjectDependencies(projGraph: ProjectGraph, root: string, projectName: string, targetName: string, configurationName: string, shallow?: boolean): {
+    target: ProjectGraphProjectNode;
+    dependencies: DependentBuildableProjectNode[];
+    nonBuildableDependencies: string[];
+    topLevelDependencies: DependentBuildableProjectNode[];
+};
+/**
+ * Util function to create tsconfig compilerOptions object with support for workspace libs paths.
+ *
+ *
+ *
+ * @param tsConfig String of config path or object parsed via ts.parseJsonConfigFileContent.
+ * @param dependencies Dependencies calculated by Nx.
+ */
+export declare function computeCompilerOptionsPaths(tsConfig: string | ts.ParsedCommandLine, dependencies: DependentBuildableProjectNode[]): ts.MapLike<string[]>;
+export declare function createTmpTsConfig(tsconfigPath: string, workspaceRoot: string, projectRoot: string, dependencies: DependentBuildableProjectNode[]): string;
+export declare function checkDependentProjectsHaveBeenBuilt(root: string, projectName: string, targetName: string, projectDependencies: DependentBuildableProjectNode[]): boolean;
+export declare function findMissingBuildDependencies(root: string, projectName: string, targetName: string, projectDependencies: DependentBuildableProjectNode[]): DependentBuildableProjectNode[];
+export declare function updatePaths(dependencies: DependentBuildableProjectNode[], paths: Record<string, string[]>): void;
+/**
+ * Updates the peerDependencies section in the `dist/lib/xyz/package.json` with
+ * the proper dependency and version
+ */
+export declare function updateBuildableProjectPackageJsonDependencies(root: string, projectName: string, targetName: string, configurationName: string, node: ProjectGraphProjectNode, dependencies: DependentBuildableProjectNode[], typeOfDependency?: 'dependencies' | 'peerDependencies'): void;

package/src/utils/buildable-libs-utils.js

@@ -0,0 +1,309 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateBuildableProjectPackageJsonDependencies = exports.updatePaths = exports.findMissingBuildDependencies = exports.checkDependentProjectsHaveBeenBuilt = exports.createTmpTsConfig = exports.computeCompilerOptionsPaths = exports.calculateProjectDependencies = void 0;
+const path_1 = require("path");
+const fileutils_1 = require("nx/src/utils/fileutils");
+const devkit_1 = require("@nrwl/devkit");
+const fs_1 = require("fs");
+const output_1 = require("nx/src/utils/output");
+const operators_1 = require("nx/src/project-graph/operators");
+const ensure_typescript_1 = require("./typescript/ensure-typescript");
+let tsModule;
+function isBuildable(target, node) {
+    return (node.data.targets &&
+        node.data.targets[target] &&
+        node.data.targets[target].executor !== '');
+}
+function calculateProjectDependencies(projGraph, root, projectName, targetName, configurationName, shallow) {
+    const target = projGraph.nodes[projectName];
+    // gather the library dependencies
+    const nonBuildableDependencies = [];
+    const topLevelDependencies = [];
+    const collectedDeps = collectDependencies(projectName, projGraph, [], shallow);
+    const missing = collectedDeps.reduce((missing, { name: dep }) => {
+        const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep];
+        if (!depNode) {
+            missing = missing || [];
+            missing.push(dep);
+        }
+        return missing;
+    }, null);
+    if (missing) {
+        throw new Error(`Unable to find ${missing.join(', ')} in project graph.`);
+    }
+    const dependencies = collectedDeps
+        .map(({ name: dep, isTopLevel }) => {
+        let project = null;
+        const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep];
+        if (depNode.type === 'lib') {
+            if (isBuildable(targetName, depNode)) {
+                const libPackageJsonPath = (0, path_1.join)(root, depNode.data.root, 'package.json');
+                project = {
+                    name: (0, fileutils_1.fileExists)(libPackageJsonPath)
+                        ? (0, devkit_1.readJsonFile)(libPackageJsonPath).name // i.e. @workspace/mylib
+                        : dep,
+                    outputs: (0, devkit_1.getOutputsForTargetAndConfiguration)({
+                        overrides: {},
+                        target: {
+                            project: projectName,
+                            target: targetName,
+                            configuration: configurationName,
+                        },
+                    }, depNode),
+                    node: depNode,
+                };
+            }
+            else {
+                nonBuildableDependencies.push(dep);
+            }
+        }
+        else if (depNode.type === 'npm') {
+            project = {
+                name: depNode.data.packageName,
+                outputs: [],
+                node: depNode,
+            };
+        }
+        if (project && isTopLevel) {
+            topLevelDependencies.push(project);
+        }
+        return project;
+    })
+        .filter((x) => !!x);
+    dependencies.sort((a, b) => (a.name > b.name ? 1 : b.name > a.name ? -1 : 0));
+    return {
+        target,
+        dependencies,
+        nonBuildableDependencies,
+        topLevelDependencies,
+    };
+}
+exports.calculateProjectDependencies = calculateProjectDependencies;
+function collectDependencies(project, projGraph, acc, shallow, areTopLevelDeps = true) {
+    (projGraph.dependencies[project] || []).forEach((dependency) => {
+        if (!acc.some((dep) => dep.name === dependency.target)) {
+            // Temporary skip this. Currently the set of external nodes is built from package.json, not lock file.
+            // As a result, some nodes might be missing. This should not cause any issues, we can just skip them.
+            if (dependency.target.startsWith('npm:') &&
+                !projGraph.externalNodes[dependency.target])
+                return;
+            acc.push({ name: dependency.target, isTopLevel: areTopLevelDeps });
+            const isInternalTarget = projGraph.nodes[dependency.target];
+            if (!shallow && isInternalTarget) {
+                collectDependencies(dependency.target, projGraph, acc, shallow, false);
+            }
+        }
+    });
+    return acc;
+}
+function readTsConfigWithRemappedPaths(tsConfig, generatedTsConfigPath, dependencies) {
+    const generatedTsConfig = { compilerOptions: {} };
+    generatedTsConfig.extends = (0, path_1.relative)((0, path_1.dirname)(generatedTsConfigPath), tsConfig);
+    generatedTsConfig.compilerOptions.paths = computeCompilerOptionsPaths(tsConfig, dependencies);
+    if (process.env.NX_VERBOSE_LOGGING_PATH_MAPPINGS === 'true') {
+        output_1.output.log({
+            title: 'TypeScript path mappings have been rewritten.',
+        });
+        console.log(JSON.stringify(generatedTsConfig.compilerOptions.paths, null, 2));
+    }
+    return generatedTsConfig;
+}
+/**
+ * Util function to create tsconfig compilerOptions object with support for workspace libs paths.
+ *
+ *
+ *
+ * @param tsConfig String of config path or object parsed via ts.parseJsonConfigFileContent.
+ * @param dependencies Dependencies calculated by Nx.
+ */
+function computeCompilerOptionsPaths(tsConfig, dependencies) {
+    const paths = readPaths(tsConfig) || {};
+    updatePaths(dependencies, paths);
+    return paths;
+}
+exports.computeCompilerOptionsPaths = computeCompilerOptionsPaths;
+function readPaths(tsConfig) {
+    var _a;
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    try {
+        let config;
+        if (typeof tsConfig === 'string') {
+            const configFile = tsModule.readConfigFile(tsConfig, tsModule.sys.readFile);
+            config = tsModule.parseJsonConfigFileContent(configFile.config, tsModule.sys, (0, path_1.dirname)(tsConfig));
+        }
+        else {
+            config = tsConfig;
+        }
+        if ((_a = config.options) === null || _a === void 0 ? void 0 : _a.paths) {
+            return config.options.paths;
+        }
+        else {
+            return null;
+        }
+    }
+    catch (e) {
+        return null;
+    }
+}
+function createTmpTsConfig(tsconfigPath, workspaceRoot, projectRoot, dependencies) {
+    const tmpTsConfigPath = (0, path_1.join)(workspaceRoot, 'tmp', projectRoot, 'tsconfig.generated.json');
+    const parsedTSConfig = readTsConfigWithRemappedPaths(tsconfigPath, tmpTsConfigPath, dependencies);
+    process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath));
+    (0, devkit_1.writeJsonFile)(tmpTsConfigPath, parsedTSConfig);
+    return (0, path_1.join)(tmpTsConfigPath);
+}
+exports.createTmpTsConfig = createTmpTsConfig;
+function cleanupTmpTsConfigFile(tmpTsConfigPath) {
+    try {
+        if (tmpTsConfigPath) {
+            (0, fs_1.unlinkSync)(tmpTsConfigPath);
+        }
+    }
+    catch (e) { }
+}
+function checkDependentProjectsHaveBeenBuilt(root, projectName, targetName, projectDependencies) {
+    const missing = findMissingBuildDependencies(root, projectName, targetName, projectDependencies);
+    if (missing.length > 0) {
+        console.error((0, devkit_1.stripIndents) `
+      It looks like all of ${projectName}'s dependencies have not been built yet:
+      ${missing.map((x) => ` - ${x.node.name}`).join('\n')}
+
+      You might be missing a "targetDefaults" configuration in your root nx.json (https://nx.dev/reference/project-configuration#target-defaults),
+      or "dependsOn" configured in ${projectName}'s project.json (https://nx.dev/reference/project-configuration#dependson) 
+    `);
+        return false;
+    }
+    else {
+        return true;
+    }
+}
+exports.checkDependentProjectsHaveBeenBuilt = checkDependentProjectsHaveBeenBuilt;
+function findMissingBuildDependencies(root, projectName, targetName, projectDependencies) {
+    const depLibsToBuildFirst = [];
+    // verify whether all dependent libraries have been built
+    projectDependencies.forEach((dep) => {
+        if (dep.node.type !== 'lib') {
+            return;
+        }
+        const paths = dep.outputs.map((p) => (0, path_1.join)(root, p));
+        if (!paths.some(fileutils_1.directoryExists)) {
+            depLibsToBuildFirst.push(dep);
+        }
+    });
+    return depLibsToBuildFirst;
+}
+exports.findMissingBuildDependencies = findMissingBuildDependencies;
+function updatePaths(dependencies, paths) {
+    const pathsKeys = Object.keys(paths);
+    // For each registered dependency
+    dependencies.forEach((dep) => {
+        var _a;
+        // If there are outputs
+        if (dep.outputs && dep.outputs.length > 0) {
+            // Directly map the dependency name to the output paths (dist/packages/..., etc.)
+            paths[dep.name] = dep.outputs;
+            // check for secondary entrypoints
+            // For each registered path
+            for (const path of pathsKeys) {
+                const nestedName = `${dep.name}/`;
+                // If the path points to the current dependency and is nested (/)
+                if (path.startsWith(nestedName)) {
+                    const nestedPart = path.slice(nestedName.length);
+                    // Bind secondary endpoints for ng-packagr projects
+                    let mappedPaths = dep.outputs.map((output) => `${output}/${nestedPart}`);
+                    // Get the dependency's package name
+                    const { root } = (((_a = dep.node) === null || _a === void 0 ? void 0 : _a.data) || {});
+                    if (root) {
+                        // Update nested mappings to point to the dependency's output paths
+                        mappedPaths = mappedPaths.concat(paths[path].flatMap((path) => dep.outputs.map((output) => path.replace(root, output))));
+                    }
+                    paths[path] = mappedPaths;
+                }
+            }
+        }
+    });
+}
+exports.updatePaths = updatePaths;
+/**
+ * Updates the peerDependencies section in the `dist/lib/xyz/package.json` with
+ * the proper dependency and version
+ */
+function updateBuildableProjectPackageJsonDependencies(root, projectName, targetName, configurationName, node, dependencies, typeOfDependency = 'dependencies') {
+    const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
+        overrides: {},
+        target: {
+            project: projectName,
+            target: targetName,
+            configuration: configurationName,
+        },
+    }, node);
+    const packageJsonPath = `${outputs[0]}/package.json`;
+    let packageJson;
+    let workspacePackageJson;
+    try {
+        packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
+        workspacePackageJson = (0, devkit_1.readJsonFile)(`${root}/package.json`);
+    }
+    catch (e) {
+        // cannot find or invalid package.json
+        return;
+    }
+    packageJson.dependencies = packageJson.dependencies || {};
+    packageJson.peerDependencies = packageJson.peerDependencies || {};
+    let updatePackageJson = false;
+    dependencies.forEach((entry) => {
+        var _a;
+        const packageName = (0, operators_1.isNpmProject)(entry.node)
+            ? entry.node.data.packageName
+            : entry.name;
+        if (!hasDependency(packageJson, 'dependencies', packageName) &&
+            !hasDependency(packageJson, 'devDependencies', packageName) &&
+            !hasDependency(packageJson, 'peerDependencies', packageName)) {
+            try {
+                let depVersion;
+                if (entry.node.type === 'lib') {
+                    const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
+                        overrides: {},
+                        target: {
+                            project: projectName,
+                            target: targetName,
+                            configuration: configurationName,
+                        },
+                    }, entry.node);
+                    const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
+                    depVersion = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
+                    packageJson[typeOfDependency][packageName] = depVersion;
+                }
+                else if ((0, operators_1.isNpmProject)(entry.node)) {
+                    // If an npm dep is part of the workspace devDependencies, do not include it the library
+                    if (!!((_a = workspacePackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[entry.node.data.packageName])) {
+                        return;
+                    }
+                    depVersion = entry.node.data.version;
+                    packageJson[typeOfDependency][entry.node.data.packageName] =
+                        depVersion;
+                }
+                updatePackageJson = true;
+            }
+            catch (e) {
+                // skip if cannot find package.json
+            }
+        }
+    });
+    if (updatePackageJson) {
+        (0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
+    }
+}
+exports.updateBuildableProjectPackageJsonDependencies = updateBuildableProjectPackageJsonDependencies;
+// verify whether the package.json already specifies the dep
+function hasDependency(outputJson, depConfigName, packageName) {
+    if (outputJson[depConfigName]) {
+        return outputJson[depConfigName][packageName];
+    }
+    else {
+        return false;
+    }
+}
+//# sourceMappingURL=buildable-libs-utils.js.map