CHANGELOG.md

@@ -5,6 +5,12 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.1](https://github.com/sanity-io/pkg-utils/compare/v2.2.0...v2.2.1) (2023-01-13)
+
+### Bug Fixes
+
+- re-export default export ([da20199](https://github.com/sanity-io/pkg-utils/commit/da20199e437e841caf7a07bf886e48558e115fbf))
+
 ## [2.2.0](https://github.com/sanity-io/pkg-utils/compare/v2.1.1...v2.2.0) (2023-01-12)
 
 ### Features

package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@sanity/pkg-utils",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": "Sanity.io <hello@sanity.io>",
   "license": "MIT",
   "description": "Simple utilities for modern npm packages.",
@@ -48,6 +48,7 @@
     "extract": "sanity-tsdoc etl --outDir etc/api/@sanity/pkg-utils --tsconfig tsconfig.dist.json",
     "format": "prettier --write --cache --ignore-unknown .",
     "lint": "eslint . --ext .cjs,.js,.ts,.tsx",
+    "playground:build": "pnpm --filter './playground/**' build",
     "playground:clean": "pnpm --filter './playground/**' --silent clean",
     "prepublishOnly": "pnpm run build",
     "release": "semantic-release",

playground/default-export/package.json

@@ -0,0 +1,27 @@
+{
+  "private": true,
+  "type": "module",
+  "name": "default-export",
+  "version": "1.0.0",
+  "license": "MIT",
+  "source": "./src/index.js",
+  "module": "./dist/index.js",
+  "main": "./dist/index.cjs",
+  "exports": {
+    ".": {
+      "source": "./src/index.js",
+      "require": "./dist/index.cjs",
+      "node": {
+        "import": "./dist/index.cjs.js",
+        "require": "./dist/index.cjs"
+      },
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "build": "run-s clean && pkg build --strict && pkg --strict",
+    "clean": "rimraf dist"
+  }
+}

playground/default-export/src/index.js

@@ -0,0 +1,7 @@
+function main() {
+  return true
+}
+
+export default main
+
+export const version = '1.0.0'

playground/multi-export/package.json

@@ -14,7 +14,7 @@
       "source": "./src/index.ts",
       "require": "./dist/index.cjs",
       "node": {
-        "import": "./dist/node/index.cjs.js",
+        "import": "./dist/index.cjs.js",
         "require": "./dist/index.cjs"
       },
       "import": "./dist/index.js",
@@ -25,7 +25,7 @@
       "source": "./src/plugin.ts",
       "require": "./dist/plugin.cjs",
       "node": {
-        "import": "./dist/node/plugin.cjs.js",
+        "import": "./dist/plugin.cjs.js",
         "require": "./dist/plugin.cjs"
       },
       "import": "./dist/plugin.js",

src/node/tasks/node/reexportCjsTask.ts

@@ -51,13 +51,32 @@ async function exec(ctx: BuildContext, task: NodeReExportFromCJSTask) {
       relativeImport = relativeImport.slice(2)
     }
 
-    const code = [
-      `import cjs from '${relativeImport}';`,
-      '',
-      ...Object.keys(mod).map((k) => `export const ${k} = cjs.${k};`),
-      '',
-    ].join('\n')
+    const code = compileESMWrapper(mod, relativeImport)
 
     await writeFile(targetPath, code, 'utf8')
   }
 }
+
+function compileESMWrapper(mod: any, relativeImport: string) {
+  const keys = Object.keys(mod).filter((k) => k !== '__esModule')
+
+  let code = `import cjs from '${relativeImport}';\n`
+
+  if (keys.length) {
+    code += `\n`
+    code += keys
+      .filter((k) => (mod.__esModule ? k !== 'default' : true))
+      .map((k) => `export const ${k} = cjs.${k};\n`)
+      .join('')
+  }
+
+  code += `\n`
+
+  if (mod.__esModule) {
+    code += `export default cjs.default;\n`
+  } else {
+    code += `export default cjs;\n`
+  }
+
+  return code
+}