@nx/js 16.6.0-beta.4 → 16.6.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.6.0-beta.4",
+  "version": "16.6.0-beta.6",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -32,16 +32,16 @@
   "executors": "./executors.json",
   "builders": "./executors.json",
   "dependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-decorators": "^7.14.5",
-    "@babel/plugin-transform-runtime": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/preset-typescript": "^7.15.0",
-    "@babel/runtime": "^7.14.8",
-    "@nrwl/js": "16.6.0-beta.4",
-    "@nx/devkit": "16.6.0-beta.4",
-    "@nx/workspace": "16.6.0-beta.4",
+    "@babel/core": "^7.22.9",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.22.7",
+    "@babel/plugin-transform-runtime": "^7.22.9",
+    "@babel/preset-env": "^7.22.9",
+    "@babel/preset-typescript": "^7.22.5",
+    "@babel/runtime": "^7.22.6",
+    "@nrwl/js": "16.6.0-beta.6",
+    "@nx/devkit": "16.6.0-beta.6",
+    "@nx/workspace": "16.6.0-beta.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -71,5 +71,5 @@
     "access": "public"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "b1a9ae7ce76697019b26ec9a172005840cca8da6"
+  "gitHead": "9aad21dbfb2b659e488b6626f59df58ab23c0032"
 }

package/src/executors/node/node.impl.js

@@ -229,7 +229,7 @@ function getExecArgv(options) {
 }
 function calculateResolveMappings(context, options) {
     const parsed = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
-    const { dependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, parsed.project, parsed.target, parsed.configuration);
+    const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, parsed.project, parsed.target, parsed.configuration);
     return dependencies.reduce((m, c) => {
         if (c.node.type !== 'npm' && c.outputs[0] != null) {
             m[c.name] = (0, devkit_1.joinPathFragments)(context.root, c.outputs[0]);

package/src/executors/tsc/lib/batch/build-task-info-per-tsconfig-map.js

@@ -45,7 +45,7 @@ function createTaskInfo(taskName, taskOptions, context, tsConfig) {
         outputDir: taskOptions.outputPath,
         assets: taskOptions.assets,
     });
-    const { target: projectGraphNode, dependencies: buildableProjectNodeDependencies, } = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.taskGraph.tasks[taskName].target.project, context.taskGraph.tasks[taskName].target.target, context.taskGraph.tasks[taskName].target.configuration);
+    const { target: projectGraphNode, dependencies: buildableProjectNodeDependencies, } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.taskGraph.tasks[taskName].target.project, context.taskGraph.tasks[taskName].target.target, context.taskGraph.tasks[taskName].target.configuration);
     return {
         task: taskName,
         options: taskOptions,

package/src/generators/library/library.js

@@ -77,6 +77,9 @@ function projectGenerator(tree, schema, destinationDir, filesDir) {
                 (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
             ]);
         }
+        if (options.bundler !== 'none') {
+            addBundlerDependencies(tree, options);
+        }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
@@ -165,6 +168,17 @@ function addLint(tree, options) {
     });
 }
 exports.addLint = addLint;
