@nx/js 0.0.0-pr-29993-9a92505 → 0.0.0-pr-3-c6ccd0d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "0.0.0-pr-29993-9a92505",
+  "version": "0.0.0-pr-3-c6ccd0d",
   "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,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "0.0.0-pr-29993-9a92505",
-    "@nx/workspace": "0.0.0-pr-29993-9a92505",
+    "@nx/devkit": "0.0.0-pr-3-c6ccd0d",
+    "@nx/workspace": "0.0.0-pr-3-c6ccd0d",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -52,10 +52,10 @@
     "ignore": "^5.0.4",
     "js-tokens": "^4.0.0",
     "jsonc-parser": "3.2.0",
+    "minimatch": "9.0.3",
     "npm-package-arg": "11.0.1",
     "npm-run-path": "^4.0.1",
     "ora": "5.3.0",
-    "picomatch": "4.0.2",
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.10",

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

@@ -298,7 +298,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
             const outputFilePath = (0, utils_1.interpolate)(outputPath, {
                 projectName: project.name,
                 projectRoot: project.data.root,
-                workspaceRoot: context.root,
+                workspaceRoot: '',
             });
             return path.join(outputFilePath, 'main.js');
         }

package/src/plugins/typescript/plugin.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodes = exports.createNodesV2 = exports.PLUGIN_NAME = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const picomatch = require("picomatch");
+const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const posix = require("node:path/posix");
@@ -276,8 +276,8 @@ function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferen
             });
             const normalize = (p) => (p.startsWith('./') ? p.slice(2) : p);
             config.raw.exclude.forEach((excludePath) => {
-                if (!otherFilesInclude.some((includePath) => picomatch(normalize(excludePath))(normalize(includePath)) ||
-                    picomatch(normalize(includePath))(normalize(excludePath)))) {
+                if (!otherFilesInclude.some((includePath) => (0, minimatch_1.minimatch)(normalize(includePath), normalize(excludePath)) ||
+                    (0, minimatch_1.minimatch)(normalize(excludePath), normalize(includePath)))) {
                     excludePaths.add(excludePath);
                 }
             });

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyAssetsHandler = exports.defaultFileEventHandler = void 0;
-const picomatch = require("picomatch");
+const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const pathPosix = require("node:path/posix");
 const path = require("node:path");
@@ -117,8 +117,8 @@ class CopyAssetsHandler {
         for (const event of events) {
             const pathFromRoot = path.relative(this.rootDir, event.path);
             for (const ag of this.assetGlobs) {
-                if (picomatch(ag.pattern)(pathFromRoot) &&
-                    !ag.ignore?.some((ig) => picomatch(ig)(pathFromRoot)) &&
+                if ((0, minimatch_1.minimatch)(pathFromRoot, ag.pattern) &&
+                    !ag.ignore?.some((ig) => (0, minimatch_1.minimatch)(pathFromRoot, ig)) &&
                     !this.ignore.ignores(pathFromRoot)) {
                     const relPath = path.relative(ag.input, pathFromRoot);
                     const destPath = relPath.startsWith('..') ? pathFromRoot : relPath;
@@ -137,7 +137,7 @@ class CopyAssetsHandler {
     }
     filesToEvent(files, assetGlob) {
         return files.reduce((acc, src) => {
-            if (!assetGlob.ignore?.some((ig) => picomatch(ig)(src)) &&
+            if (!assetGlob.ignore?.some((ig) => (0, minimatch_1.minimatch)(src, ig)) &&
                 !this.ignore.ignores(src)) {
                 const relPath = path.relative(assetGlob.input, src);
                 const dest = relPath.startsWith('..') ? src : relPath;

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

@@ -16,7 +16,6 @@ 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");
-const crypto_1 = require("crypto");
 function isBuildable(target, node) {
     return (node.data.targets &&
         node.data.targets[target] &&
@@ -230,7 +229,7 @@ function computeCompilerOptionsPaths(tsConfig, dependencies) {
     return paths;
 }
 function createTmpTsConfig(tsconfigPath, workspaceRoot, projectRoot, dependencies, useWorkspaceAsBaseUrl = false) {
-    const tmpTsConfigPath = (0, path_1.join)(workspaceRoot, 'tmp', projectRoot, process.env.NX_TASK_TARGET_TARGET ?? 'build', `tsconfig.generated.${(0, crypto_1.randomUUID)()}.json`);
+    const tmpTsConfigPath = (0, path_1.join)(workspaceRoot, 'tmp', projectRoot, process.env.NX_TASK_TARGET_TARGET ?? 'build', 'tsconfig.generated.json');
     if (tsconfigPath === tmpTsConfigPath) {
         return tsconfigPath;
     }

package/src/utils/package-manager-workspaces.js

@@ -5,7 +5,7 @@ exports.isUsingPackageManagerWorkspaces = isUsingPackageManagerWorkspaces;
 exports.isWorkspacesEnabled = isWorkspacesEnabled;
 exports.getProjectPackageManagerWorkspaceStateWarningTask = getProjectPackageManagerWorkspaceStateWarningTask;
 const devkit_1 = require("@nx/devkit");
-const picomatch = require("picomatch");
+const minimatch_1 = require("minimatch");
 const posix_1 = require("node:path/posix");
 const package_json_1 = require("nx/src/plugins/package-json");
 const semver_1 = require("semver");
@@ -14,7 +14,7 @@ function getProjectPackageManagerWorkspaceState(tree, projectRoot) {
         return 'no-workspaces';
     }
     const patterns = (0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (path) => (0, devkit_1.readJson)(tree, path, { expectComments: true }));
-    const isIncluded = patterns.some((p) => picomatch(p)((0, posix_1.join)(projectRoot, 'package.json')));
+    const isIncluded = patterns.some((p) => (0, minimatch_1.minimatch)((0, posix_1.join)(projectRoot, 'package.json'), p));
     return isIncluded ? 'included' : 'excluded';
 }
 function isUsingPackageManagerWorkspaces(tree) {