@nx/js 16.6.0 → 16.7.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.6.0",
+  "version": "16.7.0-beta.0",
   "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,9 +39,9 @@
     "@babel/preset-env": "^7.22.9",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nrwl/js": "16.6.0",
-    "@nx/devkit": "16.6.0",
-    "@nx/workspace": "16.6.0",
+    "@nrwl/js": "16.7.0-beta.0",
+    "@nx/devkit": "16.7.0-beta.0",
+    "@nx/workspace": "16.7.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -71,5 +71,5 @@
     "access": "public"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "d02a8dbf06c85de78c0c76f64a17f10ae8085739"
+  "gitHead": "bda51652665181d38894e7ed910151e60176a9be"
 }

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

@@ -265,7 +265,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
         const fileName = `${path.parse(buildOptions.main).name}.js`;
         if (buildTargetExecutor === '@nx/js:tsc' ||
             buildTargetExecutor === '@nx/js:swc') {
-            outputFileName = path.join((0, get_main_file_dir_1.getMainFileDirRelativeToProjectRoot)(buildOptions.main, project.data.root), fileName);
+            outputFileName = path.join((0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(buildOptions.main, project.data.root), fileName);
         }
         else {
             outputFileName = fileName;

package/src/executors/swc/schema.json

@@ -11,18 +11,36 @@
       "type": "string",
       "description": "The name of the main entry-point file.",
       "x-completion-type": "file",
-      "x-completion-glob": "main@(.js|.ts|.tsx)"
+      "x-completion-glob": "main@(.js|.ts|.tsx)",
+      "x-priority": "important"
+    },
+    "generateExportsField": {
+      "type": "boolean",
+      "alias": "exports",
+      "description": "Update the output package.json file's 'exports' field. This field is used by Node and bundles.",
+      "x-priority": "important",
+      "default": false
+    },
+    "additionalEntryPoints": {
+      "type": "array",
+      "description": "Additional entry-points to add to exports field in the package.json file.",
+      "items": {
+        "type": "string"
+      },
+      "x-priority": "important"
     },
     "outputPath": {
       "type": "string",
       "description": "The output path of the generated files.",
-      "x-completion-type": "directory"
+      "x-completion-type": "directory",
+      "x-priority": "important"
     },
     "tsConfig": {
       "type": "string",
       "description": "The path to the Typescript configuration file.",
       "x-completion-type": "file",
-      "x-completion-glob": "tsconfig.*.json"
+      "x-completion-glob": "tsconfig.*.json",
+      "x-priority": "important"
     },
     "swcrc": {
       "type": "string",

package/src/executors/swc/swc.impl.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.swcExecutor = void 0;
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
 const assets_1 = require("../../utils/assets/assets");
 const fs_extra_1 = require("fs-extra");
+const fast_glob_1 = require("fast-glob");
 const path_1 = require("path");
 const assets_2 = require("../../utils/assets");
 const check_dependencies_1 = require("../../utils/check-dependencies");
@@ -69,13 +71,23 @@ function swcExecutor(_options, context) {
             // - other libraries that are not dependent on the current project
             options.swcCliOptions.swcrcPath = (0, inline_2.generateTmpSwcrc)(inlineProjectGraph, options.swcCliOptions.swcrcPath);
         }
+        function determineModuleFormatFromSwcrc(absolutePathToSwcrc) {
+            var _a, _b;
+            const swcrc = (0, devkit_1.readJsonFile)(absolutePathToSwcrc);
+            return ((_b = (_a = swcrc.module) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.startsWith('es')) ? 'esm' : 'cjs';
+        }
         if (options.watch) {
             let disposeFn;
             process.on('SIGINT', () => disposeFn());
             process.on('SIGTERM', () => disposeFn());
             return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, compile_swc_1.compileSwcWatch)(context, options, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const assetResult = yield (0, assets_2.copyAssets)(options, context);
-                const packageJsonResult = yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { skipTypings: !options.skipTypeCheck }), context);
+                const packageJsonResult = yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { additionalEntryPoints: createEntryPoints(options, context), format: [
+                        determineModuleFormatFromSwcrc(options.swcCliOptions.swcrcPath),
+                    ], 
+                    // As long as d.ts files match their .js counterparts, we don't need to emit them.
+                    // TSC can match them correctly based on file names.
+                    skipTypings: true }), context);
                 removeTmpSwcrc(options.swcCliOptions.swcrcPath);
                 disposeFn = () => {
                     assetResult === null || assetResult === void 0 ? void 0 : assetResult.stop();
@@ -86,7 +98,12 @@ function swcExecutor(_options, context) {
         else {
             return yield tslib_1.__await(yield yield tslib_1.__await((0, compile_swc_1.compileSwc)(context, options, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 yield (0, assets_2.copyAssets)(options, context);
-                yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { generateExportsField: true, skipTypings: !options.skipTypeCheck, extraDependencies: swcHelperDependency ? [swcHelperDependency] : [] }), context);
+                yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { additionalEntryPoints: createEntryPoints(options, context), format: [
+                        determineModuleFormatFromSwcrc(options.swcCliOptions.swcrcPath),
+                    ], 
+                    // As long as d.ts files match their .js counterparts, we don't need to emit them.
+                    // TSC can match them correctly based on file names.
+                    skipTypings: true, extraDependencies: swcHelperDependency ? [swcHelperDependency] : [] }), context);
                 removeTmpSwcrc(options.swcCliOptions.swcrcPath);
                 (0, inline_1.postProcessInlinedDependencies)(options.outputPath, options.originalProjectRoot, inlineProjectGraph);
             }))));
@@ -99,4 +116,12 @@ function removeTmpSwcrc(swcrcPath) {
         (0, fs_extra_1.removeSync)((0, path_1.dirname)(swcrcPath));
     }
 }
+function createEntryPoints(options, context) {
+    var _a;
+    if (!((_a = options.additionalEntryPoints) === null || _a === void 0 ? void 0 : _a.length))
+        return [];
+    return (0, fast_glob_1.sync)(options.additionalEntryPoints, {
+        cwd: context.root,
+    });
+}
 exports.default = swcExecutor;

package/src/executors/tsc/schema.json

@@ -10,7 +10,23 @@
       "type": "string",
       "description": "The name of the main entry-point file.",
       "x-completion-type": "file",
-      "x-completion-glob": "main@(.js|.ts|.jsx|.tsx)"
+      "x-completion-glob": "main@(.js|.ts|.jsx|.tsx)",
+      "x-priority": "important"
+    },
+    "generateExportsField": {
+      "type": "boolean",
+      "alias": "exports",
+      "description": "Update the output package.json file's 'exports' field. This field is used by Node and bundles.",
+      "default": false,
+      "x-priority": "important"
+    },
+    "additionalEntryPoints": {
+      "type": "array",
+      "description": "Additional entry-points to add to exports field in the package.json file.",
+      "items": {
+        "type": "string"
+      },
+      "x-priority": "important"
     },
     "rootDir": {
       "type": "string",
@@ -19,13 +35,15 @@
     "outputPath": {
       "type": "string",
       "description": "The output path of the generated files.",
-      "x-completion-type": "directory"
+      "x-completion-type": "directory",
+      "x-priority": "important"
     },
     "tsConfig": {
       "type": "string",
       "description": "The path to the Typescript configuration file.",
       "x-completion-type": "file",
-      "x-completion-glob": "tsconfig.*.json"
+      "x-completion-glob": "tsconfig.*.json",
+      "x-priority": "important"
     },
     "assets": {
       "type": "array",

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

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const async_iterator_1 = require("nx/src/utils/async-iterator");
 const update_package_json_1 = require("../../utils/package-json/update-package-json");
+const tsc_impl_1 = require("./tsc.impl");
 const lib_1 = require("./lib");
 const batch_1 = require("./lib/batch");
 function tscBatchExecutor(taskGraph, inputs, overrides, context) {
@@ -47,7 +48,10 @@ function tscBatchExecutor(taskGraph, inputs, overrides, context) {
             if (tsConfigTaskInfoMap[tsConfig]) {
                 const taskInfo = tsConfigTaskInfoMap[tsConfig];
                 taskInfo.assetsHandler.processAllAssetsOnceSync();
-                (0, update_package_json_1.updatePackageJson)(taskInfo.options, taskInfo.context, taskInfo.projectGraphNode, taskInfo.buildableProjectNodeDependencies);
+                (0, update_package_json_1.updatePackageJson)(Object.assign(Object.assign({}, taskInfo.options), { additionalEntryPoints: (0, tsc_impl_1.createEntryPoints)(taskInfo.options, context), format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(tsConfig)], 
+                    // As long as d.ts files match their .js counterparts, we don't need to emit them.
+                    // TSC can match them correctly based on file names.
+                    skipTypings: true }), taskInfo.context, taskInfo.projectGraphNode, taskInfo.buildableProjectNodeDependencies);
                 taskInfo.endTime = Date.now();
             }
         };
@@ -64,7 +68,10 @@ function tscBatchExecutor(taskGraph, inputs, overrides, context) {
             const watchAssetsChangesDisposer = yield tslib_1.__await((0, batch_1.watchTaskProjectsFileChangesForAssets)(taskInfos));
             const watchProjectsChangesDisposer = yield tslib_1.__await((0, batch_1.watchTaskProjectsPackageJsonFileChanges)(taskInfos, (changedTaskInfos) => {
                 for (const t of changedTaskInfos) {
-                    (0, update_package_json_1.updatePackageJson)(t.options, t.context, t.projectGraphNode, t.buildableProjectNodeDependencies);
+                    (0, update_package_json_1.updatePackageJson)(Object.assign(Object.assign({}, t.options), { additionalEntryPoints: (0, tsc_impl_1.createEntryPoints)(t.options, context), format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(t.options.tsConfig)], 
+                        // As long as d.ts files match their .js counterparts, we don't need to emit them.
+                        // TSC can match them correctly based on file names.
+                        skipTypings: true }), t.context, t.projectGraphNode, t.buildableProjectNodeDependencies);
                 }
             }));
             const handleTermination = (exitCode) => tslib_1.__awaiter(this, void 0, void 0, function* () {

package/src/executors/tsc/tsc.impl.d.ts

@@ -1,6 +1,10 @@
 import { ExecutorContext } from '@nx/devkit';
 import type { TypeScriptCompilationOptions } from '@nx/workspace/src/utilities/typescript/compilation';
 import { ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
+export declare function determineModuleFormatFromTsConfig(absolutePathToTsConfig: string): 'cjs' | 'esm';
 export declare function createTypeScriptCompilationOptions(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext): TypeScriptCompilationOptions;
 export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("../../utils/typescript/compile-typescript-files").TypescriptCompilationResult, any, undefined>;
+export declare function createEntryPoints(options: {
+    additionalEntryPoints?: string[];
+}, context: ExecutorContext): string[];
 export default tscExecutor;

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

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tscExecutor = exports.createTypeScriptCompilationOptions = void 0;
+exports.createEntryPoints = exports.tscExecutor = exports.createTypeScriptCompilationOptions = exports.determineModuleFormatFromTsConfig = void 0;
 const tslib_1 = require("tslib");
+const ts = require("typescript");
+const fast_glob_1 = require("fast-glob");
 const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
 const check_dependencies_1 = require("../../utils/check-dependencies");
 const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
@@ -10,6 +12,20 @@ const update_package_json_1 = require("../../utils/package-json/update-package-j
 const compile_typescript_files_1 = require("../../utils/typescript/compile-typescript-files");
 const watch_for_single_file_changes_1 = require("../../utils/watch-for-single-file-changes");
 const lib_1 = require("./lib");
+const ts_config_1 = require("../../utils/typescript/ts-config");
+function determineModuleFormatFromTsConfig(absolutePathToTsConfig) {
+    const tsConfig = (0, ts_config_1.readTsConfig)(absolutePathToTsConfig);
+    if (tsConfig.options.module === ts.ModuleKind.ES2015 ||
+        tsConfig.options.module === ts.ModuleKind.ES2020 ||
+        tsConfig.options.module === ts.ModuleKind.ES2022 ||
+        tsConfig.options.module === ts.ModuleKind.ESNext) {
+        return 'esm';
+    }
+    else {
+        return 'cjs';
+    }
+}
+exports.determineModuleFormatFromTsConfig = determineModuleFormatFromTsConfig;
 function createTypeScriptCompilationOptions(normalizedOptions, context) {
     return {
         outputPath: normalizedOptions.outputPath,
@@ -48,12 +64,18 @@ function tscExecutor(_options, context) {
         }
         const typescriptCompilation = (0, compile_typescript_files_1.compileTypeScriptFiles)(options, tsCompilationOptions, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             yield assetHandler.processAllAssetsOnce();
-            (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
+            (0, update_package_json_1.updatePackageJson)(Object.assign(Object.assign({}, options), { additionalEntryPoints: createEntryPoints(options, context), format: [determineModuleFormatFromTsConfig(options.tsConfig)], 
+                // As long as d.ts files match their .js counterparts, we don't need to emit them.
+                // TSC can match them correctly based on file names.
+                skipTypings: true }), context, target, dependencies);
             (0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions.outputPath, tsCompilationOptions.projectRoot, inlineProjectGraph);
         }));
         if (options.watch) {
             const disposeWatchAssetChanges = yield tslib_1.__await(assetHandler.watchAndProcessOnAssetChange());
-            const disposePackageJsonChanges = yield tslib_1.__await((0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies)));
+            const disposePackageJsonChanges = yield tslib_1.__await((0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)(Object.assign(Object.assign({}, options), { additionalEntryPoints: createEntryPoints(options, context), 
+                // As long as d.ts files match their .js counterparts, we don't need to emit them.
+                // TSC can match them correctly based on file names.
+                skipTypings: true, format: [determineModuleFormatFromTsConfig(options.tsConfig)] }), context, target, dependencies)));
             const handleTermination = (exitCode) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 yield typescriptCompilation.close();
                 disposeWatchAssetChanges();
@@ -67,4 +89,13 @@ function tscExecutor(_options, context) {
     });
 }
 exports.tscExecutor = tscExecutor;
+function createEntryPoints(options, context) {
+    var _a;
+    if (!((_a = options.additionalEntryPoints) === null || _a === void 0 ? void 0 : _a.length))
+        return [];
+    return (0, fast_glob_1.sync)(options.additionalEntryPoints, {
+        cwd: context.root,
+    });
+}
+exports.createEntryPoints = createEntryPoints;
 exports.default = tscExecutor;

package/src/utils/get-main-file-dir.d.ts

@@ -1 +1 @@
-export declare function getMainFileDirRelativeToProjectRoot(main: string, projectRoot: string): string;
+export declare function getRelativeDirectoryToProjectRoot(file: string, projectRoot: string): string;

package/src/utils/get-main-file-dir.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMainFileDirRelativeToProjectRoot = void 0;
+exports.getRelativeDirectoryToProjectRoot = void 0;
 const path_1 = require("path");
 const path_2 = require("nx/src/utils/path");
-function getMainFileDirRelativeToProjectRoot(main, projectRoot) {
-    const mainFileDir = (0, path_1.dirname)(main);
-    const relativeDir = (0, path_2.normalizePath)((0, path_1.relative)(projectRoot, mainFileDir));
+function getRelativeDirectoryToProjectRoot(file, projectRoot) {
+    const dir = (0, path_1.dirname)(file);
+    const relativeDir = (0, path_2.normalizePath)((0, path_1.relative)(projectRoot, dir));
     return relativeDir === '' ? `./` : `./${relativeDir}/`;
 }
-exports.getMainFileDirRelativeToProjectRoot = getMainFileDirRelativeToProjectRoot;
+exports.getRelativeDirectoryToProjectRoot = getRelativeDirectoryToProjectRoot;

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

@@ -5,10 +5,12 @@ export type SupportedFormat = 'cjs' | 'esm';
 export interface UpdatePackageJsonOption {
     projectRoot: string;
     main: string;
+    additionalEntryPoints?: string[];
     format?: SupportedFormat[];
     outputPath: string;
     outputFileName?: string;
     outputFileExtensionForCjs?: `.${string}`;
+    outputFileExtensionForEsm?: `.${string}`;
     skipTypings?: boolean;
     generateExportsField?: boolean;
     excludeLibsInPackageJson?: boolean;
@@ -17,4 +19,12 @@ export interface UpdatePackageJsonOption {
     generateLockfile?: boolean;
 }
 export declare function updatePackageJson(options: UpdatePackageJsonOption, context: ExecutorContext, target: ProjectGraphProjectNode, dependencies: DependentBuildableProjectNode[], fileMap?: ProjectFileMap): void;
+interface Exports {
+    '.': string;
+    [name: string]: string;
+}
+export declare function getExports(options: Pick<UpdatePackageJsonOption, 'main' | 'projectRoot' | 'outputFileName' | 'additionalEntryPoints'> & {
+    fileExt: string;
+}): Exports;
 export declare function getUpdatedPackageJsonContent(packageJson: PackageJson, options: UpdatePackageJsonOption): PackageJson;
+export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUpdatedPackageJsonContent = exports.updatePackageJson = void 0;
+exports.getUpdatedPackageJsonContent = exports.getExports = exports.updatePackageJson = void 0;
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
@@ -88,56 +88,82 @@ function addMissingDependencies(packageJson, { projectName, targetName, configur
         }
     });
 }
+function getExports(options) {
+    const mainFile = options.outputFileName
+        ? options.outputFileName.replace(/\.[tj]s$/, '')
+        : (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
+    const relativeMainFileDir = options.outputFileName
+        ? './'
+        : (0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(options.main, options.projectRoot);
+    const exports = {
+        '.': relativeMainFileDir + mainFile + options.fileExt,
+    };
+    if (options.additionalEntryPoints) {
+        const jsRegex = /\.[jt]sx?$/;
+        for (const file of options.additionalEntryPoints) {
+            const { ext: fileExt, name: fileName } = (0, path_1.parse)(file);
+            const relativeDir = (0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(file, options.projectRoot);
+            const sourceFilePath = relativeDir + fileName;
+            const entryFilepath = sourceFilePath.replace(/^\.\/src\//, './');
+            const isJsFile = jsRegex.test(fileExt);
+            exports[isJsFile ? entryFilepath : entryFilepath + fileExt] =
+                sourceFilePath + (isJsFile ? options.fileExt : fileExt);
+        }
+    }
+    return exports;
+}
+exports.getExports = getExports;
 function getUpdatedPackageJsonContent(packageJson, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    var _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g;
+    var _h;
     // Default is CJS unless esm is explicitly passed.
     const hasCjsFormat = !options.format || ((_a = options.format) === null || _a === void 0 ? void 0 : _a.includes('cjs'));
     const hasEsmFormat = (_b = options.format) === null || _b === void 0 ? void 0 : _b.includes('esm');
-    const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
-    const relativeMainFileDir = (0, get_main_file_dir_1.getMainFileDirRelativeToProjectRoot)(options.main, options.projectRoot);
-    const typingsFile = `${relativeMainFileDir}${mainFile}.d.ts`;
-    const exports = typeof packageJson.exports === 'string'
-        ? packageJson.exports
-        : Object.assign({ '.': {} }, packageJson.exports);
-    const mainJsFile = (_c = options.outputFileName) !== null && _c !== void 0 ? _c : `${relativeMainFileDir}${mainFile}.js`;
+    if (options.generateExportsField) {
+        packageJson.exports =
+            typeof packageJson.exports === 'string' ? {} : Object.assign({}, packageJson.exports);
+        packageJson.exports['./package.json'] = './package.json';
+    }
     if (hasEsmFormat) {
-        // Unofficial field for backwards compat.
-        (_d = packageJson.module) !== null && _d !== void 0 ? _d : (packageJson.module = mainJsFile);
+        const esmExports = getExports(Object.assign(Object.assign({}, options), { fileExt: (_c = options.outputFileExtensionForEsm) !== null && _c !== void 0 ? _c : '.js' }));
+        packageJson.module = esmExports['.'];
         if (!hasCjsFormat) {
             packageJson.type = 'module';
-            (_e = packageJson.main) !== null && _e !== void 0 ? _e : (packageJson.main = mainJsFile);
+            (_d = packageJson.main) !== null && _d !== void 0 ? _d : (packageJson.main = esmExports['.']);
         }
-        if (typeof exports !== 'string') {
-            if (typeof exports['.'] !== 'string') {
-                (_f = (_o = exports['.'])['import']) !== null && _f !== void 0 ? _f : (_o['import'] = mainJsFile);
-            }
-            else if (!hasCjsFormat) {
-                (_g = exports['.']) !== null && _g !== void 0 ? _g : (exports['.'] = mainJsFile);
+        if (options.generateExportsField) {
+            for (const [exportEntry, filePath] of Object.entries(esmExports)) {
+                packageJson.exports[exportEntry] = hasCjsFormat
+                    ? { import: filePath }
+                    : filePath;
             }
         }
     }
     // CJS output may have .cjs or .js file extensions.
     // Bundlers like rollup and esbuild supports .cjs for CJS and .js for ESM.
-    // Bundlers/Compilers like webpack, tsc, swc do not have different file extensions.
+    // Bundlers/Compilers like webpack, tsc, swc do not have different file extensions (unless you use .mts or .cts in source).
     if (hasCjsFormat) {
-        const { dir, name } = (0, path_1.parse)(mainJsFile);
-        const cjsMain = `${dir ? dir : '.'}/${name}${(_h = options.outputFileExtensionForCjs) !== null && _h !== void 0 ? _h : '.js'}`;
-        (_j = packageJson.main) !== null && _j !== void 0 ? _j : (packageJson.main = cjsMain);
-        if (typeof exports !== 'string') {
-            if (typeof exports['.'] !== 'string') {
-                (_k = (_p = exports['.'])['require']) !== null && _k !== void 0 ? _k : (_p['require'] = cjsMain);
-            }
-            else if (!hasEsmFormat) {
-                (_l = exports['.']) !== null && _l !== void 0 ? _l : (exports['.'] = cjsMain);
+        const cjsExports = getExports(Object.assign(Object.assign({}, options), { fileExt: (_e = options.outputFileExtensionForCjs) !== null && _e !== void 0 ? _e : '.js' }));
+        packageJson.main = cjsExports['.'];
+        if (!hasEsmFormat) {
+            packageJson.type = 'commonjs';
+        }
+        if (options.generateExportsField) {
+            for (const [exportEntry, filePath] of Object.entries(cjsExports)) {
+                if (hasEsmFormat) {
+                    (_f = (_h = packageJson.exports[exportEntry])['default']) !== null && _f !== void 0 ? _f : (_h['default'] = filePath);
+                }
+                else {
+                    packageJson.exports[exportEntry] = filePath;
+                }
             }
         }
     }
-    if (options.generateExportsField) {
-        packageJson.exports = exports;
-    }
     if (!options.skipTypings) {
-        packageJson.types = (_m = packageJson.types) !== null && _m !== void 0 ? _m : typingsFile;
+        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 = (_g = packageJson.types) !== null && _g !== void 0 ? _g : typingsFile;
     }
     return packageJson;
 }

package/src/utils/schema.d.ts

@@ -38,6 +38,8 @@ export interface ExecutorOptions {
   rootDir?: string;
   outputPath: string;
   tsConfig: string;
+  generateExportsField?: boolean;
+  additionalEntryPoints?: string[];
   swcrc?: string;
   watch: boolean;
   clean?: boolean;

package/src/utils/swc/compile-swc.js

@@ -13,7 +13,7 @@ function getSwcCmd({ swcrcPath, srcPath, destPath }, watch = false) {
     let swcCmd = `${packageManager.exec} swc ${
     // TODO(jack): clean this up when we remove inline module support
     // Handle root project
-    srcPath === '.' ? 'src' : srcPath} -d ${destPath} --config-file=${swcrcPath}`;
+    srcPath === '.' ? 'src' : srcPath} -d ${srcPath === '.' ? `${destPath}/src` : destPath} --config-file=${swcrcPath}`;
     return watch ? swcCmd.concat(' --watch') : swcCmd;
 }
 function getTypeCheckOptions(normalizedOptions) {