diff --git a/examples/lit-ts/.storybook/main.cjs b/examples/lit-ts/.storybook/main.cjs index 7a38a8ca..7c912dde 100644 --- a/examples/lit-ts/.storybook/main.cjs +++ b/examples/lit-ts/.storybook/main.cjs @@ -1,3 +1,4 @@ +const path = require('node:path'); const { mergeConfig } = require('vite'); const postcssLit = require('rollup-plugin-postcss-lit'); @@ -18,6 +19,16 @@ module.exports = { return mergeConfig(config, { // prettier-ignore plugins: [postcssLit({ include: ['**/*.scss', '**/*.scss\?*'] })], + // because rollup does not respect NODE_PATH, and we have a funky example setup that needs it + build: { + rollupOptions: { + plugins: { + resolveId: function (code) { + if (code === 'react') return path.resolve(require.resolve('react')); + }, + }, + }, + }, }); }, }; diff --git a/examples/lit-ts/yarn.lock b/examples/lit-ts/yarn.lock index 76150e6f..ce6bdd66 100644 --- a/examples/lit-ts/yarn.lock +++ b/examples/lit-ts/yarn.lock @@ -2732,7 +2732,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3220,6 +3220,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3239,16 +3249,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/node-logger@npm:6.5.12, @storybook/node-logger@npm:^6.4.3": version: 6.5.12 resolution: "@storybook/node-logger@npm:6.5.12" diff --git a/examples/preact/.storybook/main.cjs b/examples/preact/.storybook/main.cjs index fe1dedc2..6bb6a237 100644 --- a/examples/preact/.storybook/main.cjs +++ b/examples/preact/.storybook/main.cjs @@ -1,3 +1,5 @@ +const path = require('node:path'); + module.exports = { framework: '@storybook/preact', stories: ['../stories/**/*.stories.mdx', '../stories/**/*.stories.@(js|jsx|ts|tsx)'], @@ -7,4 +9,16 @@ module.exports = { // we don't want to muck up the data when we're working on the builder disableTelemetry: true, }, + async viteFinal(config) { + // because rollup does not respect NODE_PATH, and we have a funky example setup that needs it + config.build.rollupOptions = { + plugins: { + resolveId: function (code) { + if (code === 'react') return path.resolve(require.resolve('react')); + if (code === 'preact/compat') return path.resolve(require.resolve('preact/compat')); + }, + }, + }; + return config; + }, }; diff --git a/examples/preact/yarn.lock b/examples/preact/yarn.lock index 13fb147d..2deb3abc 100644 --- a/examples/preact/yarn.lock +++ b/examples/preact/yarn.lock @@ -2755,7 +2755,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3243,6 +3243,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3262,16 +3272,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/node-logger@npm:6.5.12, @storybook/node-logger@npm:^6.4.3": version: 6.5.12 resolution: "@storybook/node-logger@npm:6.5.12" diff --git a/examples/react-18/.storybook/main.cjs b/examples/react-18/.storybook/main.cjs index 1b61092e..f42b296e 100644 --- a/examples/react-18/.storybook/main.cjs +++ b/examples/react-18/.storybook/main.cjs @@ -1,3 +1,5 @@ +const path = require('node:path'); + module.exports = { framework: '@storybook/react', stories: ['../stories/**/*.stories.mdx', '../stories/**/*.stories.@(js|jsx|ts|tsx)'], @@ -10,8 +12,15 @@ module.exports = { features: { storyStoreV7: true, }, - async viteFinal(config, { configType }) { - // customize the Vite config here + async viteFinal(config) { + // because rollup does not respect NODE_PATH + config.build.rollupOptions = { + plugins: { + resolveId: function (code, id) { + if (code === 'react') return path.resolve(require.resolve('react')); + }, + }, + }; return config; }, }; diff --git a/examples/react-18/yarn.lock b/examples/react-18/yarn.lock index 6944078f..23cfda0e 100644 --- a/examples/react-18/yarn.lock +++ b/examples/react-18/yarn.lock @@ -2802,7 +2802,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3290,6 +3290,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3309,16 +3319,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/node-logger@npm:6.5.16, @storybook/node-logger@npm:^6.4.3": version: 6.5.16 resolution: "@storybook/node-logger@npm:6.5.16" diff --git a/examples/react-ts/.storybook/main.cjs b/examples/react-ts/.storybook/main.cjs index 1b61092e..be200370 100644 --- a/examples/react-ts/.storybook/main.cjs +++ b/examples/react-ts/.storybook/main.cjs @@ -1,3 +1,5 @@ +const path = require('node:path'); + module.exports = { framework: '@storybook/react', stories: ['../stories/**/*.stories.mdx', '../stories/**/*.stories.@(js|jsx|ts|tsx)'], @@ -10,8 +12,15 @@ module.exports = { features: { storyStoreV7: true, }, - async viteFinal(config, { configType }) { - // customize the Vite config here + async viteFinal(config) { + // because rollup does not respect NODE_PATH, and we have a funky example setup that needs it + config.build.rollupOptions = { + plugins: { + resolveId: function (code) { + if (code === 'react') return path.resolve(require.resolve('react')); + }, + }, + }; return config; }, }; diff --git a/examples/react-ts/yarn.lock b/examples/react-ts/yarn.lock index 29aba8c5..9c77b479 100644 --- a/examples/react-ts/yarn.lock +++ b/examples/react-ts/yarn.lock @@ -2990,7 +2990,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3478,6 +3478,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3497,16 +3507,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/node-logger@npm:6.5.12, @storybook/node-logger@npm:^6.4.3": version: 6.5.12 resolution: "@storybook/node-logger@npm:6.5.12" diff --git a/examples/react/.storybook/main.cjs b/examples/react/.storybook/main.cjs index 873eae97..e7eea9ac 100644 --- a/examples/react/.storybook/main.cjs +++ b/examples/react/.storybook/main.cjs @@ -1,3 +1,5 @@ +const path = require('node:path'); + module.exports = { framework: '@storybook/react', stories: ['../stories/**/*stories.mdx', '../stories/**/*.stories.@(js|jsx|ts|tsx)'], @@ -12,6 +14,14 @@ module.exports = { previewMdx2: true, }, async viteFinal(config) { + // because rollup does not respect NODE_PATH, and we have a funky example setup that needs it + config.build.rollupOptions = { + plugins: { + resolveId: function (code) { + if (code === 'react') return path.resolve(require.resolve('react')); + }, + }, + }; return config; }, }; diff --git a/examples/react/yarn.lock b/examples/react/yarn.lock index 5018355c..148bc078 100644 --- a/examples/react/yarn.lock +++ b/examples/react/yarn.lock @@ -2824,7 +2824,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3312,6 +3312,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3331,16 +3341,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/mdx2-csf@npm:next": version: 1.0.0-next.5 resolution: "@storybook/mdx2-csf@npm:1.0.0-next.5" diff --git a/examples/svelte/.storybook/main.cjs b/examples/svelte/.storybook/main.cjs index 2cb72f0e..69251955 100644 --- a/examples/svelte/.storybook/main.cjs +++ b/examples/svelte/.storybook/main.cjs @@ -1,4 +1,4 @@ -const preprocess = require('svelte-preprocess'); +const path = require('node:path'); module.exports = { framework: '@storybook/svelte', @@ -13,8 +13,15 @@ module.exports = { // On-demand store does not work for .svelte stories, only CSF. storyStoreV7: false, }, - async viteFinal(config, { configType }) { - // customize the Vite config here + async viteFinal(config) { + // because rollup does not respect NODE_PATH, and we have a funky example setup that needs it + config.build.rollupOptions = { + plugins: { + resolveId: function (code) { + if (code === 'react') return path.resolve(require.resolve('react')); + }, + }, + }; return config; }, // @ts-ignore diff --git a/examples/svelte/yarn.lock b/examples/svelte/yarn.lock index e33d5c66..b8bbbac5 100644 --- a/examples/svelte/yarn.lock +++ b/examples/svelte/yarn.lock @@ -2741,7 +2741,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3229,6 +3229,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3248,16 +3258,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/node-logger@npm:6.5.12, @storybook/node-logger@npm:^6.4.3": version: 6.5.12 resolution: "@storybook/node-logger@npm:6.5.12" diff --git a/examples/vue2.6/.storybook/main.cjs b/examples/vue2.6/.storybook/main.cjs index d69fa9a3..5f8a8cc0 100644 --- a/examples/vue2.6/.storybook/main.cjs +++ b/examples/vue2.6/.storybook/main.cjs @@ -1,5 +1,6 @@ const { resolve } = require('path'); const { mergeConfig } = require('vite'); +const path = require('node:path'); module.exports = { framework: '@storybook/vue', @@ -30,6 +31,16 @@ module.exports = { '@storybook/addon-outline/preview.js', ], }, + // because rollup does not respect NODE_PATH, and we have a funky example setup that needs it + build: { + rollupOptions: { + plugins: { + resolveId: function (code) { + if (code === 'react') return path.resolve(require.resolve('react')); + }, + }, + }, + }, }); }, }; diff --git a/examples/vue2.6/yarn.lock b/examples/vue2.6/yarn.lock index 31d0b034..0297bbde 100644 --- a/examples/vue2.6/yarn.lock +++ b/examples/vue2.6/yarn.lock @@ -2689,7 +2689,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3211,6 +3211,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3230,16 +3240,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/mdx2-csf@npm:^0.0.3": version: 0.0.3 resolution: "@storybook/mdx2-csf@npm:0.0.3" diff --git a/examples/vue2.7/.storybook/main.cjs b/examples/vue2.7/.storybook/main.cjs index d69fa9a3..5f8a8cc0 100644 --- a/examples/vue2.7/.storybook/main.cjs +++ b/examples/vue2.7/.storybook/main.cjs @@ -1,5 +1,6 @@ const { resolve } = require('path'); const { mergeConfig } = require('vite'); +const path = require('node:path'); module.exports = { framework: '@storybook/vue', @@ -30,6 +31,16 @@ module.exports = { '@storybook/addon-outline/preview.js', ], }, + // because rollup does not respect NODE_PATH, and we have a funky example setup that needs it + build: { + rollupOptions: { + plugins: { + resolveId: function (code) { + if (code === 'react') return path.resolve(require.resolve('react')); + }, + }, + }, + }, }); }, }; diff --git a/examples/vue2.7/yarn.lock b/examples/vue2.7/yarn.lock index 93383fac..0c53d278 100644 --- a/examples/vue2.7/yarn.lock +++ b/examples/vue2.7/yarn.lock @@ -2679,7 +2679,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3201,6 +3201,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3220,16 +3230,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/mdx2-csf@npm:^0.0.3": version: 0.0.3 resolution: "@storybook/mdx2-csf@npm:0.0.3" diff --git a/examples/vue3/.storybook/main.cjs b/examples/vue3/.storybook/main.cjs index 1aca8714..0c043a12 100644 --- a/examples/vue3/.storybook/main.cjs +++ b/examples/vue3/.storybook/main.cjs @@ -1,5 +1,6 @@ const { resolve } = require('path'); const { mergeConfig } = require('vite'); +const path = require('node:path'); module.exports = { framework: '@storybook/vue3', @@ -19,6 +20,16 @@ module.exports = { resolve: { alias: [{ find: '@assets', replacement: resolve(__dirname, '..', 'stories', 'assets') }], }, + // because rollup does not respect NODE_PATH, and we have a funky example setup that needs it + build: { + rollupOptions: { + plugins: { + resolveId: function (code) { + if (code === 'react') return path.resolve(require.resolve('react')); + }, + }, + }, + }, }); }, }; diff --git a/examples/vue3/yarn.lock b/examples/vue3/yarn.lock index 7a29b248..cf611db0 100644 --- a/examples/vue3/yarn.lock +++ b/examples/vue3/yarn.lock @@ -2959,7 +2959,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3639,6 +3639,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3658,16 +3668,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/mdx2-csf@npm:next": version: 1.0.0-next.5 resolution: "@storybook/mdx2-csf@npm:1.0.0-next.5" diff --git a/examples/workspaces/packages/catalog/.storybook/main.cjs b/examples/workspaces/packages/catalog/.storybook/main.cjs index 390cf229..523511ee 100644 --- a/examples/workspaces/packages/catalog/.storybook/main.cjs +++ b/examples/workspaces/packages/catalog/.storybook/main.cjs @@ -1,3 +1,5 @@ +const path = require('node:path'); + module.exports = { framework: '@storybook/react', stories: [ @@ -13,8 +15,15 @@ module.exports = { features: { storyStoreV7: true, }, - async viteFinal(config, { configType }) { - // customize the Vite config here + async viteFinal(config) { + // because rollup does not respect NODE_PATH, and we have a funky example setup that needs it + config.build.rollupOptions = { + plugins: { + resolveId: function (code) { + if (code === 'react') return path.resolve(require.resolve('react')); + }, + }, + }; return config; }, }; diff --git a/examples/workspaces/yarn.lock b/examples/workspaces/yarn.lock index 0437ca92..af4c3fc8 100644 --- a/examples/workspaces/yarn.lock +++ b/examples/workspaces/yarn.lock @@ -2824,7 +2824,7 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 "@storybook/source-loader": ^6.4.3 @@ -3312,6 +3312,16 @@ __metadata: languageName: node linkType: hard +"@storybook/mdx1-csf@npm:1.0.0-next.0": + version: 1.0.0-next.0 + resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" + dependencies: + "@mdx-js/mdx": ^1.6.22 + "@mdx-js/react": ^1.6.22 + checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd + languageName: node + linkType: hard + "@storybook/mdx1-csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/mdx1-csf@npm:0.0.1" @@ -3331,16 +3341,6 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": - version: 1.0.0-next.0 - resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" - dependencies: - "@mdx-js/mdx": ^1.6.22 - "@mdx-js/react": ^1.6.22 - checksum: 4524619df9f412d93e37df05bcdcef40bf3337b8de181a5bcc7ab2051f7afc96e8b9bf4bef8e078d470df81cc4d9d01315cd840e358ca3bfb1102efd595720cd - languageName: node - linkType: hard - "@storybook/node-logger@npm:6.5.16, @storybook/node-logger@npm:^6.4.3": version: 6.5.16 resolution: "@storybook/node-logger@npm:6.5.16" diff --git a/packages/builder-vite/package.json b/packages/builder-vite/package.json index 24bced2c..96fabde3 100644 --- a/packages/builder-vite/package.json +++ b/packages/builder-vite/package.json @@ -27,7 +27,7 @@ "dependencies": { "@joshwooding/vite-plugin-react-docgen-typescript": "0.2.1", "@storybook/core-common": "^6.4.3", - "@storybook/mdx1-csf": "^1.0.0-next.0", + "@storybook/mdx1-csf": "1.0.0-next.0", "@storybook/node-logger": "^6.4.3", "@storybook/semver": "^7.3.2", "@storybook/source-loader": "^6.4.3", diff --git a/packages/builder-vite/plugins/mdx-plugin.ts b/packages/builder-vite/plugins/mdx-plugin.ts index db389a7d..c606212f 100644 --- a/packages/builder-vite/plugins/mdx-plugin.ts +++ b/packages/builder-vite/plugins/mdx-plugin.ts @@ -1,8 +1,27 @@ +import { dirname } from 'node:path'; import type { Options } from '@storybook/core-common'; import { Plugin } from 'vite'; const isStorybookMdx = (id: string) => id.endsWith('stories.mdx') || id.endsWith('story.mdx'); +/** + * Grab the mdx compiler from the @mdx-js/react that comes with @storybook/mdx1-csf, + * and add it to the top of the code. + * Equivilent to https://github.com/storybookjs/mdx1-csf/blob/d58cb032a8902b3f24ad487b6a7aae11ba8b33f6/loader.js#L12-L16 + */ +function injectRenderer(code: string) { + const mdxReactPackage = dirname( + require.resolve('@mdx-js/react/package.json', { + paths: [dirname(require.resolve('@storybook/mdx1-csf/package.json'))], + }) + ); + + return ` + import { mdx } from '${mdxReactPackage}'; + ${code} + `; +} + /** * Storybook uses two different loaders when dealing with MDX: * @@ -27,8 +46,10 @@ export function mdxPlugin(options: Options): Plugin { // TODO: we don't currently support setting mdx options. Storybook 7.0 does const mdxCode = String(await compile(src, { skipCsf: !isStorybookMdx(id) })); + const code = features?.previewMdx2 ? mdxCode : injectRenderer(mdxCode); + return { - code: mdxCode, + code, map: null, }; } diff --git a/packages/builder-vite/yarn.lock b/packages/builder-vite/yarn.lock index 164bccb2..c0c860c3 100644 --- a/packages/builder-vite/yarn.lock +++ b/packages/builder-vite/yarn.lock @@ -1983,7 +1983,7 @@ __metadata: "@storybook/addon-svelte-csf": ^2.0.7 "@storybook/client-api": ^6.5.12 "@storybook/core-common": ^6.4.3 - "@storybook/mdx1-csf": ^1.0.0-next.0 + "@storybook/mdx1-csf": 1.0.0-next.0 "@storybook/mdx2-csf": next "@storybook/node-logger": ^6.4.3 "@storybook/semver": ^7.3.2 @@ -2192,7 +2192,7 @@ __metadata: languageName: node linkType: hard -"@storybook/mdx1-csf@npm:^1.0.0-next.0": +"@storybook/mdx1-csf@npm:1.0.0-next.0": version: 1.0.0-next.0 resolution: "@storybook/mdx1-csf@npm:1.0.0-next.0" dependencies: