Merge pull request #18544 from storybookjs/future/tsup-presets-1

Build: Use TSUP to compile the presets
storybookjs · Jun 29, 2022 · fcacaf7 · fcacaf7
2 parents ad680d1 + 4cc186b
commit fcacaf7
Show file tree

Hide file tree

Showing 24 changed files with 310 additions and 60 deletions.
diff --git a/presets/html-webpack/package.json b/presets/html-webpack/package.json
@@ -19,17 +19,34 @@
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./preset": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./package.json": {
+      "require": "./package.json",
+      "import": "./package.json",
+      "types": "./package.json"
+    }
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
     "*.d.ts"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js"
+    "prepare": "esrun ../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
     "@storybook/core-webpack": "7.0.0-alpha.6",
@@ -40,6 +57,9 @@
     "react-dom": "16.14.0",
     "webpack": "5"
   },
+  "devDependencies": {
+    "@digitak/esrun": "^3.2.2"
+  },
   "peerDependencies": {
     "@babel/core": "*"
   },
@@ -49,5 +69,8 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundlerEntrypoint": [
+    "./src/index.ts"
+  ],
   "gitHead": "a88dcca40ba169a373bad33dd76e9a4bd4f1f5ec"
 }
diff --git a/presets/html-webpack/preset.js b/presets/html-webpack/preset.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/index');
+module.exports = require('./dist/index');
diff --git a/presets/preact-webpack/package.json b/presets/preact-webpack/package.json
@@ -19,17 +19,34 @@
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./preset": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./package.json": {
+      "require": "./package.json",
+      "import": "./package.json",
+      "types": "./package.json"
+    }
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
     "*.d.ts"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js"
+    "prepare": "esrun ../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "^7.12.12",
@@ -40,6 +57,7 @@
     "react-dom": "16.14.0"
   },
   "devDependencies": {
+    "@digitak/esrun": "^3.2.2",
     "preact": "^10.5.13"
   },
   "peerDependencies": {
@@ -52,5 +70,8 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundlerEntrypoint": [
+    "./src/index.ts"
+  ],
   "gitHead": "a88dcca40ba169a373bad33dd76e9a4bd4f1f5ec"
 }
diff --git a/presets/preact-webpack/preset.js b/presets/preact-webpack/preset.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/index');
+module.exports = require('./dist/index');
diff --git a/presets/react-webpack/package.json b/presets/react-webpack/package.json
@@ -19,9 +19,46 @@
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./preset": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./dist/framework-preset-cra": {
+      "require": "./dist/framework-preset-cra.js",
+      "import": "./dist/framework-preset-cra.mjs",
+      "types": "./dist/framework-preset-cra.d.ts"
+    },
+    "./dist/framework-preset-react-docs": {
+      "require": "./dist/framework-preset-react-docs.js",
+      "import": "./dist/framework-preset-react-docs.mjs",
+      "types": "./dist/framework-preset-react-docs.d.ts"
+    },
+    "./dist/framework-preset-react-dom-hack": {
+      "require": "./dist/framework-preset-react-dom-hack.js",
+      "import": "./dist/framework-preset-react-dom-hack.mjs",
+      "types": "./dist/framework-preset-react-dom-hack.d.ts"
+    },
+    "./dist/framework-preset-react": {
+      "require": "./dist/framework-preset-react.js",
+      "import": "./dist/framework-preset-react.mjs",
+      "types": "./dist/framework-preset-react.d.ts"
+    },
+    "./package.json": {
+      "require": "./package.json",
+      "import": "./package.json",
+      "types": "./package.json"
+    }
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "types/**/*",
@@ -30,7 +67,7 @@
     "*.d.ts"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js"
+    "prepare": "esrun ../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
     "@babel/preset-flow": "^7.12.1",
@@ -50,6 +87,7 @@
     "react-refresh": "^0.11.0"
   },
   "devDependencies": {
+    "@digitak/esrun": "^3.2.2",
     "@types/util-deprecate": "^1.0.0"
   },
   "peerDependencies": {
@@ -74,5 +112,12 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundlerEntrypoint": [
+    "./src/index.ts",
+    "./src/framework-preset-cra.ts",
+    "./src/framework-preset-react-docs.ts",
+    "./src/framework-preset-react-dom-hack.ts",
+    "./src/framework-preset-react.ts"
+  ],
   "gitHead": "a88dcca40ba169a373bad33dd76e9a4bd4f1f5ec"
 }
diff --git a/presets/react-webpack/preset.js b/presets/react-webpack/preset.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/index');
+module.exports = require('./dist/index');
diff --git a/presets/react-webpack/src/framework-preset-cra.ts b/presets/react-webpack/src/framework-preset-cra.ts
@@ -1,9 +1,7 @@
 import { logger } from '@storybook/node-logger';
-import type { StorybookConfig } from '@storybook/core-webpack';
+import type { Preset, StorybookConfig } from '@storybook/core-webpack';
 import { isReactScriptsInstalled } from './cra-config';
 
