@nx/js 22.7.0-pr.34894.3fb67b5 → 22.7.0-pr.34941.897df69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.7.0-pr.34894.3fb67b5",
+  "version": "22.7.0-pr.34941.897df69",
   "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": "22.7.0-pr.34894.3fb67b5",
-    "@nx/workspace": "22.7.0-pr.34894.3fb67b5",
+    "@nx/devkit": "22.7.0-pr.34941.897df69",
+    "@nx/workspace": "22.7.0-pr.34941.897df69",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -60,7 +60,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-pr.34894.3fb67b5"
+    "nx": "22.7.0-pr.34941.897df69"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/executors/node/lib/detect-module-format.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectModuleFormat = detectModuleFormat;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const ts_config_1 = require("../../../utils/typescript/ts-config");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 function detectModuleFormat(options) {
     if (options.buildOptions?.format) {
         const formats = Array.isArray(options.buildOptions.format)

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

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nodeExecutor = nodeExecutor;
-const chalk = require("chalk");
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const devkit_1 = require("@nx/devkit");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const client_1 = require("nx/src/daemon/client/client");
 const crypto_1 = require("crypto");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const path_1 = require("path");
 const buildable_libs_utils_1 = require("../../utils/buildable-libs-utils");
 const kill_tree_1 = require("./lib/kill-tree");
@@ -23,7 +24,7 @@ async function* nodeExecutor(options, context) {
     const project = context.projectGraph.nodes[context.projectName];
     const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context);
     if (!project.data.targets[buildTarget.target]) {
-        throw new Error(`Cannot find build target ${chalk.bold(options.buildTarget)} for project ${chalk.bold(context.projectName)}`);
+        throw new Error(`Cannot find build target ${chalk_1.default.bold(options.buildTarget)} for project ${chalk_1.default.bold(context.projectName)}`);
     }
     const buildTargetExecutor = project.data.targets[buildTarget.target]?.executor;
     if (buildTargetExecutor === 'nx:run-commands') {
@@ -331,7 +332,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
             return path.join(outputFilePath, 'main.js');
         }
         const fallbackFile = path.join('dist', project.data.root, 'main.js');
-        devkit_1.logger.warn(`Build option ${chalk.bold('outputFileName')} not set for ${chalk.bold(project.name)}. Using fallback value of ${chalk.bold(fallbackFile)}.`);
+        devkit_1.logger.warn(`Build option ${chalk_1.default.bold('outputFileName')} not set for ${chalk_1.default.bold(project.name)}. Using fallback value of ${chalk_1.default.bold(fallbackFile)}.`);
         return (0, path_1.join)(context.root, fallbackFile);
     }
     let outputFileName = buildOptions.outputFileName;

package/src/executors/release-publish/log-tar.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logTar = void 0;
+const tslib_1 = require("tslib");
 // Adapted from https://github.com/npm/cli/blob/c736b622b8504b07f5a19f631ade42dd40063269/lib/utils/tar.js
-const chalk = require("chalk");
-const columnify = require("columnify");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const columnify_1 = tslib_1.__importDefault(require("columnify"));
 const format_bytes_1 = require("./format-bytes");
 const logTar = (tarball, opts = {}) => {
     // @ts-ignore
     const { unicode = true } = opts;
     console.log('');
     console.log(`${unicode ? '📦 ' : 'package:'} ${tarball.name}@${tarball.version}`);
-    console.log(chalk.magenta('=== Tarball Contents ==='));
+    console.log(chalk_1.default.magenta('=== Tarball Contents ==='));
     if (tarball.files.length) {
         console.log('');
-        const columnData = columnify(tarball.files
+        const columnData = (0, columnify_1.default)(tarball.files
             .map((f) => {
             const bytes = (0, format_bytes_1.formatBytes)(f.size, false);
             return /^node_modules\//.test(f.path)
@@ -29,11 +30,11 @@ const logTar = (tarball, opts = {}) => {
         });
     }
     if (tarball.bundled.length) {
-        console.log(chalk.magenta('=== Bundled Dependencies ==='));
+        console.log(chalk_1.default.magenta('=== Bundled Dependencies ==='));
         tarball.bundled.forEach((name) => console.log('', name));
     }
-    console.log(chalk.magenta('=== Tarball Details ==='));
-    console.log(columnify([
+    console.log(chalk_1.default.magenta('=== Tarball Details ==='));
+    console.log((0, columnify_1.default)([
         { name: 'name:', value: tarball.name },
         { name: 'version:', value: tarball.version },
         tarball.filename && { name: 'filename:', value: tarball.filename },

package/src/executors/tsc/lib/typescript-compilation.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileTypescriptSolution = compileTypescriptSolution;
+const tslib_1 = require("tslib");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const get_custom_transformers_factory_1 = require("./get-custom-transformers-factory");
 const typescript_diagnostic_reporters_1 = require("./typescript-diagnostic-reporters");
 // https://github.com/microsoft/TypeScript/blob/d45012c5e2ab122919ee4777a7887307c5f4a1e0/src/compiler/diagnosticMessages.json#L4050-L4053

package/src/executors/tsc/lib/typescript-diagnostic-reporters.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatDiagnosticReport = formatDiagnosticReport;
 exports.formatSolutionBuilderStatusReport = formatSolutionBuilderStatusReport;
-const ts = require("typescript");
+const tslib_1 = require("tslib");
+const ts = tslib_1.__importStar(require("typescript"));
 // adapted from TS default diagnostic reporter
 function formatDiagnosticReport(diagnostic, host) {
     const diagnostics = new Array(1);

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineModuleFormatFromTsConfig = determineModuleFormatFromTsConfig;
 exports.createTypeScriptCompilationOptions = createTypeScriptCompilationOptions;
 exports.tscExecutor = tscExecutor;
-const ts = require("typescript");
+const tslib_1 = require("tslib");
+const ts = tslib_1.__importStar(require("typescript"));
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const path_1 = require("path");

package/src/executors/verdaccio/verdaccio.impl.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verdaccioExecutor = verdaccioExecutor;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const child_process_1 = require("child_process");
-const detectPort = require("detect-port");
+const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -32,7 +33,7 @@ async function verdaccioExecutor(options, context) {
             console.log(`Cleared local registry storage folder ${options.storage}`);
         }
     }
-    const port = await detectPort(options.port);
+    const port = await (0, detect_port_1.default)(options.port);
     if (port !== options.port) {
         devkit_1.logger.info(`Port ${options.port} was occupied. Using port ${port}.`);
         options.port = port;

package/src/generators/library/library.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.addLint = addLint;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const prompt_1 = require("@nx/devkit/src/generators/prompt");
@@ -21,7 +22,7 @@ const plugin_1 = require("../../utils/typescript/plugin");
 const ts_config_1 = require("../../utils/typescript/ts-config");
 const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
-const init_1 = require("../init/init");
+const init_1 = tslib_1.__importDefault(require("../init/init"));
 const add_release_config_1 = require("./utils/add-release-config");
 const defaultOutputDirectory = 'dist';
 async function libraryGenerator(tree, schema) {

package/src/generators/library/utils/add-release-config.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addReleaseConfigForTsSolution = addReleaseConfigForTsSolution;
 exports.addReleaseConfigForNonTsSolution = addReleaseConfigForNonTsSolution;
 exports.releaseTasks = releaseTasks;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const find_matching_projects_1 = require("nx/src/utils/find-matching-projects");
-const generator_1 = require("../../setup-verdaccio/generator");
+const generator_1 = tslib_1.__importDefault(require("../../setup-verdaccio/generator"));
 /**
  * Adds release option in nx.json to build the project before versioning
  */

package/src/generators/setup-verdaccio/generator.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupVerdaccio = setupVerdaccio;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 const child_process_1 = require("child_process");

package/src/generators/typescript-sync/typescript-sync.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.syncGenerator = syncGenerator;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const ignore_1 = require("ignore");
+const ignore_1 = tslib_1.__importDefault(require("ignore"));
 const jsonc_parser_1 = require("jsonc-parser");
 const posix_1 = require("node:path/posix");
 const sync_generators_1 = require("nx/src/utils/sync-generators");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const COMMON_RUNTIME_TS_CONFIG_FILE_NAMES = [
     'tsconfig.app.json',
     'tsconfig.lib.json',

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

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyAssetsHandler = exports.defaultFileEventHandler = void 0;
+const tslib_1 = require("tslib");
 const picomatch = require("picomatch");
 const node_fs_1 = require("node:fs");
-const pathPosix = require("node:path/posix");
-const path = require("node:path");
-const ignore_1 = require("ignore");
+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 devkit_1 = require("@nx/devkit");
 const client_1 = require("nx/src/daemon/client/client");

package/src/utils/code-frames/highlight.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.highlight = highlight;
+const tslib_1 = require("tslib");
 // Adapted from https://raw.githubusercontent.com/babel/babel/4108524/packages/babel-highlight/src/index.js
-const jsTokens = require("js-tokens");
-const chalk = require("chalk");
+const jsTokens = tslib_1.__importStar(require("js-tokens"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const identifiers_1 = require("./identifiers");
 /**
  * Chalk styles for token types.
@@ -80,6 +81,6 @@ function highlightTokens(defs, text) {
     });
 }
 function highlight(code) {
-    const defs = getDefs(chalk);
+    const defs = getDefs(chalk_1.default);
     return highlightTokens(defs, code);
 }

package/src/utils/generate-globs.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGlobPatternsForDependencies = createGlobPatternsForDependencies;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const workspace_root_1 = require("nx/src/utils/workspace-root");
 const path_1 = require("path");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
 const project_graph_utils_1 = require("nx/src/utils/project-graph-utils");
 const fs_1 = require("fs");
-const ignore_1 = require("ignore");
+const ignore_1 = tslib_1.__importDefault(require("ignore"));
 const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
 function configureIgnore() {
     let ig;

package/src/utils/prettier.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveUserExistingPrettierConfig = resolveUserExistingPrettierConfig;
 exports.generatePrettierSetup = generatePrettierSetup;
@@ -8,7 +41,7 @@ const versions_1 = require("./versions");
 async function resolveUserExistingPrettierConfig() {
     let prettier;
     try {
-        prettier = await Promise.resolve().then(() => require('prettier'));
+        prettier = await Promise.resolve().then(() => __importStar(require('prettier')));
     }
     catch {
         return null;
@@ -78,7 +111,7 @@ function generatePrettierSetup(tree, options) {
 async function resolvePrettierConfigPath(tree) {
     let prettier;
     try {
-        prettier = await Promise.resolve().then(() => require('prettier'));
+        prettier = await Promise.resolve().then(() => __importStar(require('prettier')));
     }
     catch {
         return null;
@@ -119,7 +152,7 @@ async function resolvePrettierConfigPath(tree) {
     }
     // check the package.yaml file
     if (tree.exists('package.yaml')) {
-        const { load } = await Promise.resolve().then(() => require('@zkochan/js-yaml'));
+        const { load } = await Promise.resolve().then(() => __importStar(require('@zkochan/js-yaml')));
         const packageYaml = load(tree.read('package.yaml', 'utf-8'));
         if (packageYaml.prettier) {
             return 'package.yaml';

package/src/utils/typescript/run-type-check.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTypeCheckWatch = runTypeCheckWatch;
 exports.runTypeCheck = runTypeCheck;
 exports.getFormattedDiagnostic = getFormattedDiagnostic;
-const chalk = require("chalk");
-const path = require("path");
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const path = tslib_1.__importStar(require("path"));
 const code_frames_1 = require("nx/src/utils/code-frames");
 const highlight_1 = require("../code-frames/highlight");
 const ts_config_1 = require("../../utils/typescript/ts-config");
@@ -56,7 +57,7 @@ async function runTypeCheck(options) {
     return getTypeCheckResult(ts, allDiagnostics, workspaceRoot, config.fileNames.length, program.getSourceFiles().length, incremental);
 }
 async function setupTypeScript(options) {
-    const ts = await Promise.resolve().then(() => require('typescript'));
+    const ts = await Promise.resolve().then(() => tslib_1.__importStar(require('typescript')));
     const { workspaceRoot, tsConfigPath, cacheDir, incremental, projectRoot } = options;
     const config = (0, ts_config_1.readTsConfig)(tsConfigPath);
     if (config.errors.length) {
@@ -103,17 +104,17 @@ function getFormattedDiagnostic(ts, workspaceRoot, diagnostic) {
     const category = diagnostic.category;
     switch (category) {
         case ts.DiagnosticCategory.Warning: {
-            message += `${chalk.yellow.bold('warning')} ${chalk.gray(`TS${diagnostic.code}`)}: `;
+            message += `${chalk_1.default.yellow.bold('warning')} ${chalk_1.default.gray(`TS${diagnostic.code}`)}: `;
             break;
         }
         case ts.DiagnosticCategory.Error: {
-            message += `${chalk.red.bold('error')} ${chalk.gray(`TS${diagnostic.code}`)}: `;
+            message += `${chalk_1.default.red.bold('error')} ${chalk_1.default.gray(`TS${diagnostic.code}`)}: `;
             break;
         }
         case ts.DiagnosticCategory.Suggestion:
         case ts.DiagnosticCategory.Message:
         default: {
-            message += `${chalk.cyan.bold(category === 2 ? 'suggestion' : 'info')}: `;
+            message += `${chalk_1.default.cyan.bold(category === 2 ? 'suggestion' : 'info')}: `;
             break;
         }
     }
@@ -124,7 +125,7 @@ function getFormattedDiagnostic(ts, workspaceRoot, diagnostic) {
         const column = pos.character + 1;
         const fileName = path.relative(workspaceRoot, diagnostic.file.fileName);
         message =
-            `${chalk.underline.blue(`${fileName}:${line}:${column}`)} - ` + message;
+            `${chalk_1.default.underline.blue(`${fileName}:${line}:${column}`)} - ` + message;
         const code = diagnostic.file.getFullText(diagnostic.file.getSourceFile());
         message +=
             '\n' +