@nx/js 16.8.1 → 16.9.0-beta.1

package/README.md

@@ -8,7 +8,7 @@
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Join us @nx/community on slack](https://img.shields.io/badge/slack-%40nrwl%2Fcommunity-brightgreen)](https://join.slack.com/t/nrwlcommunity/shared_invite/enQtNzU5MTE4OTQwOTk0LTgxY2E0ZWYzMWE0YzA5ZDA2MWM1NDVhNmI2ZWMyYmZhNWJiODk3MjkxZjY3MzU5ZjRmM2NmNWU1OTgyZmE4Mzc)
+[![Join us on the Official Nx Discord Server](https://simpleicons.org/icons/discord.svg)](https://go.nx.dev/community)
 
 </div>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.8.1",
+  "version": "16.9.0-beta.1",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,9 +39,9 @@
     "@babel/preset-env": "^7.22.9",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nrwl/js": "16.8.1",
-    "@nx/devkit": "16.8.1",
-    "@nx/workspace": "16.8.1",
+    "@nrwl/js": "16.9.0-beta.1",
+    "@nx/devkit": "16.9.0-beta.1",
+    "@nx/workspace": "16.9.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -71,5 +71,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "29a7b8575e683d3a581b4bf6f82ee4486bfa94dd"
+  "gitHead": "5056d6cefb2949ba865019e8b71e633fba28c091"
 }

package/src/executors/tsc/tsc.batch-impl.js

@@ -8,6 +8,7 @@ const update_package_json_1 = require("../../utils/package-json/update-package-j
 const tsc_impl_1 = require("./tsc.impl");
 const lib_1 = require("./lib");
 const batch_1 = require("./lib/batch");
+const create_entry_points_1 = require("../../utils/package-json/create-entry-points");
 async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
     const tasksOptions = (0, batch_1.normalizeTasksOptions)(inputs, context);
     let shouldWatch = false;
@@ -48,7 +49,7 @@ async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
             taskInfo.assetsHandler.processAllAssetsOnceSync();
             (0, update_package_json_1.updatePackageJson)({
                 ...taskInfo.options,
-                additionalEntryPoints: (0, tsc_impl_1.createEntryPoints)(taskInfo.options, context),
+                additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(taskInfo.options.additionalEntryPoints, context.root),
                 format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(tsConfig)],
                 // As long as d.ts files match their .js counterparts, we don't need to emit them.
                 // TSC can match them correctly based on file names.
@@ -72,7 +73,7 @@ async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
             for (const t of changedTaskInfos) {
                 (0, update_package_json_1.updatePackageJson)({
                     ...t.options,
-                    additionalEntryPoints: (0, tsc_impl_1.createEntryPoints)(t.options, context),
+                    additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(t.options.additionalEntryPoints, context.root),
                     format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(t.options.tsConfig)],
                     // As long as d.ts files match their .js counterparts, we don't need to emit them.
                     // TSC can match them correctly based on file names.

package/src/executors/tsc/tsc.impl.d.ts

@@ -4,7 +4,4 @@ import { ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
 export declare function determineModuleFormatFromTsConfig(absolutePathToTsConfig: string): 'cjs' | 'esm';
 export declare function createTypeScriptCompilationOptions(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext): TypeScriptCompilationOptions;
 export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("../../utils/typescript/compile-typescript-files").TypescriptCompilationResult, any, undefined>;
-export declare function createEntryPoints(options: {
-    additionalEntryPoints?: string[];
-}, context: ExecutorContext): string[];
 export default tscExecutor;

package/src/executors/tsc/tsc.impl.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEntryPoints = exports.tscExecutor = exports.createTypeScriptCompilationOptions = exports.determineModuleFormatFromTsConfig = void 0;
+exports.tscExecutor = exports.createTypeScriptCompilationOptions = exports.determineModuleFormatFromTsConfig = void 0;
 const ts = require("typescript");
-const fast_glob_1 = require("fast-glob");
 const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
 const check_dependencies_1 = require("../../utils/check-dependencies");
 const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
@@ -12,6 +11,7 @@ const compile_typescript_files_1 = require("../../utils/typescript/compile-types
 const watch_for_single_file_changes_1 = require("../../utils/watch-for-single-file-changes");
 const lib_1 = require("./lib");
 const ts_config_1 = require("../../utils/typescript/ts-config");
+const create_entry_points_1 = require("../../utils/package-json/create-entry-points");
 function determineModuleFormatFromTsConfig(absolutePathToTsConfig) {
     const tsConfig = (0, ts_config_1.readTsConfig)(absolutePathToTsConfig);
     if (tsConfig.options.module === ts.ModuleKind.ES2015 ||
@@ -64,7 +64,7 @@ async function* tscExecutor(_options, context) {
         await assetHandler.processAllAssetsOnce();
         (0, update_package_json_1.updatePackageJson)({
             ...options,
-            additionalEntryPoints: createEntryPoints(options, context),
+            additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(options.additionalEntryPoints, context.root),
             format: [determineModuleFormatFromTsConfig(options.tsConfig)],
             // As long as d.ts files match their .js counterparts, we don't need to emit them.
             // TSC can match them correctly based on file names.
@@ -76,7 +76,7 @@ async function* tscExecutor(_options, context) {
         const disposeWatchAssetChanges = await assetHandler.watchAndProcessOnAssetChange();
         const disposePackageJsonChanges = await (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)({
             ...options,
-            additionalEntryPoints: createEntryPoints(options, context),
+            additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(options.additionalEntryPoints, context.root),
             // As long as d.ts files match their .js counterparts, we don't need to emit them.
             // TSC can match them correctly based on file names.
             skipTypings: true,
@@ -94,12 +94,4 @@ async function* tscExecutor(_options, context) {
     return yield* typescriptCompilation.iterator;
 }
 exports.tscExecutor = tscExecutor;
-function createEntryPoints(options, context) {
-    if (!options.additionalEntryPoints?.length)
-        return [];
-    return (0, fast_glob_1.sync)(options.additionalEntryPoints, {
-        cwd: context.root,
-    });
-}
-exports.createEntryPoints = createEntryPoints;
 exports.default = tscExecutor;

package/src/index.d.ts

@@ -10,6 +10,7 @@ export * from './utils/typescript/ast-utils';
 export * from './utils/package-json';
 export * from './utils/assets';
 export * from './utils/package-json/update-package-json';
+export * from './utils/package-json/create-entry-points';
 export { libraryGenerator } from './generators/library/library';
 export { initGenerator } from './generators/init/init';
 export { createLockFile, getLockFileName, } from 'nx/src/plugins/js/lock-file/lock-file';

package/src/index.js

@@ -14,6 +14,7 @@ tslib_1.__exportStar(require("./utils/typescript/ast-utils"), exports);
 tslib_1.__exportStar(require("./utils/package-json"), exports);
 tslib_1.__exportStar(require("./utils/assets"), exports);
 tslib_1.__exportStar(require("./utils/package-json/update-package-json"), exports);
+tslib_1.__exportStar(require("./utils/package-json/create-entry-points"), exports);
 var library_1 = require("./generators/library/library");
 Object.defineProperty(exports, "libraryGenerator", { enumerable: true, get: function () { return library_1.libraryGenerator; } });
 var init_1 = require("./generators/init/init");

package/src/utils/package-json/create-entry-points.d.ts

@@ -0,0 +1 @@
+export declare function createEntryPoints(additionalEntryPoints: undefined | string[], root: string): string[];

package/src/utils/package-json/create-entry-points.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createEntryPoints = void 0;
+const fast_glob_1 = require("fast-glob");
+const devkit_1 = require("@nx/devkit");
+function createEntryPoints(additionalEntryPoints, root) {
+    if (!additionalEntryPoints?.length)
+        return [];
+    const files = [];
+    // NOTE: calling globSync for each pattern is slower than calling it all at once.
+    // We're doing it this way in order to show a warning for unmatched patterns.
+    // If a pattern is unmatched, it is very likely a mistake by the user.
+    // Performance impact should be negligible since there shouldn't be that many entry points.
+    // Benchmarks show only 1-3% difference in execution time.
+    for (const pattern of additionalEntryPoints) {
+        const matched = (0, fast_glob_1.sync)([pattern], { cwd: root });
+        if (!matched.length)
+            devkit_1.logger.warn(`The pattern ${pattern} did not match any files.`);
+        files.push(...matched);
+    }
+    return files;
+}
+exports.createEntryPoints = createEntryPoints;

package/src/utils/package-json/update-package-json.js

@@ -8,7 +8,6 @@ const create_package_json_1 = require("nx/src/plugins/js/package-json/create-pac
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
-const operators_1 = require("nx/src/project-graph/operators");
 const fileutils_1 = require("nx/src/utils/fileutils");
 const fs_1 = require("fs");
 const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
@@ -49,10 +48,16 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
     }
 }
 exports.updatePackageJson = updatePackageJson;
-function addMissingDependencies(packageJson, { projectName, targetName, configurationName, root }, dependencies, propType = 'dependencies') {
+function isNpmNode(node, graph) {
+    return !!(graph.externalNodes[node.name]?.type === 'npm');
+}
+function isWorkspaceProject(node, graph) {
+    return !!graph.nodes[node.name];
+}
+function addMissingDependencies(packageJson, { projectName, targetName, configurationName, root, projectGraph, }, dependencies, propType = 'dependencies') {
     const workspacePackageJson = (0, devkit_1.readJsonFile)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json'));
     dependencies.forEach((entry) => {
-        if ((0, operators_1.isNpmProject)(entry.node)) {
+        if (isNpmNode(entry.node, projectGraph)) {
             const { packageName, version } = entry.node.data;
             if (packageJson.dependencies?.[packageName] ||
                 packageJson.devDependencies?.[packageName] ||
@@ -65,7 +70,7 @@ function addMissingDependencies(packageJson, { projectName, targetName, configur
             packageJson[propType] ??= {};
             packageJson[propType][packageName] = version;
         }
-        else {
+        else if (isWorkspaceProject(entry.node, projectGraph)) {
             const packageName = entry.name;
             if (!!workspacePackageJson.devDependencies?.[packageName]) {
                 return;