Merge pull request #19206 from darenbt/build/lib-docs-tools+lib-instr…

…umenter-tsup Build: Bundle lib/docs-tools & lib/instrumenter with ts-up
storybookjs · Oct 17, 2022 · 23e2e27 · 23e2e27
2 parents 1228ccc + fa51a4b
commit 23e2e27
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 15 deletions.
diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json
@@ -58,15 +58,15 @@
     "@types/webpack-env": "^1.16.0",
     "typescript": "~4.6.3"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "bundler": {
     "entries": [
       "./src/index.ts",
       "./src/highlight.ts"
     ]
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "gitHead": "438114fcf62a763f0e8c07e2c34890dd987ca431",
   "sbmodern": "dist/modern/index.js",
   "storybook": {

diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json
@@ -20,9 +20,17 @@
   },
   "license": "MIT",
   "sideEffects": false,
-  "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"
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
@@ -31,10 +39,11 @@
   ],
   "scripts": {
     "check": "../../../scripts/node_modules/.bin/tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
     "@babel/core": "^7.12.10",
+    "@storybook/core-common": "7.0.0-alpha.38",
     "@storybook/csf": "0.0.2--canary.49.258942b.0",
     "@storybook/store": "7.0.0-alpha.38",
     "doctrine": "^3.0.0",
@@ -48,5 +57,10 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundler": {
+    "entries": [
+      "./src/index.ts"
+    ]
+  },
   "gitHead": "438114fcf62a763f0e8c07e2c34890dd987ca431"
 }
diff --git a/code/lib/docs-tools/src/argTypes/enhanceArgTypes.ts b/code/lib/docs-tools/src/argTypes/enhanceArgTypes.ts
@@ -13,7 +13,7 @@ export const enhanceArgTypes = <TFramework extends AnyFramework>(
 
   const extractedArgTypes = extractArgTypes && component ? extractArgTypes(component) : {};
   const withExtractedTypes = extractedArgTypes
-    ? combineParameters(extractedArgTypes, userArgTypes)
+    ? (combineParameters(extractedArgTypes, userArgTypes) as typeof userArgTypes)
     : userArgTypes;
 
   return withExtractedTypes;

diff --git a/code/lib/docs-tools/src/hasDocsOrControls.ts b/code/lib/docs-tools/src/hasDocsOrControls.ts
@@ -1,7 +1,7 @@
-import type { StorybookConfigOptions } from '@storybook/core-common';
+import type { Options } from '@storybook/core-common';
 
 // `addons/x` is for the monorepo, `addon-x` is for normal usage
 const packageRe = /(addons\/|addon-)(docs|controls)/;
 
-export const hasDocsOrControls = (options: StorybookConfigOptions) =>
+export const hasDocsOrControls = (options: Options) =>
   options.presetsList?.some((preset) => packageRe.test(preset.name));
diff --git a/code/lib/docs-tools/src/index.ts b/code/lib/docs-tools/src/index.ts
@@ -1,3 +1,3 @@
-export * from './argTypes';
+export * from './argTypes/index';
 export * from './shared';
 export * from './hasDocsOrControls';
diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json
@@ -20,9 +20,17 @@
   },
   "license": "MIT",
   "sideEffects": false,
-  "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"
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
@@ -31,7 +39,7 @@
   ],
   "scripts": {
     "check": "../../../scripts/node_modules/.bin/tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
     "@storybook/addons": "7.0.0-alpha.38",
@@ -46,5 +54,10 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundler": {
+    "entries": [
+      "./src/index.ts"
+    ]
+  },
   "gitHead": "438114fcf62a763f0e8c07e2c34890dd987ca431"
 }
diff --git a/code/yarn.lock b/code/yarn.lock
@@ -7636,6 +7636,7 @@ __metadata:
   resolution: "@storybook/docs-tools@workspace:lib/docs-tools"
   dependencies:
     "@babel/core": ^7.12.10
+    "@storybook/core-common": 7.0.0-alpha.38
     "@storybook/csf": 0.0.2--canary.49.258942b.0
     "@storybook/store": 7.0.0-alpha.38
     doctrine: ^3.0.0