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

package/assets.json

@@ -0,0 +1,23 @@
+{
+  "outDir": "dist/packages/js",
+  "assets": [
+    {
+      "glob": "**/files/**"
+    },
+    {
+      "glob": "**/files/**/.gitkeep"
+    },
+    {
+      "glob": "**/*.json",
+      "ignore": ["tsconfig*.json", "project.json", ".eslintrc.json"]
+    },
+    {
+      "glob": "**/*.js",
+      "ignore": ["**/jest.config.js", "src/index.js"]
+    },
+    {
+      "glob": "**/*.d.ts"
+    },
+    "LICENSE"
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.7.0-beta.4",
+  "version": "22.7.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": {
@@ -19,7 +19,8 @@
     "Backend"
   ],
   "main": "src/index.js",
-  "typings": "src/index.d.ts",
+  "type": "commonjs",
+  "types": "src/index.d.ts",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/nrwl/nx/issues"
@@ -39,8 +40,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "22.7.0-beta.4",
-    "@nx/workspace": "22.7.0-beta.4",
+    "@nx/devkit": "22.7.0-beta.6",
+    "@nx/workspace": "22.7.0-beta.6",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -60,7 +61,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.4"
+    "nx": "22.7.0-beta.6"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"
@@ -72,7 +73,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "types": "src/index.d.ts",
-  "type": "commonjs"
+  }
 }

package/src/plugins/typescript/plugin.js

@@ -460,11 +460,15 @@ function getInputs(namedInputs, config, tsConfig, internalProjectReferences, wor
     // the source files of dependencies. This correctly tracks build outputs from
     // both external project references and same-project task dependencies (e.g.
     // build-native producing .d.ts files that may be excluded from file watching
-    // via .nxignore).
+    // via .nxignore. "*.d.ts" are also read from the deps projects sources.
     inputs.push({
         dependentTasksOutputFiles: '**/*.{d.ts,tsbuildinfo}',
         transitive: true,
     });
+    inputs.push({
+        fileset: '**/*.d.ts',
+        dependencies: true,
+    });
     const externalRefPatterns = getExternalProjectReferenceTsconfigPatterns(tsConfig, internalProjectReferences, workspaceRoot, config.project, cache);
     inputs.push(...externalRefPatterns);
     // inputs.push({ externalDependencies });

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

@@ -1,5 +1,8 @@
 import { AssetGlob } from './assets';
+import { normalizeAssets, getAssetOutputPath, NormalizedAssetEntry as AssetEntry } from './normalize-assets';
 import { ChangedFile } from 'nx/src/daemon/client/client';
+export type { AssetEntry };
+export { normalizeAssets, getAssetOutputPath };
 export type FileEventType = 'create' | 'update' | 'delete';
 export interface FileEvent {
     type: FileEventType;
@@ -32,5 +35,4 @@ export declare class CopyAssetsHandler {
     private filesToEvent;
     private normalizeAssetPattern;
 }
-export {};
 //# sourceMappingURL=copy-assets-handler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"copy-assets-handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,WAAW,EAAgB,MAAM,6BAA6B,CAAC;AAGxE,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,uBAAuB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAWD,eAAO,MAAM,uBAAuB,GAAI,QAAQ,SAAS,EAAE,SAiB1D,CAAC;AAEF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IACzD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;gBAElC,IAAI,EAAE,uBAAuB;IA2DnC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3C,wBAAwB,IAAI,IAAI;IAgBhC,OAAO,CAAC,yBAAyB;IAa3B,4BAA4B,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;IA2BnD,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC9D,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,qBAAqB;CAG9B"}
+{"version":3,"file":"copy-assets-handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,oBAAoB,IAAI,UAAU,EACnC,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,WAAW,EAAgB,MAAM,6BAA6B,CAAC;AAGxE,YAAY,EAAE,UAAU,EAAE,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,CAAC;AAE/C,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,uBAAuB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,eAAO,MAAM,uBAAuB,GAAI,QAAQ,SAAS,EAAE,SAiB1D,CAAC;AAEF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IACzD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;gBAElC,IAAI,EAAE,uBAAuB;IA2BnC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3C,wBAAwB,IAAI,IAAI;IAgBhC,OAAO,CAAC,yBAAyB;IAa3B,4BAA4B,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;IA2BnD,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC9D,OAAO,CAAC,YAAY;IAiBpB,OAAO,CAAC,qBAAqB;CAG9B"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CopyAssetsHandler = exports.defaultFileEventHandler = void 0;
+exports.CopyAssetsHandler = exports.defaultFileEventHandler = exports.getAssetOutputPath = exports.normalizeAssets = void 0;
 const tslib_1 = require("tslib");
 const picomatch = require("picomatch");
 const node_fs_1 = require("node:fs");
@@ -8,6 +8,9 @@ const pathPosix = tslib_1.__importStar(require("node:path/posix"));
 const path = tslib_1.__importStar(require("node:path"));
 const ignore_1 = tslib_1.__importDefault(require("ignore"));
 const tinyglobby_1 = require("tinyglobby");
+const normalize_assets_1 = require("./normalize-assets");
+Object.defineProperty(exports, "normalizeAssets", { enumerable: true, get: function () { return normalize_assets_1.normalizeAssets; } });
+Object.defineProperty(exports, "getAssetOutputPath", { enumerable: true, get: function () { return normalize_assets_1.getAssetOutputPath; } });
 const devkit_1 = require("@nx/devkit");
 const client_1 = require("nx/src/daemon/client/client");
 const picocolors_1 = require("picocolors");
@@ -49,40 +52,7 @@ class CopyAssetsHandler {
         if ((0, node_fs_1.existsSync)(nxignore)) {
             this.ignore.add((0, node_fs_1.readFileSync)(nxignore).toString());
         }
-        this.assetGlobs = opts.assets.map((f) => {
-            let isGlob = false;
-            let pattern;
-            // Input and output directories are normalized to be relative to root
-            let input;
-            let output;
-            let ignore = null;
-            let includeIgnoredFiles = undefined;
-            const resolvedOutputDir = path.isAbsolute(opts.outputDir)
-                ? opts.outputDir
-                : path.resolve(opts.rootDir, opts.outputDir);
-            if (typeof f === 'string') {
-                pattern = f;
-                input = path.relative(opts.rootDir, opts.projectDir);
-                output = path.relative(opts.rootDir, resolvedOutputDir);
-            }
-            else {
-                isGlob = true;
-                pattern = pathPosix.join(f.input, f.glob);
-                input = f.input;
-                output = pathPosix.join(path.relative(opts.rootDir, resolvedOutputDir), f.output);
-                if (f.ignore)
-                    ignore = f.ignore.map((ig) => pathPosix.join(f.input, ig));
-                includeIgnoredFiles = f.includeIgnoredFiles;
-            }
-            return {
-                isGlob,
-                input,
-                pattern,
-                ignore,
-                output,
-                includeIgnoredFiles,
-            };
-        });
+        this.assetGlobs = (0, normalize_assets_1.normalizeAssets)(opts.assets, opts.rootDir, opts.projectDir, opts.outputDir);
     }
     async processAllAssetsOnce() {
         await Promise.all(this.assetGlobs.map(async (ag) => {
@@ -181,12 +151,10 @@ class CopyAssetsHandler {
             if (!assetGlob.ignore?.some((ig) => picomatch(ig)(src)) &&
                 ((assetGlob.includeIgnoredFiles ?? this.includeIgnoredFiles) ||
                     !this.ignore.ignores(src))) {
-                const relPath = path.relative(assetGlob.input, src);
-                const dest = relPath.startsWith('..') ? src : relPath;
                 acc.push({
                     type: 'create',
                     src: path.join(this.rootDir, src),
-                    dest: path.join(this.rootDir, assetGlob.output, dest),
+                    dest: path.join(this.rootDir, (0, normalize_assets_1.getAssetOutputPath)(src, assetGlob)),
                 });
             }
             return acc;

package/src/utils/assets/normalize-assets.d.ts

@@ -0,0 +1,26 @@
+export interface AssetGlobInput {
+    input: string;
+    output: string;
+    glob: string;
+    ignore?: string[];
+    includeIgnoredFiles?: boolean;
+}
+export interface NormalizedAssetEntry {
+    isGlob: boolean;
+    pattern: string;
+    ignore: string[] | null;
+    input: string;
+    output: string;
+    includeIgnoredFiles?: boolean;
+}
+/**
+ * Normalize raw asset definitions (strings or objects) into resolved
+ * entries with computed input, output, and pattern fields.
+ */
+export declare function normalizeAssets(assets: (string | AssetGlobInput)[], rootDir: string, projectDir: string, outputDir: string): NormalizedAssetEntry[];
+/**
+ * Compute the output path for a file given its asset entry,
+ * matching the dest logic used during file copying.
+ */
+export declare function getAssetOutputPath(src: string, assetEntry: NormalizedAssetEntry): string;
+//# sourceMappingURL=normalize-assets.d.ts.map

package/src/utils/assets/normalize-assets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-assets.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/normalize-assets.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,CAAC,MAAM,GAAG,cAAc,CAAC,EAAE,EACnC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,oBAAoB,EAAE,CA8BxB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,oBAAoB,GAC/B,MAAM,CAIR"}

package/src/utils/assets/normalize-assets.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeAssets = normalizeAssets;
+exports.getAssetOutputPath = getAssetOutputPath;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("node:path"));
+const pathPosix = tslib_1.__importStar(require("node:path/posix"));
+/**
+ * Normalize raw asset definitions (strings or objects) into resolved
+ * entries with computed input, output, and pattern fields.
+ */
+function normalizeAssets(assets, rootDir, projectDir, outputDir) {
+    const resolvedOutputDir = path.isAbsolute(outputDir)
+        ? outputDir
+        : path.resolve(rootDir, outputDir);
+    return assets.map((f) => {
+        if (typeof f === 'string') {
+            return {
+                isGlob: false,
+                pattern: f,
+                input: path.relative(rootDir, projectDir),
+                output: path.relative(rootDir, resolvedOutputDir),
+                ignore: null,
+                includeIgnoredFiles: undefined,
+            };
+        }
+        return {
+            isGlob: true,
+            pattern: pathPosix.join(f.input, f.glob),
+            input: f.input,
+            output: pathPosix.join(path.relative(rootDir, resolvedOutputDir), f.output),
+            ignore: f.ignore
+                ? f.ignore.map((ig) => pathPosix.join(f.input, ig))
+                : null,
+            includeIgnoredFiles: f.includeIgnoredFiles,
+        };
+    });
+}
+/**
+ * Compute the output path for a file given its asset entry,
+ * matching the dest logic used during file copying.
+ */
+function getAssetOutputPath(src, assetEntry) {
+    const relPath = path.relative(assetEntry.input, src);
+    const dest = relPath.startsWith('..') ? src : relPath;
+    return pathPosix.join(assetEntry.output, dest);
+}

package/src/utils/test-fixtures/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "importHelpers": true
+  }
+}

package/src/utils/typescript/test-fixtures/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "skipLibCheck": true,
+    "strict": false,
+    "noEmit": true,
+    "incremental": false,
+    "module": "esnext",
+    "moduleResolution": "node"
+  }
+}