From 086153a90d0239bbcc8f9cae1353d682f0833917 Mon Sep 17 00:00:00 2001 From: kyletsang <6854874+kyletsang@users.noreply.github.com> Date: Fri, 29 Dec 2023 22:49:19 -0800 Subject: [PATCH 1/6] Core: move @types packages to dev deps in core-common --- code/lib/core-common/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index 7a3c1b087205..a7b4ae22c860 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -47,10 +47,6 @@ "@storybook/core-events": "workspace:*", "@storybook/node-logger": "workspace:*", "@storybook/types": "workspace:*", - "@types/find-cache-dir": "^3.2.1", - "@types/node": "^18.0.0", - "@types/node-fetch": "^2.6.4", - "@types/pretty-hrtime": "^1.0.0", "chalk": "^4.1.0", "esbuild": "^0.18.0", "esbuild-register": "^3.5.0", @@ -69,9 +65,13 @@ "ts-dedent": "^2.0.0" }, "devDependencies": { + "@types/find-cache-dir": "^3.2.1", "@types/fs-extra": "^11.0.1", "@types/mock-fs": "^4.13.1", + "@types/node": "^18.0.0", + "@types/node-fetch": "^2.6.4", "@types/picomatch": "^2.3.0", + "@types/pretty-hrtime": "^1.0.0", "mock-fs": "^5.2.0", "slash": "^5.0.0", "type-fest": "~2.19", From a701072b5aab87976a03b5f2f266648cb901b32c Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 6 Feb 2024 12:18:24 +0100 Subject: [PATCH 2/6] Discard changes to code/addons/docs/docs/props-tables.md --- code/addons/docs/docs/props-tables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/addons/docs/docs/props-tables.md b/code/addons/docs/docs/props-tables.md index 8dd5e8f7a285..dcfe92476c04 100644 --- a/code/addons/docs/docs/props-tables.md +++ b/code/addons/docs/docs/props-tables.md @@ -228,7 +228,7 @@ This package relies on a variety of sub-packages to extract property information | Framework | Underlying library | Docs | Open issues | | -------------- | ---------------------------------------- | ------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | React | `react-docgen` `react-docgen-typescript` | [Docs](../react/README.md#props-tables) | [Open issues](https://github.com/storybookjs/storybook/issues?q=is%3Aopen+is%3Aissue+label%3A%22block%3A+props%22+label%3Abug+label%3A%22app%3A+react%22) | -| Vue 3 | `vue-docgen-api` | [Docs](../vue3/README.md#props-tables) | [Open issues](https://github.com/storybookjs/storybook/issues?q=is%3Aopen+is%3Aissue+label%3A%22block%3A+props%22+label%3Abug+label%3A%22vue3%22) | +| Vue 3 | `vue-docgen-api` | [Docs](../vue3/README.md#props-tables) | [Open issues](https://github.com/storybookjs/storybook/issues?q=is%3Aopen+is%3Aissue+label%3A%22block%3A+props%22+label%3Abug+label%3A%22vue3%22) | | Angular | `compodoc` | [Docs](../angular/README.md#props-tables) | [Open issues](https://github.com/storybookjs/storybook/issues?q=is%3Aopen+is%3Aissue+label%3A%22block%3A+props%22+label%3Abug+label%3A%22app%3A+angular%22) | | Web-components | `custom-elements.json` | [Docs](../web-components/README.md#props-tables) | [Open issues](https://github.com/storybookjs/storybook/issues?q=is%3Aopen+is%3Aissue+label%3A%22block%3A+props%22+label%3Abug+label%3A%22app%3A+web-components%22) | | Ember | `yui-doc` | [Docs](../ember/README.md#props-tables) | [Open issues](https://github.com/storybookjs/storybook/issues?q=is%3Aopen+is%3Aissue+label%3A%22block%3A+props%22+label%3Abug+label%3A%22app%3A+ember%22) | From b4b7343a244689b98a4b9aa4c34b4ace7f6ef780 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 6 Feb 2024 12:18:28 +0100 Subject: [PATCH 3/6] Discard changes to code/builders/builder-vite/input/iframe.html --- code/builders/builder-vite/input/iframe.html | 96 ++++++++------------ 1 file changed, 37 insertions(+), 59 deletions(-) diff --git a/code/builders/builder-vite/input/iframe.html b/code/builders/builder-vite/input/iframe.html index 7720ef6b9482..dd976d6c4ab4 100644 --- a/code/builders/builder-vite/input/iframe.html +++ b/code/builders/builder-vite/input/iframe.html @@ -1,66 +1,44 @@ - + - - - Storybook - - - - - - + + + Storybook + - - - + ('OTHER_GLOBLALS HERE'); - - -
-
- - - - + // We do this so that "module && module.hot" etc. in Storybook source code + // doesn't fail (it will simply be disabled) + window.module = undefined; + window.global = window; + + + + + + +
+
+ + + + + \ No newline at end of file From befe593200c260c284c34deaee7a028924011d1d Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 6 Feb 2024 12:18:32 +0100 Subject: [PATCH 4/6] Discard changes to code/frameworks/nextjs/README.md --- code/frameworks/nextjs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/frameworks/nextjs/README.md b/code/frameworks/nextjs/README.md index 87019027ca9a..adbfe7c785a1 100644 --- a/code/frameworks/nextjs/README.md +++ b/code/frameworks/nextjs/README.md @@ -7,4 +7,4 @@ See [documentation](https://storybook.js.org/docs/8.0/get-started/nextjs) for in This framework borrows heavily from these Storybook addons: - [storybook-addon-next](https://github.com/RyanClementsHax/storybook-addon-next) by [RyanClementsHax](https://github.com/RyanClementsHax/) -- [storybook-addon-next-router](https://github.com/lifeiscontent/storybook-addon-next-router) by [lifeiscontent](https://github.com/lifeiscontent) +- [storybook-addon-next-router](https://github.com/lifeiscontent/storybook-addon-next-router) by [lifeiscontent](https://github.com/lifeiscontent) \ No newline at end of file From 92753a4e015e52baef8a76386db4197d26715db6 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 6 Feb 2024 12:18:36 +0100 Subject: [PATCH 5/6] Discard changes to code/lib/cli/tsconfig.json --- code/lib/cli/tsconfig.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/lib/cli/tsconfig.json b/code/lib/cli/tsconfig.json index 9c5db279ca2d..e32ebe0f7b90 100644 --- a/code/lib/cli/tsconfig.json +++ b/code/lib/cli/tsconfig.json @@ -1,11 +1,15 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "types": ["node"], + "types": [ + "node" + ], "strict": true, "skipLibCheck": true, "resolveJsonModule": true, "noEmit": true }, - "include": ["src/**/*"] -} + "include": [ + "src/**/*" + ] +} \ No newline at end of file From ead01be566787fe5ec4839db77c6df64a6f5db06 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 6 Feb 2024 12:18:40 +0100 Subject: [PATCH 6/6] Discard changes to code/presets/vue3-webpack/README.md --- code/presets/vue3-webpack/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/presets/vue3-webpack/README.md b/code/presets/vue3-webpack/README.md index 4c2a2df89914..e361f8bc4222 100644 --- a/code/presets/vue3-webpack/README.md +++ b/code/presets/vue3-webpack/README.md @@ -3,4 +3,4 @@ This package is a [preset](https://storybook.js.org/docs/addons/writing-presets#presets-api) that configures Storybook's webpack settings for handling Vue 3. It's an internal package that's not intended to be used directly by users. -- More info on [Storybook for Vue3](https://storybook.js.org/docs/get-started/why-storybook) +- More info on [Storybook for Vue3](https://storybook.js.org/docs/get-started/why-storybook) \ No newline at end of file