fixup! fixup! fixup! fixup! fixup! fixup! feat(core): split exports by browser/server for bundle size

Author: isaacs

dev-packages/rollup-utils/npmHelpers.mjs

@@ -21,7 +21,7 @@ import {
   makeSucrasePlugin,
 } from './plugins/index.mjs';
 import { makePackageNodeEsm } from './plugins/make-esm-plugin.mjs';
-import { mergePlugins } from './utils.mjs';
+import { mergeExternals, mergePlugins } from './utils.mjs';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -115,7 +115,11 @@ export function makeBaseNPMConfig(options = {}) {
 
   return deepMerge(defaultBaseConfig, packageSpecificConfig, {
     // Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
-    customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
+    customMerge: key => {
+      if (key === 'plugins') return mergePlugins;
+      if (key === 'external') return mergeExternals;
+      return undefined;
+    },
   });
 }
 

dev-packages/rollup-utils/utils.mjs

@@ -10,6 +10,24 @@ export const insertAt = (arr, index, ...insertees) => {
   return newArr;
 };
 
+/**
+ * Turn a list of module IDs into a test function
+ * Includes submodule exports by checking that it starts with the name
+ * plus a / character.
+ */
+function toFilterFunction(list) {
+  return Array.isArray(list) ? id => list.some(test => id === test || test.startsWith(`${id}/`)) : list;
+}
+
+/**
+ * Merge two external configs (function or array), returning a function that handles both.
+ */
+export function mergeExternals(base, specific) {
+  const baseFn = toFilterFunction(base);
+  const specificFn = toFilterFunction(specific);
+  return id => baseFn(id) || specificFn(id);
+}
+
 /**
  * Merge two arrays of plugins, making sure they're sorted in the correct order.
  */

packages/effect/rollup.npm.config.mjs

@@ -9,9 +9,12 @@ const baseConfig = makeBaseNPMConfig({
   },
 });
 
-const defaultExternal = baseConfig.external || [];
+const defaultExternal = baseConfig.external;
+const isDefaultExternal = typeof defaultExternal === 'function'
+  ? defaultExternal
+  : id => (defaultExternal || []).includes(id);
 baseConfig.external = id => {
-  if (defaultExternal.includes(id)) {
+  if (isDefaultExternal(id)) {
     return true;
   }
 

packages/hono/rollup.npm.config.mjs

@@ -11,7 +11,7 @@ const baseConfig = makeBaseNPMConfig({
 
 const defaultExternal = baseConfig.external;
 baseConfig.external = id => {
-  if (defaultExternal.includes(id)) {
+  if (defaultExternal(id)) {
     return true;
   }
   // Mark all hono subpaths as external

packages/nextjs/package.json

@@ -102,7 +102,7 @@
   "scripts": {
     "build": "run-p build:transpile build:types",
     "build:dev": "yarn build",
-    "build:transpile": "ts-node scripts/buildRollup.ts",
+    "build:transpile": "ts-node --project tsconfig.tsnode.json scripts/buildRollup.ts",
     "build:types": "run-s build:types:core build:types:downlevel",
     "build:types:core": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",

packages/nextjs/tsconfig.tsnode.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+
+  "include": ["src/**/*"],
+
+  "compilerOptions": {
+    // package-specific options
+  }
+}