@nx/js 19.1.0-beta.0 → 19.1.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.1.0-beta.0",
+  "version": "19.1.0-beta.1",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -56,9 +56,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.1.0-beta.0",
-    "@nx/workspace": "19.1.0-beta.0",
-    "@nrwl/js": "19.1.0-beta.0"
+    "@nx/devkit": "19.1.0-beta.1",
+    "@nx/workspace": "19.1.0-beta.1",
+    "@nrwl/js": "19.1.0-beta.1"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/generators/library/files/jest-config/jest.config.__ext__

@@ -20,7 +20,7 @@ if (swcJestConfig.swcrc === undefined) {
 
 <% if(js) {%>module.exports =<% } else { %>export default<% } %> {
   displayName: '<%= project %>',
-  preset: '<%= offsetFromRoot %>jest.preset.js',
+  preset: '<%= offsetFromRoot %><%= jestPreset %>',
   transform: {
     '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
   },

package/src/generators/library/library.js

@@ -425,9 +425,11 @@ function replaceJestConfig(tree, options) {
     if (tree.exists(existingJestConfig)) {
         tree.delete(existingJestConfig);
     }
+    const jestPreset = findRootJestPreset(tree) ?? 'jest.presets.js';
     // replace with JS:SWC specific jest config
     (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, {
         ext: options.js ? 'js' : 'ts',
+        jestPreset,
         js: !!options.js,
         project: options.name,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
@@ -748,4 +750,8 @@ function logNxReleaseDocsInfo() {
         title: `📦 To learn how to publish this library, see https://nx.dev/core-features/manage-releases.`,
     });
 }
+function findRootJestPreset(tree) {
+    const ext = ['js', 'cjs', 'mjs'].find((ext) => tree.exists(`jest.preset.${ext}`));
+    return ext ? `jest.preset.${ext}` : null;
+}
 exports.default = libraryGenerator;

package/src/utils/package-json/update-package-json.d.ts

@@ -3,6 +3,7 @@ import { DependentBuildableProjectNode } from '../buildable-libs-utils';
 import type { PackageJson } from 'nx/src/utils/package-json';
 export type SupportedFormat = 'cjs' | 'esm';
 export interface UpdatePackageJsonOption {
+    rootDir?: string;
     projectRoot: string;
     main: string;
     additionalEntryPoints?: string[];
@@ -23,7 +24,7 @@ interface Exports {
     '.': string;
     [name: string]: string;
 }
-export declare function getExports(options: Pick<UpdatePackageJsonOption, 'main' | 'projectRoot' | 'outputFileName' | 'additionalEntryPoints'> & {
+export declare function getExports(options: Pick<UpdatePackageJsonOption, 'main' | 'rootDir' | 'projectRoot' | 'outputFileName' | 'additionalEntryPoints'> & {
     fileExt: string;
 }): Exports;
 export declare function getUpdatedPackageJsonContent(packageJson: PackageJson, options: UpdatePackageJsonOption): PackageJson;

package/src/utils/package-json/update-package-json.js

@@ -99,7 +99,7 @@ function getExports(options) {
         : (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
     const relativeMainFileDir = options.outputFileName
         ? './'
-        : (0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(options.main, options.projectRoot);
+        : (0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(options.main, options.rootDir ?? options.projectRoot);
     const exports = {
         '.': relativeMainFileDir + mainFile + options.fileExt,
     };
@@ -123,23 +123,23 @@ function getUpdatedPackageJsonContent(packageJson, options) {
     const hasCjsFormat = !options.format || options.format?.includes('cjs');
     const hasEsmFormat = options.format?.includes('esm');
     if (options.generateExportsField) {
-        packageJson.exports =
+        packageJson.exports ??=
             typeof packageJson.exports === 'string' ? {} : { ...packageJson.exports };
-        packageJson.exports['./package.json'] = './package.json';
+        packageJson.exports['./package.json'] ??= './package.json';
     }
     if (hasEsmFormat) {
         const esmExports = getExports({
             ...options,
             fileExt: options.outputFileExtensionForEsm ?? '.js',
         });
-        packageJson.module = esmExports['.'];
+        packageJson.module ??= esmExports['.'];
         if (!hasCjsFormat) {
             packageJson.type = 'module';
             packageJson.main ??= esmExports['.'];
         }
         if (options.generateExportsField) {
             for (const [exportEntry, filePath] of Object.entries(esmExports)) {
-                packageJson.exports[exportEntry] = hasCjsFormat
+                packageJson.exports[exportEntry] ??= hasCjsFormat
                     ? { import: filePath }
                     : filePath;
             }
@@ -153,7 +153,7 @@ function getUpdatedPackageJsonContent(packageJson, options) {
             ...options,
             fileExt: options.outputFileExtensionForCjs ?? '.js',
         });
-        packageJson.main = cjsExports['.'];
+        packageJson.main ??= cjsExports['.'];
         if (!hasEsmFormat) {
             packageJson.type = 'commonjs';
         }
@@ -163,7 +163,7 @@ function getUpdatedPackageJsonContent(packageJson, options) {
                     packageJson.exports[exportEntry]['default'] ??= filePath;
                 }
                 else {
-                    packageJson.exports[exportEntry] = filePath;
+                    packageJson.exports[exportEntry] ??= filePath;
                 }
             }
         }
@@ -172,7 +172,7 @@ function getUpdatedPackageJsonContent(packageJson, options) {
         const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
         const relativeMainFileDir = (0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(options.main, options.projectRoot);
         const typingsFile = `${relativeMainFileDir}${mainFile}.d.ts`;
-        packageJson.types = packageJson.types ?? typingsFile;
+        packageJson.types ??= typingsFile;
     }
     return packageJson;
 }