Use extension based on "type" in package.json

Author: brijeshb42

packages/code-infra/src/bundlers/tsdown.mjs

@@ -67,7 +67,6 @@ export async function build(args, pkgJson) {
     loader: {
       '.js': 'jsx',
     },
-    fixedExtension: true,
     logLevel: args.verbose ? 'info' : 'silent',
     tsconfig: tsconfigPath ?? undefined,
     sourcemap: false,
@@ -94,7 +93,7 @@ export async function build(args, pkgJson) {
             ? {
                 cwd,
                 tsconfig: tsconfigPath,
-                emitJs: true,
+                emitJs: false,
                 compilerOptions: {
                   jsx: 'react-jsx',
                   outDir: 'build',
@@ -154,5 +153,7 @@ export async function build(args, pkgJson) {
     );
   }
   await Promise.all(promises);
-  await writePkgJson(pkgJson, outChunks);
+  await writePkgJson(pkgJson, outChunks, {
+    usePkgType: true,
+  });
 }

packages/code-infra/src/utils/build.mjs

@@ -1,6 +1,5 @@
 import { globby } from 'globby';
 import * as fs from 'node:fs/promises';
-import * as os from 'node:os';
 import * as path from 'node:path';
 
 /**
@@ -296,9 +295,11 @@ export function validatePkgJson(pkgJson) {
 /**
  * @param {Record<string, any>} basePkgJson
  * @param {Record<string, {paths: string[]; isBin?: boolean}>} chunks
+ * @param {{ usePkgType?: boolean }} [options]
  * @returns {Promise<void>}
  */
-export async function writePkgJson(basePkgJson, chunks) {
+export async function writePkgJson(basePkgJson, chunks, options = {}) {
+  const usePkgType = options.usePkgType || false;
   const cwd = process.cwd();
   const outPath = path.join(
     cwd,
@@ -311,7 +312,10 @@ export async function writePkgJson(basePkgJson, chunks) {
   delete basePkgJson.publishConfig;
   delete basePkgJson.exports;
   delete basePkgJson.bin;
-
+  if (basePkgJson.packageScripts) {
+    basePkgJson.scripts = basePkgJson.packageScripts;
+    delete basePkgJson.packageScripts;
+  }
   basePkgJson.sideEffects ??= false;
   basePkgJson.type ??= 'commonjs';
   const isModule = basePkgJson.type === 'module';
@@ -335,10 +339,14 @@ export async function writePkgJson(basePkgJson, chunks) {
         key === 'index'
           ? '.'
           : `./${key.endsWith('/index') ? key.substring(0, key.length - '/index'.length) : key}`;
-      const requireTypePath = chunk.paths.find((p) => p.endsWith('.d.cts'));
-      const importTypePath = chunk.paths.find((p) => p.endsWith('.d.mts'));
-      const requirePath = chunk.paths.find((p) => p.endsWith('.cjs'));
-      const importPath = chunk.paths.find((p) => p.endsWith('.mjs'));
+      const cjsExtension = usePkgType && isModule ? '.cjs' : '.js';
+      const cjsDtsExtension = usePkgType && isModule ? '.d.cts' : '.d.ts';
+      const mjsExtension = usePkgType && !isModule ? '.mjs' : '.js';
+      const mjsDtsExtension = usePkgType && !isModule ? '.d.mts' : '.d.ts';
+      const requireTypePath = chunk.paths.find((p) => p.endsWith(cjsDtsExtension));
+      const importTypePath = chunk.paths.find((p) => p.endsWith(mjsDtsExtension));
+      const requirePath = chunk.paths.find((p) => p.endsWith(cjsExtension));
+      const importPath = chunk.paths.find((p) => p.endsWith(mjsExtension));
       newExports[pathKey] = {
         require: requirePath
           ? {
@@ -355,30 +363,38 @@ export async function writePkgJson(basePkgJson, chunks) {
       };
       if (newExports[pathKey].import) {
         newExports[pathKey].default = newExports[pathKey].import;
+        if (pathKey === '.') {
+          basePkgJson.module = newExports[pathKey].import.default;
+        }
         delete newExports[pathKey].import;
       } else if (newExports[pathKey].require) {
         newExports[pathKey].default = newExports[pathKey].require;
+        if (pathKey === '.') {
+          basePkgJson.main = newExports[pathKey].require.default;
+          basePkgJson.types = newExports[pathKey].require.types;
+        }
         delete newExports[pathKey].require;
       }
     }
   });
 
   if (Object.keys(newExports).length) {
+    const dotExport = newExports['.'];
+    delete newExports['.'];
     basePkgJson.exports = {
       './package.json': './package.json',
+      ...(dotExport ? { '.': dotExport } : {}),
       ...newExports,
     };
 
-    if (newExports['.']) {
-      const mainExport = newExports['.'];
-      if (typeof mainExport === 'string') {
-        basePkgJson.main = mainExport;
-      } else if (typeof mainExport === 'object') {
-        if (isModule && typeof mainExport.import === 'string') {
-          basePkgJson.module = mainExport.import;
-        } else if (!isModule && typeof mainExport.require === 'string') {
-          basePkgJson.main = mainExport.require;
-        }
+    if (dotExport) {
+      const mainExport = dotExport;
+      if (mainExport.require) {
+        basePkgJson.main = mainExport.require.default;
+        basePkgJson.types = mainExport.require.types;
+      }
+      if (mainExport.default) {
+        basePkgJson.module = mainExport.default.default;
       }
     }
   }
@@ -387,7 +403,7 @@ export async function writePkgJson(basePkgJson, chunks) {
     basePkgJson.bin = newBin;
   }
 
-  await fs.writeFile(outPath, `${JSON.stringify(basePkgJson, null, 2)}${os.EOL}`);
+  await fs.writeFile(outPath, `${JSON.stringify(basePkgJson, null, 2)}\n`);
 }
 
 const TS_CONFIG_PATHS = ['tsconfig.build.json', 'tsconfig.json'];