Merge pull request #24166 from storybookjs/fix-yarn-pnp

Fix(builder-vite): Move mdx-plugin from @storybook/builder-vite to @storybook/addon-docs
storybookjs · Sep 22, 2023 · b308e54 · b308e54
2 parents df96c9d + 0f5e6c1
commit b308e54
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json
@@ -119,9 +119,11 @@
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
+    "@rollup/pluginutils": "^5.0.2",
     "react": "^16.14.0",
     "react-dom": "^16.8.0",
-    "typescript": "~4.9.3"
+    "typescript": "~4.9.3",
+    "vite": "^4.0.4"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",

diff --git a/...rs/builder-vite/src/plugins/mdx-plugin.ts → code/addons/docs/src/plugins/mdx-plugin.ts b/...rs/builder-vite/src/plugins/mdx-plugin.ts → code/addons/docs/src/plugins/mdx-plugin.ts
@@ -2,7 +2,7 @@ import type { Options } from '@storybook/types';
 import type { Plugin } from 'vite';
 import remarkSlug from 'remark-slug';
 import remarkExternalLinks from 'remark-external-links';
-import { createFilter } from 'vite';
+import { createFilter } from '@rollup/pluginutils';
 import { dirname, join } from 'path';
 
 const isStorybookMdx = (id: string) => id.endsWith('stories.mdx') || id.endsWith('story.mdx');

diff --git a/...er-vite/src/plugins/mdx-plugin.types.d.ts → ...ns/docs/src/plugins/mdx-plugin.types.d.ts b/...er-vite/src/plugins/mdx-plugin.types.d.ts → ...ns/docs/src/plugins/mdx-plugin.types.d.ts
diff --git a/code/addons/docs/src/preset.ts b/code/addons/docs/src/preset.ts
@@ -175,6 +175,15 @@ export const addons: StorybookConfig['addons'] = [
   require.resolve('@storybook/react-dom-shim/dist/preset'),
 ];
 
+export const viteFinal = async (config: any, options: Options) => {
+  const { plugins = [] } = config;
+  const { mdxPlugin } = await import('./plugins/mdx-plugin');
+
+  plugins.push(mdxPlugin(options));
+
+  return config;
+};
+
 /*
  * This is a workaround for https://github.com/Swatinem/rollup-plugin-dts/issues/162
  * something down the dependency chain is using typescript namespaces, which are not supported by rollup-plugin-dts

diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json
@@ -47,7 +47,6 @@
     "@storybook/client-logger": "workspace:*",
     "@storybook/core-common": "workspace:*",
     "@storybook/csf-plugin": "workspace:*",
-    "@storybook/mdx2-csf": "^1.0.0",
     "@storybook/node-logger": "workspace:*",
     "@storybook/preview": "workspace:*",
     "@storybook/preview-api": "workspace:*",
@@ -59,8 +58,6 @@
     "find-cache-dir": "^3.0.0",
     "fs-extra": "^11.1.0",
     "magic-string": "^0.30.0",
-    "remark-external-links": "^8.0.0",
-    "remark-slug": "^6.0.0",
     "rollup": "^2.25.0 || ^3.3.0"
   },
   "devDependencies": {
@@ -96,9 +93,6 @@
     "entries": [
       "./src/index.ts"
     ],
-    "externals": [
-      "@storybook/mdx1-csf"
-    ],
     "platform": "node"
   },
   "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17"

diff --git a/code/builders/builder-vite/src/plugins/index.ts b/code/builders/builder-vite/src/plugins/index.ts
@@ -1,5 +1,4 @@
 export * from './inject-export-order-plugin';
-export * from './mdx-plugin';
 export * from './strip-story-hmr-boundaries';
 export * from './code-generator-plugin';
 export * from './csf-plugin';

diff --git a/code/builders/builder-vite/src/vite-config.ts b/code/builders/builder-vite/src/vite-config.ts
@@ -15,7 +15,6 @@ import {
   codeGeneratorPlugin,
   csfPlugin,
   injectExportOrderPlugin,
-  mdxPlugin,
   stripStoryHMRBoundary,
   externalGlobalsPlugin,
 } from './plugins';
@@ -81,7 +80,6 @@ export async function pluginConfig(options: Options) {
   const plugins = [
     codeGeneratorPlugin(options),
     await csfPlugin(options),
-    await mdxPlugin(options),
     injectExportOrderPlugin,
     stripStoryHMRBoundary(),
     {

diff --git a/code/yarn.lock b/code/yarn.lock
@@ -5906,6 +5906,7 @@ __metadata:
   dependencies:
     "@jest/transform": ^29.3.1
     "@mdx-js/react": ^2.1.5
+    "@rollup/pluginutils": ^5.0.2
     "@storybook/blocks": "workspace:*"
     "@storybook/client-logger": "workspace:*"
     "@storybook/components": "workspace:*"
@@ -5926,6 +5927,7 @@ __metadata:
     remark-slug: ^6.0.0
     ts-dedent: ^2.0.0
     typescript: ~4.9.3
+    vite: ^4.0.4
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6531,7 +6533,6 @@ __metadata:
     "@storybook/client-logger": "workspace:*"
     "@storybook/core-common": "workspace:*"
     "@storybook/csf-plugin": "workspace:*"
-    "@storybook/mdx2-csf": ^1.0.0
     "@storybook/node-logger": "workspace:*"
     "@storybook/preview": "workspace:*"
     "@storybook/preview-api": "workspace:*"
@@ -6546,8 +6547,6 @@ __metadata:
     fs-extra: ^11.1.0
     glob: ^10.0.0
     magic-string: ^0.30.0
-    remark-external-links: ^8.0.0
-    remark-slug: ^6.0.0
     rollup: ^3.20.1
     slash: ^5.0.0
     typescript: ~4.9.3