@storybook/builder-vite 7.0.0-alpha.39 → 7.0.0-alpha.41

package/dist/cjs/index.js

@@ -5,6 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.bail = bail;
 exports.start = exports.build = void 0;
+Object.defineProperty(exports, "withoutVitePlugins", {
+  enumerable: true,
+  get: function () {
+    return _withoutVitePlugins.withoutVitePlugins;
+  }
+});
 
 var fs = _interopRequireWildcard(require("fs"));
 
@@ -16,6 +22,8 @@ var _viteServer = require("./vite-server");
 
 var _build = require("./build");
 
+var _withoutVitePlugins = require("./utils/without-vite-plugins");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/dist/cjs/plugins/mdx-plugin.js

@@ -67,11 +67,11 @@ function mdxPlugin(options) {
 
       const {
         compile
-      } = features !== null && features !== void 0 && features.previewMdx2 ? await Promise.resolve().then(() => _interopRequireWildcard(require('@storybook/mdx2-csf'))) : await Promise.resolve().then(() => _interopRequireWildcard(require('@storybook/mdx1-csf')));
+      } = await Promise.resolve().then(() => _interopRequireWildcard(require('@storybook/mdx2-csf')));
       const mdxCode = String(await compile(src, {
         skipCsf: !isStorybookMdx(id)
       }));
-      const modifiedCode = injectRenderer(mdxCode, Boolean(features === null || features === void 0 ? void 0 : features.previewMdx2)); // Hooks in recent rollup versions can be functions or objects, and though react hasn't changed, the typescript defs have
+      const modifiedCode = injectRenderer(mdxCode, true); // Hooks in recent rollup versions can be functions or objects, and though react hasn't changed, the typescript defs have
 
       const rTransform = (_reactRefresh = reactRefresh) === null || _reactRefresh === void 0 ? void 0 : _reactRefresh.transform;
       const transform = rTransform && 'handler' in rTransform ? rTransform.handler : rTransform; // It's safe to disable this, because we know it'll be there, since we added it ourselves.

package/dist/cjs/utils/without-vite-plugins.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.withoutVitePlugins = void 0;
+
+// recursively remove all plugins with the given names
+const withoutVitePlugins = (plugins = [], namesToRemove) => plugins.map(plugin => {
+  if (Array.isArray(plugin)) {
+    return withoutVitePlugins(plugin, namesToRemove);
+  }
+
+  if (plugin && 'name' in plugin && namesToRemove.includes(plugin.name)) {
+    return false;
+  }
+
+  return plugin;
+});
+
+exports.withoutVitePlugins = withoutVitePlugins;

package/dist/esm/index.js

@@ -4,6 +4,7 @@ import * as path from 'path';
 import { transformIframeHtml } from './transform-iframe-html';
 import { createViteServer } from './vite-server';
 import { build as viteBuild } from './build';
