@nx/js 0.0.0-pr-29705-bc2a0dd → 0.0.0-pr-29408-73bb882

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "0.0.0-pr-29705-bc2a0dd",
+  "version": "0.0.0-pr-29408-73bb882",
   "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-29705-bc2a0dd",
-    "@nx/workspace": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/devkit": "0.0.0-pr-29408-73bb882",
+    "@nx/workspace": "0.0.0-pr-29408-73bb882",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

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

@@ -16,9 +16,25 @@ const get_main_file_dir_1 = require("../../utils/get-main-file-dir");
 const utils_1 = require("nx/src/tasks-runner/utils");
 function debounce(fn, wait) {
     let timeoutId;
+    let pendingPromise = null;
     return () => {
         clearTimeout(timeoutId);
-        timeoutId = setTimeout(fn, wait);
+        if (!pendingPromise) {
+            pendingPromise = new Promise((resolve, reject) => {
+                timeoutId = setTimeout(() => {
+                    fn()
+                        .then((result) => {
+                        pendingPromise = null;
+                        resolve(result);
+                    })
+                        .catch((error) => {
+                        pendingPromise = null;
+                        reject(error);
+                    });
+                }, wait);
+            });
+        }
+        return pendingPromise;
     };
 }
 async function* nodeExecutor(options, context) {
@@ -52,7 +68,7 @@ async function* nodeExecutor(options, context) {
     let additionalExitHandler = null;
     let currentTask = null;
     const tasks = [];
-    yield* (0, async_iterable_1.createAsyncIterable)(async ({ done, next, error }) => {
+    yield* (0, async_iterable_1.createAsyncIterable)(async ({ done, next, error, registerCleanup }) => {
         const processQueue = async () => {
             if (tasks.length === 0)
                 return;
@@ -163,6 +179,9 @@ async function* nodeExecutor(options, context) {
             await stopAllTasks('SIGHUP');
             process.exit(128 + 1);
         });
+        registerCleanup(async () => {
+            await stopAllTasks('SIGTERM');
+        });
         if (options.runBuildTargetDependencies) {
             // If a all dependencies need to be rebuild on changes, then register with watcher
             // and run through CLI, otherwise only the current project will rebuild.

package/src/generators/library/files/tsconfig-lib/ts-solution/tsconfig.lib.json__tmpl__

@@ -5,7 +5,7 @@
     "rootDir": "src",
     "outDir": "dist",
     "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,<% if (compilerOptions.length) { %>
+    "emitDeclarationOnly": <%= emitDeclarationOnly %>,<% if (compilerOptions.length) { %>
     <%- compilerOptions %>,<% } %>
     "types": ["node"]
   },

package/src/generators/library/library.js

@@ -92,7 +92,8 @@ async function libraryGeneratorInternal(tree, schema) {
     if (options.unitTestRunner === 'jest') {
         const jestCallback = await addJest(tree, options);
         tasks.push(jestCallback);
-        if (options.bundler === 'swc' || options.bundler === 'rollup') {
+        if (!options.isUsingTsSolutionConfig &&
+            (options.bundler === 'swc' || options.bundler === 'rollup')) {
             replaceJestConfig(tree, options);
         }
     }
@@ -444,10 +445,8 @@ function createFiles(tree, options) {
                 },
                 ...determineEntryFields(options),
             };
-            if (options.bundler === 'none') {
-                updatedPackageJson.type = 'module';
-            }
-            else if (options.bundler !== 'vite' && options.bundler !== 'rollup') {
+            if (options.isUsingTsSolutionConfig &&
+                !['none', 'rollup', 'vite'].includes(options.bundler)) {
                 return (0, update_package_json_1.getUpdatedPackageJsonContent)(updatedPackageJson, {
                     main: (0, path_1.join)(options.projectRoot, 'src/index.ts'),
                     outputPath: (0, devkit_1.joinPathFragments)(options.projectRoot, 'dist'),
@@ -476,21 +475,17 @@ function createFiles(tree, options) {
             // https://docs.npmjs.com/cli/v10/configuring-npm/package-json#files
             packageJson.files = ['dist', '!**/*.tsbuildinfo'];
         }
-        if (options.isUsingTsSolutionConfig) {
-            if (options.bundler === 'none') {
-                packageJson.type = 'module';
-            }
-            else if (options.bundler !== 'vite' && options.bundler !== 'rollup') {
-                packageJson = (0, update_package_json_1.getUpdatedPackageJsonContent)(packageJson, {
-                    main: (0, path_1.join)(options.projectRoot, 'src/index.ts'),
-                    outputPath: (0, devkit_1.joinPathFragments)(options.projectRoot, 'dist'),
-                    projectRoot: options.projectRoot,
-                    rootDir: (0, path_1.join)(options.projectRoot, 'src'),
-                    generateExportsField: true,
-                    packageJsonPath,
-                    format: ['esm'],
-                });
-            }
+        if (options.isUsingTsSolutionConfig &&
+            !['none', 'rollup', 'vite'].includes(options.bundler)) {
+            packageJson = (0, update_package_json_1.getUpdatedPackageJsonContent)(packageJson, {
+                main: (0, path_1.join)(options.projectRoot, 'src/index.ts'),
+                outputPath: (0, devkit_1.joinPathFragments)(options.projectRoot, 'dist'),
+                projectRoot: options.projectRoot,
+                rootDir: (0, path_1.join)(options.projectRoot, 'src'),
+                generateExportsField: true,
+                packageJsonPath,
+                format: ['esm'],
+            });
         }
         (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
     }
@@ -521,12 +516,12 @@ async function addJest(tree, options) {
         setupFile: 'none',
         supportTsx: false,
         skipSerializers: true,
-        testEnvironment: options.testEnvironment,
+        testEnvironment: options.testEnvironment ?? 'node',
         skipFormat: true,
-        compiler: options.bundler === 'swc' || options.bundler === 'tsc'
-            ? options.bundler
-            : options.bundler === 'rollup'
-                ? 'swc'
+        compiler: options.shouldUseSwcJest
+            ? 'swc'
+            : options.bundler === 'tsc'
+                ? 'tsc'
                 : undefined,
         runtimeTsconfigFileName: 'tsconfig.lib.json',
     });
@@ -647,6 +642,9 @@ async function normalizeOptions(tree, options) {
     options.minimal ??= false;
     // We default to generate a project.json file if the new setup is not being used
     options.useProjectJson ??= !isUsingTsSolutionConfig;
+    const shouldUseSwcJest = options.bundler === 'swc' ||
+        options.bundler === 'rollup' ||
+        isUsingTsSolutionConfig;
     return {
         ...options,
         fileName,
@@ -659,6 +657,7 @@ async function normalizeOptions(tree, options) {
         importPath,
         hasPlugin,
         isUsingTsSolutionConfig,
+        shouldUseSwcJest,
     };
 }
 function addProjectDependencies(tree, options) {
@@ -742,6 +741,7 @@ function createProjectTsConfigs(tree, options) {
         outDir: options.bundler === 'tsc'
             ? 'dist'
             : `out-tsc/${options.projectRoot.split('/').pop()}`,
+        emitDeclarationOnly: options.bundler === 'tsc' ? false : true,
     });
     // tsconfig.json
     if (options.isUsingTsSolutionConfig) {
@@ -903,6 +903,7 @@ function determineEntryFields(options) {
         case 'none': {
             if (options.isUsingTsSolutionConfig) {
                 return {
+                    type: 'module',
                     main: options.js ? './src/index.js' : './src/index.ts',
                     types: options.js ? './src/index.js' : './src/index.ts',
                     exports: {

package/src/generators/library/schema.d.ts

@@ -46,4 +46,5 @@ export interface NormalizedLibraryGeneratorOptions
   importPath?: string;
   hasPlugin: boolean;
   isUsingTsSolutionConfig: boolean;
+  shouldUseSwcJest: boolean;
 }

package/src/utils/swc/add-swc-config.d.ts

@@ -1,3 +1,4 @@
 import { type Tree } from '@nx/devkit';
 export declare const defaultExclude: string[];
-export declare function addSwcConfig(tree: Tree, projectDir: string, type?: 'commonjs' | 'es6'): void;
+export declare function addSwcConfig(tree: Tree, projectDir: string, type?: 'commonjs' | 'es6', supportTsx?: boolean): void;
+export declare function addSwcTestConfig(tree: Tree, projectDir: string, type?: 'commonjs' | 'es6', supportTsx?: boolean): void;

package/src/utils/swc/add-swc-config.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultExclude = void 0;
 exports.addSwcConfig = addSwcConfig;
+exports.addSwcTestConfig = addSwcTestConfig;
 const path_1 = require("path");
 exports.defaultExclude = [
     'jest.config.ts',
@@ -11,17 +12,25 @@ exports.defaultExclude = [
     './**/jest-setup.ts$',
     '.*.js$',
 ];
-const swcOptionsString = (type = 'commonjs') => `{
+const swcOptionsString = (type = 'commonjs', exclude, supportTsx) => `{
   "jsc": {
     "target": "es2017",
     "parser": {
       "syntax": "typescript",
       "decorators": true,
-      "dynamicImport": true
+      "dynamicImport": true${supportTsx
+    ? `,
+      "tsx": true`
+    : ''}
     },
     "transform": {
       "decoratorMetadata": true,
-      "legacyDecorator": true
+      "legacyDecorator": true${supportTsx
+    ? `,
+      "react": {
+        "runtime": "automatic"
+      }`
+    : ''}
     },
     "keepClassNames": true,
     "externalHelpers": true,
@@ -31,11 +40,18 @@ const swcOptionsString = (type = 'commonjs') => `{
     "type": "${type}"
   },
   "sourceMaps": true,
-  "exclude": ${JSON.stringify(exports.defaultExclude)}
-}`;
-function addSwcConfig(tree, projectDir, type = 'commonjs') {
+  "exclude": ${JSON.stringify(exclude)}
+}
+`;
+function addSwcConfig(tree, projectDir, type = 'commonjs', supportTsx = false) {
     const swcrcPath = (0, path_1.join)(projectDir, '.swcrc');
     if (tree.exists(swcrcPath))
         return;
-    tree.write(swcrcPath, swcOptionsString(type));
+    tree.write(swcrcPath, swcOptionsString(type, exports.defaultExclude, supportTsx));
+}
+function addSwcTestConfig(tree, projectDir, type = 'commonjs', supportTsx = false) {
+    const swcrcPath = (0, path_1.join)(projectDir, '.spec.swcrc');
+    if (tree.exists(swcrcPath))
+        return;
+    tree.write(swcrcPath, swcOptionsString(type, [], supportTsx));
 }

package/src/utils/typescript/ts-solution-setup.js

@@ -185,7 +185,7 @@ function getProjectType(tree, projectRoot, projectType) {
     const packageJson = tree.exists(packageJsonPath)
         ? (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))
         : null;
-    if (packageJson?.exports)
-        return 'library';
-    return 'application';
+    if (!packageJson?.exports)
+        return 'application';
+    return 'library';
 }