+function addBundlerDependencies(tree, options) {
+    (0, devkit_1.updateJson)(tree, `${options.projectRoot}/package.json`, (json) => {
+        if (options.bundler === 'tsc') {
+            json.dependencies = Object.assign(Object.assign({}, json.dependencies), { tslib: versions_1.tsLibVersion });
+        }
+        else if (options.bundler === 'swc') {
+            json.dependencies = Object.assign(Object.assign({}, json.dependencies), { '@swc/helpers': versions_1.swcHelpersVersion });
+        }
+        return json;
+    });
+}
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'tsconfig.json'), (json) => {
         if (options.strict) {
@@ -281,7 +295,7 @@ function normalizeOptions(tree, options, destinationDir) {
      * Now, the only way to get a non-buildble library is to set bundler to none.
      * By default, with nothing provided, libraries are buildable with `@nx/js:tsc`.
      */
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     options.bundler = (_b = (_a = options.bundler) !== null && _a !== void 0 ? _a : options.compiler) !== null && _b !== void 0 ? _b : 'tsc';
     // ensure programmatic runs have an expected default
     if (!options.config) {
@@ -335,8 +349,10 @@ function normalizeOptions(tree, options, destinationDir) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const importPath = options.importPath || (0, get_import_path_1.getImportPath)(tree, projectDirectory);
-    (_c = options.minimal) !== null && _c !== void 0 ? _c : (options.minimal = false);
+    const importPath = options.rootProject
+        ? (_c = (0, devkit_1.readJson)(tree, 'package.json').name) !== null && _c !== void 0 ? _c : (0, get_import_path_1.getImportPath)(tree, 'core')
+        : options.importPath || (0, get_import_path_1.getImportPath)(tree, projectDirectory);
+    (_d = options.minimal) !== null && _d !== void 0 ? _d : (options.minimal = false);
     return Object.assign(Object.assign({}, options), { fileName, name: projectName, projectRoot,
         projectDirectory,
         parsedTags,

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

@@ -1,17 +1,28 @@
-import type { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
-import { ProjectGraphExternalNode } from '@nx/devkit';
+import type { ProjectGraph, ProjectGraphExternalNode, ProjectGraphProjectNode, TaskGraph } from '@nx/devkit';
 import type * as ts from 'typescript';
 export type DependentBuildableProjectNode = {
     name: string;
     outputs: string[];
     node: ProjectGraphProjectNode | ProjectGraphExternalNode;
 };
+export declare function calculateProjectBuildableDependencies(taskGraph: TaskGraph | undefined, projGraph: ProjectGraph, root: string, projectName: string, targetName: string, configurationName: string, shallow?: boolean): {
+    target: ProjectGraphProjectNode;
+    dependencies: DependentBuildableProjectNode[];
+    nonBuildableDependencies: string[];
+    topLevelDependencies: DependentBuildableProjectNode[];
+};
 export declare function calculateProjectDependencies(projGraph: ProjectGraph, root: string, projectName: string, targetName: string, configurationName: string, shallow?: boolean): {
     target: ProjectGraphProjectNode;
     dependencies: DependentBuildableProjectNode[];
     nonBuildableDependencies: string[];
     topLevelDependencies: DependentBuildableProjectNode[];
 };
+export declare function calculateDependenciesFromTaskGraph(taskGraph: TaskGraph, projectGraph: 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.
  *

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

@@ -1,19 +1,25 @@
 "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");
+exports.updateBuildableProjectPackageJsonDependencies = exports.updatePaths = exports.findMissingBuildDependencies = exports.checkDependentProjectsHaveBeenBuilt = exports.createTmpTsConfig = exports.computeCompilerOptionsPaths = exports.calculateDependenciesFromTaskGraph = exports.calculateProjectDependencies = exports.calculateProjectBuildableDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
-const output_1 = require("nx/src/utils/output");
 const operators_1 = require("nx/src/project-graph/operators");
+const fileutils_1 = require("nx/src/utils/fileutils");
+const output_1 = require("nx/src/utils/output");
+const path_1 = require("path");
 const ts_config_1 = require("./typescript/ts-config");
-let tsModule;
 function isBuildable(target, node) {
     return (node.data.targets &&
         node.data.targets[target] &&
         node.data.targets[target].executor !== '');
 }
+function calculateProjectBuildableDependencies(taskGraph, projGraph, root, projectName, targetName, configurationName, shallow) {
+    if (process.env.NX_BUILDABLE_LIBRARIES_TASK_GRAPH === 'true' && taskGraph) {
+        return calculateDependenciesFromTaskGraph(taskGraph, projGraph, root, projectName, targetName, configurationName, shallow);
+    }
+    return calculateProjectDependencies(projGraph, root, projectName, targetName, configurationName, shallow);
+}
+exports.calculateProjectBuildableDependencies = calculateProjectBuildableDependencies;
 function calculateProjectDependencies(projGraph, root, projectName, targetName, configurationName, shallow) {
     const target = projGraph.nodes[projectName];
     // gather the library dependencies
@@ -108,6 +114,101 @@ function readTsConfigWithRemappedPaths(tsConfig, generatedTsConfigPath, dependen
     }
     return generatedTsConfig;
 }
+function calculateDependenciesFromTaskGraph(taskGraph, projectGraph, root, projectName, targetName, configurationName, shallow) {
+    var _a;
+    const target = projectGraph.nodes[projectName];
+    const nonBuildableDependencies = [];
+    const topLevelDependencies = [];
+    const dependentTasks = collectDependentTasks(projectName, `${projectName}:${targetName}${configurationName ? `:${configurationName}` : ''}`, taskGraph, projectGraph, shallow);
+    const npmDependencies = collectNpmDependencies(projectName, projectGraph, !shallow ? dependentTasks : undefined);
+    const dependencies = [];
+    for (const [taskName, { isTopLevel }] of dependentTasks) {
+        let project = null;
+        const depTask = taskGraph.tasks[taskName];
+        const depProjectNode = (_a = projectGraph.nodes) === null || _a === void 0 ? void 0 : _a[depTask.target.project];
+        if ((depProjectNode === null || depProjectNode === void 0 ? void 0 : depProjectNode.type) !== 'lib') {
+            return null;
+        }
+        let outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)(depTask, depProjectNode);
+        if (outputs.length === 0) {
+            nonBuildableDependencies.push(depTask.target.project);
+            continue;
+        }
+        const libPackageJsonPath = (0, path_1.join)(root, depProjectNode.data.root, 'package.json');
+        project = {
+            name: (0, fileutils_1.fileExists)(libPackageJsonPath)
+                ? (0, devkit_1.readJsonFile)(libPackageJsonPath).name // i.e. @workspace/mylib
+                : depTask.target.project,
+            outputs,
+            node: depProjectNode,
+        };
+        if (isTopLevel) {
+            topLevelDependencies.push(project);
+        }
+        dependencies.push(project);
+    }
+    for (const { project, isTopLevel } of npmDependencies) {
+        if (isTopLevel) {
+            topLevelDependencies.push(project);
+        }
+        dependencies.push(project);
+    }
+    dependencies.sort((a, b) => (a.name > b.name ? 1 : b.name > a.name ? -1 : 0));
+    return {
+        target,
+        dependencies,
+        nonBuildableDependencies,
+        topLevelDependencies,
+    };
+}
+exports.calculateDependenciesFromTaskGraph = calculateDependenciesFromTaskGraph;
+function collectNpmDependencies(projectName, projectGraph, dependentTasks, collectedPackages = new Set(), isTopLevel = true) {
+    const dependencies = projectGraph.dependencies[projectName]
+        .map((dep) => {
+        var _a, _b, _c;
+        const projectNode = (_b = (_a = projectGraph.nodes) === null || _a === void 0 ? void 0 : _a[dep.target]) !== null && _b !== void 0 ? _b : (_c = projectGraph.externalNodes) === null || _c === void 0 ? void 0 : _c[dep.target];
+        if ((projectNode === null || projectNode === void 0 ? void 0 : projectNode.type) !== 'npm' ||
+            collectedPackages.has(projectNode.data.packageName)) {
+            return null;
+        }
+        const project = {
+            name: projectNode.data.packageName,
+            outputs: [],
+            node: projectNode,
+        };
+        collectedPackages.add(project.name);
+        return { project, isTopLevel };
+    })
+        .filter((x) => !!x);
+    if (dependentTasks === null || dependentTasks === void 0 ? void 0 : dependentTasks.size) {
+        for (const [, { project: projectName }] of dependentTasks) {
+            dependencies.push(...collectNpmDependencies(projectName, projectGraph, undefined, collectedPackages, false));
+        }
+    }
+    return dependencies;
+}
+function collectDependentTasks(project, task, taskGraph, projectGraph, shallow, areTopLevelDeps = true, dependentTasks = new Map()) {
+    var _a;
+    for (const depTask of (_a = taskGraph.dependencies[task]) !== null && _a !== void 0 ? _a : []) {
+        if (dependentTasks.has(depTask)) {
+            if (!dependentTasks.get(depTask).isTopLevel && areTopLevelDeps) {
+                dependentTasks.get(depTask).isTopLevel = true;
+            }
+            continue;
+        }
+        const { project: depTaskProject } = (0, devkit_1.parseTargetString)(depTask, projectGraph);
+        if (depTaskProject !== project) {
+            dependentTasks.set(depTask, {
+                project: depTaskProject,
+                isTopLevel: areTopLevelDeps,
+            });
+        }
+        if (!shallow) {
+            collectDependentTasks(depTaskProject, depTask, taskGraph, projectGraph, shallow, depTaskProject === project && areTopLevelDeps, dependentTasks);
+        }
+    }
+    return dependentTasks;
+}
 /**
  * Util function to create tsconfig compilerOptions object with support for workspace libs paths.
  *

package/src/utils/check-dependencies.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDependencies = void 0;
 const buildable_libs_utils_1 = require("./buildable-libs-utils");
 function checkDependencies(context, tsConfigPath) {
-    const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+    const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
     const projectRoot = target.data.root;
     if (dependencies.length > 0) {
         return {

package/src/utils/find-npm-dependencies.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findNpmDependencies = void 0;
 const path_1 = require("path");
-const file_utils_1 = require("nx/src/project-graph/file-utils");
+const configuration_1 = require("nx/src/config/configuration");
 const task_hasher_1 = require("nx/src/hasher/task-hasher");
 const devkit_1 = require("@nx/devkit");
 const fileutils_1 = require("nx/src/utils/fileutils");
@@ -44,7 +44,7 @@ function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGra
     // Cannot read inputs if the target does not exist on the project.
     if (!sourceProject.data.targets[buildTarget])
         return;
-    const inputs = (0, task_hasher_1.getTargetInputs)((0, file_utils_1.readNxJson)(), sourceProject, buildTarget).selfInputs;
+    const inputs = (0, task_hasher_1.getTargetInputs)((0, configuration_1.readNxJson)(), sourceProject, buildTarget).selfInputs;
     const files = (0, task_hasher_1.filterUsingGlobPatterns)(sourceProject.data.root, projectFileMap[sourceProject.name] || [], inputs);
     for (const fileData of files) {
         if (!fileData.deps ||