-type Preset = string | { name: string };
-
 const checkForNewPreset = (presetsList: Preset[]) => {
   const hasNewPreset = presetsList.some((preset: Preset) => {
     const presetName = typeof preset === 'string' ? preset : preset.name;

diff --git a/presets/react-webpack/src/index.ts b/presets/react-webpack/src/index.ts
@@ -3,8 +3,8 @@ import type { StorybookConfig } from './types';
 export * from './types';
 
 export const addons: StorybookConfig['addons'] = [
-  require.resolve('./framework-preset-react'),
-  require.resolve('./framework-preset-react-dom-hack'),
-  require.resolve('./framework-preset-cra'),
-  require.resolve('./framework-preset-react-docs'),
+  require.resolve('@storybook/preset-react-webpack/dist/framework-preset-react'),
+  require.resolve('@storybook/preset-react-webpack/dist/framework-preset-react-dom-hack'),
+  require.resolve('@storybook/preset-react-webpack/dist/framework-preset-cra'),
+  require.resolve('@storybook/preset-react-webpack/dist/framework-preset-react-docs'),
 ];
diff --git a/presets/server-webpack/package.json b/presets/server-webpack/package.json
@@ -19,17 +19,39 @@
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./preset": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./dist/loader": {
+      "require": "./dist/loader.js",
+      "import": "./dist/loader.mjs",
+      "types": "./dist/loader.d.ts"
+    },
+    "./package.json": {
+      "require": "./package.json",
+      "import": "./package.json",
+      "types": "./package.json"
+    }
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
     "*.d.ts"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js"
+    "prepare": "esrun ../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
     "@storybook/core-server": "7.0.0-alpha.6",
@@ -45,6 +67,7 @@
     "yaml-loader": "^0.8.0"
   },
   "devDependencies": {
+    "@digitak/esrun": "^3.2.2",
     "fs-extra": "^9.0.1",
     "jest-specific-snapshot": "^4.0.0",
     "yaml": "^1.10.0"
@@ -55,5 +78,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundlerEntrypoint": [
+    "./src/index.ts",
+    "./src/loader.ts"
+  ],
   "gitHead": "a88dcca40ba169a373bad33dd76e9a4bd4f1f5ec"
 }
diff --git a/presets/server-webpack/preset.js b/presets/server-webpack/preset.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/index');
+module.exports = require('./dist/index');
diff --git a/presets/server-webpack/src/index.ts b/presets/server-webpack/src/index.ts
@@ -1,4 +1,3 @@
-import path from 'path';
 import type { StorybookConfig } from './types';
 
 export * from './types';
@@ -9,13 +8,16 @@ export const webpack: StorybookConfig['webpack'] = (config) => {
     {
       type: 'javascript/auto',
       test: /\.stories\.json$/,
-      use: path.resolve(__dirname, './loader.js'),
+      use: require.resolve('@storybook/preset-server-webpack/dist/loader'),
     },
 
     {
       type: 'javascript/auto',
       test: /\.stories\.ya?ml/,
-      use: [path.resolve(__dirname, './loader.js'), require.resolve('yaml-loader')],
+      use: [
+        require.resolve('@storybook/preset-server-webpack/dist/loader'),
+        require.resolve('yaml-loader'),
+      ],
     },
   ];
 

diff --git a/presets/svelte-webpack/package.json b/presets/svelte-webpack/package.json
@@ -19,18 +19,49 @@
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./preset": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./dist/framework-preset-svelte-docs": {
+      "require": "./dist/framework-preset-svelte-docs.js",
+      "import": "./dist/framework-preset-svelte-docs.mjs",
+      "types": "./dist/framework-preset-svelte-docs.d.ts"
+    },
+    "./dist/framework-preset-svelte": {
+      "require": "./dist/framework-preset-svelte.js",
+      "import": "./dist/framework-preset-svelte.mjs",
+      "types": "./dist/framework-preset-svelte.d.ts"
+    },
+    "./dist/svelte-docgen-loader": {
+      "require": "./dist/svelte-docgen-loader.js",
+      "import": "./dist/svelte-docgen-loader.mjs",
+      "types": "./dist/svelte-docgen-loader.d.ts"
+    },
+    "./package.json": {
+      "require": "./package.json",
+      "import": "./package.json",
+      "types": "./package.json"
+    }
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
-    "templates/**/*",
     "README.md",
     "*.js",
     "*.d.ts"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js"
+    "prepare": "esrun ../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
     "@storybook/core-webpack": "7.0.0-alpha.6",
@@ -42,6 +73,7 @@
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
+    "@digitak/esrun": "^3.2.2",
     "svelte": "^3.31.2",
     "svelte-loader": "^3.1.2"
   },
@@ -56,5 +88,11 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundlerEntrypoint": [
+    "./src/index.ts",
+    "./src/framework-preset-svelte-docs.ts",
+    "./src/framework-preset-svelte.ts",
+    "./src/svelte-docgen-loader.ts"
+  ],
   "gitHead": "a88dcca40ba169a373bad33dd76e9a4bd4f1f5ec"
 }
diff --git a/presets/svelte-webpack/preset.js b/presets/svelte-webpack/preset.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/index');
+module.exports = require('./dist/index');
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = require('./dist/cjs/index');
		module.exports = require('./dist/index');