From a539c681069fbe5b112b013297dc1fb7c143a1df Mon Sep 17 00:00:00 2001 From: darenbt Date: Fri, 16 Sep 2022 22:11:14 -0500 Subject: [PATCH 1/3] Build lib/docs-tools + lib/instrumenter with ts-up --- code/lib/docs-tools/package.json | 21 +++++++++++++++++---- code/lib/instrumenter/package.json | 21 +++++++++++++++++---- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json index e0a4580a2b25..c80ae9add2e7 100644 --- 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,7 +39,7 @@ ], "scripts": { "check": "../../../scripts/node_modules/.bin/tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@babel/core": "^7.12.10", @@ -48,5 +56,10 @@ "publishConfig": { "access": "public" }, + "bundler": { + "entries": [ + "./src/index.ts" + ] + }, "gitHead": "5da5b0fabd04cc5cd5771e8242a960f05d03234a" } diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json index d810d4ba862d..6c3fb41f9bb2 100644 --- 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.33", @@ -46,5 +54,10 @@ "publishConfig": { "access": "public" }, + "bundler": { + "entries": [ + "./src/index.ts" + ] + }, "gitHead": "5da5b0fabd04cc5cd5771e8242a960f05d03234a" } From acde6766d66d67d9ba2700fdf14895fddcdcef9e Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 17 Oct 2022 15:46:03 +0200 Subject: [PATCH 2/3] Merge branch 'next' into build/lib-docs-tools+lib-instrumenter-tsup --- code/lib/docs-tools/package.json | 1 + code/lib/docs-tools/src/argTypes/enhanceArgTypes.ts | 2 +- code/lib/docs-tools/src/hasDocsOrControls.ts | 4 ++-- code/lib/docs-tools/src/index.ts | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json index ee2c1c50d971..4cb875f14418 100644 --- a/code/lib/docs-tools/package.json +++ b/code/lib/docs-tools/package.json @@ -43,6 +43,7 @@ }, "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", diff --git a/code/lib/docs-tools/src/argTypes/enhanceArgTypes.ts b/code/lib/docs-tools/src/argTypes/enhanceArgTypes.ts index 540b80e56b42..783b6af57d92 100644 --- 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 = ( 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 index 1417d710b9df..76dbfc25afa1 100644 --- 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 index 1df1b4a273a6..71d2f4acef2d 100644 --- 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'; From 0ac311bd1d0f7a90e3f9e4c039066bf290dbd164 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 17 Oct 2022 16:28:47 +0200 Subject: [PATCH 3/3] fix lockfile --- code/yarn.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/code/yarn.lock b/code/yarn.lock index f9014c52b87d..d817f1d76373 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7659,6 +7659,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