+export { withoutVitePlugins } from './utils/without-vite-plugins';
 
 function iframeMiddleware(options, server) {
   return async (req, res, next) => {

package/dist/esm/plugins/mdx-plugin.js

@@ -54,11 +54,11 @@ export function mdxPlugin(options) {
 
       const {
         compile
-      } = features?.previewMdx2 ? await import('@storybook/mdx2-csf') : await import('@storybook/mdx1-csf');
+      } = await import('@storybook/mdx2-csf');
       const mdxCode = String(await compile(src, {
         skipCsf: !isStorybookMdx(id)
       }));
-      const modifiedCode = injectRenderer(mdxCode, Boolean(features?.previewMdx2)); // Hooks in recent rollup versions can be functions or objects, and though react hasn't changed, the typescript defs have
+      const modifiedCode = injectRenderer(mdxCode, true); // Hooks in recent rollup versions can be functions or objects, and though react hasn't changed, the typescript defs have
 
       const rTransform = reactRefresh?.transform;
       const transform = rTransform && 'handler' in rTransform ? rTransform.handler : rTransform; // It's safe to disable this, because we know it'll be there, since we added it ourselves.

package/dist/esm/utils/without-vite-plugins.js

@@ -0,0 +1,12 @@
+// recursively remove all plugins with the given names
+export const withoutVitePlugins = (plugins = [], namesToRemove) => plugins.map(plugin => {
+  if (Array.isArray(plugin)) {
+    return withoutVitePlugins(plugin, namesToRemove);
+  }
+
+  if (plugin && 'name' in plugin && namesToRemove.includes(plugin.name)) {
+    return false;
+  }
+
+  return plugin;
+});

package/dist/types/index.d.ts

@@ -1,5 +1,6 @@
 import type { Builder, StorybookConfig as StorybookBaseConfig, Options } from '@storybook/core-common';
 import type { InlineConfig, UserConfig } from 'vite';
+export { withoutVitePlugins } from './utils/without-vite-plugins';
 export type { TypescriptOptions } from '@storybook/core-common';
 export declare type ViteStats = {
     toJson: () => any;

package/dist/types/utils/without-vite-plugins.d.ts

@@ -0,0 +1,2 @@
+import { PluginOption } from 'vite';
+export declare const withoutVitePlugins: (plugins: PluginOption[] | undefined, namesToRemove: string[]) => PluginOption[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-vite",
-  "version": "7.0.0-alpha.39",
+  "version": "7.0.0-alpha.41",
   "description": "A plugin to run and build Storybooks with Vite",
   "homepage": "https://github.com/storybookjs/storybook/tree/main/code/lib/builder-vite/#readme",
   "repository": {
@@ -19,13 +19,13 @@
   },
   "dependencies": {
     "@joshwooding/vite-plugin-react-docgen-typescript": "0.0.5",
-    "@storybook/client-api": "7.0.0-alpha.39",
-    "@storybook/client-logger": "7.0.0-alpha.39",
-    "@storybook/core-common": "7.0.0-alpha.39",
-    "@storybook/mdx1-csf": "0.0.5-canary.13.9ce928a.0",
-    "@storybook/node-logger": "7.0.0-alpha.39",
-    "@storybook/preview-web": "7.0.0-alpha.39",
-    "@storybook/source-loader": "7.0.0-alpha.39",
+    "@storybook/client-api": "7.0.0-alpha.41",
+    "@storybook/client-logger": "7.0.0-alpha.41",
+    "@storybook/core-common": "7.0.0-alpha.41",
+    "@storybook/mdx2-csf": "0.1.0-next.0",
+    "@storybook/node-logger": "7.0.0-alpha.41",
+    "@storybook/preview-web": "7.0.0-alpha.41",
+    "@storybook/source-loader": "7.0.0-alpha.41",
     "@vitejs/plugin-react": "^2.0.0",
     "browser-assert": "^1.2.1",
     "es-module-lexer": "^0.9.3",
@@ -36,22 +36,13 @@
     "vite": "^3.1.3"
   },
   "devDependencies": {
-    "@storybook/mdx2-csf": "^0.0.3",
     "@types/express": "^4.17.13",
     "@types/node": "^16.0.0",
     "typescript": "~4.6.3",
     "vite": "^3.1.3"
   },
-  "peerDependencies": {
-    "@storybook/mdx2-csf": "^0.0.3"
-  },
-  "peerDependenciesMeta": {
-    "@storybook/mdx2-csf": {
-      "optional": true
-    }
-  },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "47386bd49d141ea70daac41ab3e4d52749fc5da9"
+  "gitHead": "7ec6f916eb875bd2e3cf3aa6b1afcd1fe25d1637"
 }

package/src/index.ts

@@ -14,6 +14,7 @@ import { createViteServer } from './vite-server';
 import { build as viteBuild } from './build';
 import type { ExtendedOptions } from './types';
 
+export { withoutVitePlugins } from './utils/without-vite-plugins';
 export type { TypescriptOptions } from '@storybook/core-common';
 
 // Storybook's Stats are optional Webpack related property

package/src/plugins/mdx-plugin.ts

@@ -56,13 +56,11 @@ export function mdxPlugin(options: Options): Plugin {
       if (!filter(id)) return undefined;
 
       // @ts-expect-error typescript doesn't think compile exists, but it does.
-      const { compile } = features?.previewMdx2
-        ? await import('@storybook/mdx2-csf')
-        : await import('@storybook/mdx1-csf');
+      const { compile } = await import('@storybook/mdx2-csf');
 
       const mdxCode = String(await compile(src, { skipCsf: !isStorybookMdx(id) }));
 
-      const modifiedCode = injectRenderer(mdxCode, Boolean(features?.previewMdx2));
+      const modifiedCode = injectRenderer(mdxCode, true);
 
       // Hooks in recent rollup versions can be functions or objects, and though react hasn't changed, the typescript defs have
       const rTransform = reactRefresh?.transform;

package/src/utils/without-vite-plugins.ts

@@ -0,0 +1,16 @@
+import { PluginOption } from 'vite';
+
+// recursively remove all plugins with the given names
+export const withoutVitePlugins = (
+  plugins: PluginOption[] = [],
+  namesToRemove: string[]
+): PluginOption[] =>
+  plugins.map((plugin) => {
+    if (Array.isArray(plugin)) {
+      return withoutVitePlugins(plugin, namesToRemove);
+    }
+    if (plugin && 'name' in plugin && namesToRemove.includes(plugin.name)) {
+      return false;
+    }
+    return plugin;
+  });