@nx/js 20.4.0-beta.1 → 20.4.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.4.0-beta.1",
+  "version": "20.4.0-beta.2",
   "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": "20.4.0-beta.1",
-    "@nx/workspace": "20.4.0-beta.1",
+    "@nx/devkit": "20.4.0-beta.2",
+    "@nx/workspace": "20.4.0-beta.2",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

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

@@ -24,6 +24,7 @@ const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const generator_1 = require("../setup-verdaccio/generator");
 const sort_fields_1 = require("../../utils/package-json/sort-fields");
+const get_import_path_1 = require("../../utils/get-import-path");
 const defaultOutputDirectory = 'dist';
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
@@ -43,6 +44,11 @@ async function libraryGeneratorInternal(tree, schema) {
         formatter: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ? 'none' : 'prettier',
     }));
     const options = await normalizeOptions(tree, schema);
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+    }
     createFiles(tree, options);
     await configureProject(tree, options);
     if (!options.skipPackageJson) {
@@ -86,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);
         }
     }
@@ -138,11 +145,6 @@ async function libraryGeneratorInternal(tree, schema) {
             return json;
         });
     }
-    // If we are using the new TS solution
-    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
-    if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
-    }
     (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -243,8 +245,19 @@ async function configureProject(tree, options) {
         if (!projectConfiguration.tags?.length) {
             delete projectConfiguration.tags;
         }
+        // We want a minimal setup, so unless targets and tags are set, just skip the `nx` property in `package.json`.
+        if (options.isUsingTsSolutionConfig) {
+            delete projectConfiguration.projectType;
+            // SWC executor has logic around sourceRoot and `--strip-leading-paths`. If it is not set then dist will contain the `src` folder rather than being flat.
+            // TODO(leo): Look at how we can remove the dependency on sourceRoot for SWC.
+            if (options.bundler !== 'swc') {
+                delete projectConfiguration.sourceRoot;
+            }
+        }
         // empty targets are cleaned up automatically by `updateProjectConfiguration`
-        (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfiguration);
+        (0, devkit_1.updateProjectConfiguration)(tree, options.isUsingTsSolutionConfig
+            ? options.importPath ?? options.name
+            : options.name, projectConfiguration);
     }
     else if (options.config === 'workspace' || options.config === 'project') {
         (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration);
@@ -432,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'),
@@ -464,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);
     }
@@ -509,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',
     });
@@ -635,16 +642,22 @@ 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,
-        name: projectName,
+        name: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(tree, projectName)
+            : projectName,
         projectNames,
         projectRoot,
         parsedTags,
         importPath,
         hasPlugin,
         isUsingTsSolutionConfig,
+        shouldUseSwcJest,
     };
 }
 function addProjectDependencies(tree, options) {
@@ -728,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) {
@@ -889,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.d.ts

@@ -5,3 +5,4 @@ export declare function assertNotUsingTsSolutionSetup(tree: Tree, pluginName: st
 export declare function findRuntimeTsConfigName(tree: Tree, projectRoot: string): string | null;
 export declare function updateTsconfigFiles(tree: Tree, projectRoot: string, runtimeTsconfigFileName: string, compilerOptions: Record<string, string | boolean | string[]>, exclude?: string[], rootDir?: string): void;
 export declare function addProjectToTsSolutionWorkspace(tree: Tree, projectDir: string): void;
+export declare function getProjectType(tree: Tree, projectRoot: string, projectType?: 'library' | 'application'): 'library' | 'application';

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

@@ -6,6 +6,7 @@ exports.assertNotUsingTsSolutionSetup = assertNotUsingTsSolutionSetup;
 exports.findRuntimeTsConfigName = findRuntimeTsConfigName;
 exports.updateTsconfigFiles = updateTsconfigFiles;
 exports.addProjectToTsSolutionWorkspace = addProjectToTsSolutionWorkspace;
+exports.getProjectType = getProjectType;
 const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
 const tree_1 = require("nx/src/generators/tree");
@@ -172,3 +173,19 @@ function addProjectToTsSolutionWorkspace(tree, projectDir) {
         }
     }
 }
+function getProjectType(tree, projectRoot, projectType) {
+    if (projectType)
+        return projectType;
+    if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.lib.json')))
+        return 'library';
+    if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.app.json')))
+        return 'application';
+    // If there are no exports, assume it is an application since both buildable and non-buildable libraries have exports.
+    const packageJsonPath = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
+    const packageJson = tree.exists(packageJsonPath)
+        ? (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))
+        : null;
+    if (!packageJson?.exports)
+        return 'application';
+    return 'library';
+}