@storybook/builder-vite 7.0.0-alpha.49 → 7.0.0-alpha.50

package/dist/cjs/utils/process-preview-annotation.js

@@ -7,6 +7,12 @@ exports.processPreviewAnnotation = processPreviewAnnotation;
 
 var _path = require("path");
 
+var _slash = _interopRequireDefault(require("slash"));
+
+var _transformAbsPath = require("./transform-abs-path");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 /**
  * Preview annotations can take several forms, and vite needs them to be
  * a bit more restrained.
@@ -28,14 +34,20 @@ function processPreviewAnnotation(path) {
 
 
   if (path !== null && path !== void 0 && path.startsWith('./') || path !== null && path !== void 0 && path.startsWith('../')) {
-    return (0, _path.resolve)(path);
+    return (0, _slash.default)((0, _path.resolve)(path));
   } // This should not occur, since we use `.filter(Boolean)` prior to
   // calling this function, but this makes typescript happy
 
 
   if (!path) {
     throw new Error('Could not determine path for previewAnnotation');
+  } // For addon dependencies that use require.resolve(), we need to convert to a bare path
+  // so that vite will process it as a dependency (cjs -> esm, etc).
+
+
+  if (path.includes('node_modules')) {
+    return (0, _transformAbsPath.transformAbsPath)(path);
   }
 
-  return path;
+  return (0, _slash.default)(path);
 }

package/dist/cjs/utils/transform-abs-path.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformAbsPath = transformAbsPath;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _vite = require("vite");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// We need to convert from an absolute path, to a traditional node module import path,
+// so that vite can correctly pre-bundle/optimize
+function transformAbsPath(absPath) {
+  const splits = absPath.split(`node_modules${_path.default.sep}`); // Return everything after the final "node_modules/"
+
+  const module = (0, _vite.normalizePath)(splits[splits.length - 1]);
+  return module;
+}

package/dist/esm/utils/process-preview-annotation.js

@@ -1,4 +1,6 @@
 import { resolve } from 'path';
+import slash from 'slash';
+import { transformAbsPath } from './transform-abs-path';
 /**
  * Preview annotations can take several forms, and vite needs them to be
  * a bit more restrained.
@@ -21,14 +23,20 @@ export function processPreviewAnnotation(path) {
 
 
   if (path?.startsWith('./') || path?.startsWith('../')) {
-    return resolve(path);
+    return slash(resolve(path));
   } // This should not occur, since we use `.filter(Boolean)` prior to
   // calling this function, but this makes typescript happy
 
 
   if (!path) {
     throw new Error('Could not determine path for previewAnnotation');
+  } // For addon dependencies that use require.resolve(), we need to convert to a bare path
+  // so that vite will process it as a dependency (cjs -> esm, etc).
+
+
+  if (path.includes('node_modules')) {
+    return transformAbsPath(path);
   }
 
-  return path;
+  return slash(path);
 }

package/dist/esm/utils/transform-abs-path.js

@@ -0,0 +1,10 @@
+import path from 'path';
+import { normalizePath } from 'vite'; // We need to convert from an absolute path, to a traditional node module import path,
+// so that vite can correctly pre-bundle/optimize
+
+export function transformAbsPath(absPath) {
+  const splits = absPath.split(`node_modules${path.sep}`); // Return everything after the final "node_modules/"
+
+  const module = normalizePath(splits[splits.length - 1]);
+  return module;
+}

package/dist/types/utils/transform-abs-path.d.ts

@@ -0,0 +1 @@
+export declare function transformAbsPath(absPath: string): string;

package/jest.config.js

@@ -0,0 +1,7 @@
+const path = require('path');
+const baseConfig = require('../../jest.config.node');
+
+module.exports = {
+  ...baseConfig,
+  displayName: __dirname.split(path.sep).slice(-2).join(path.posix.sep),
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-vite",
-  "version": "7.0.0-alpha.49",
+  "version": "7.0.0-alpha.50",
   "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,14 +19,14 @@
   },
   "dependencies": {
     "@joshwooding/vite-plugin-react-docgen-typescript": "0.0.5",
-    "@storybook/client-api": "7.0.0-alpha.49",
-    "@storybook/client-logger": "7.0.0-alpha.49",
-    "@storybook/core-common": "7.0.0-alpha.49",
+    "@storybook/client-api": "7.0.0-alpha.50",
+    "@storybook/client-logger": "7.0.0-alpha.50",
+    "@storybook/core-common": "7.0.0-alpha.50",
     "@storybook/mdx2-csf": "next",
-    "@storybook/node-logger": "7.0.0-alpha.49",
-    "@storybook/preview-web": "7.0.0-alpha.49",
-    "@storybook/source-loader": "7.0.0-alpha.49",
-    "@storybook/types": "7.0.0-alpha.49",
+    "@storybook/node-logger": "7.0.0-alpha.50",
+    "@storybook/preview-web": "7.0.0-alpha.50",
+    "@storybook/source-loader": "7.0.0-alpha.50",
+    "@storybook/types": "7.0.0-alpha.50",
     "@vitejs/plugin-react": "^2.0.0",
     "browser-assert": "^1.2.1",
     "es-module-lexer": "^0.9.3",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d7eb433300cac55d3c7256c8181eb6fd7a47b4c8"
+  "gitHead": "77184d039091f4782dc4540df6d271a24fb3e242"
 }

package/src/utils/process-preview-annotation.ts

@@ -1,5 +1,7 @@
 import type { PreviewAnnotation } from '@storybook/types';
 import { resolve } from 'path';
+import slash from 'slash';
+import { transformAbsPath } from './transform-abs-path';
 
 /**
  * Preview annotations can take several forms, and vite needs them to be
@@ -21,7 +23,7 @@ export function processPreviewAnnotation(path: PreviewAnnotation | undefined) {
   }
   // resolve relative paths into absolute paths, but don't resolve "bare" imports
   if (path?.startsWith('./') || path?.startsWith('../')) {
-    return resolve(path);
+    return slash(resolve(path));
   }
   // This should not occur, since we use `.filter(Boolean)` prior to
   // calling this function, but this makes typescript happy
@@ -29,5 +31,11 @@ export function processPreviewAnnotation(path: PreviewAnnotation | undefined) {
     throw new Error('Could not determine path for previewAnnotation');
   }
 
-  return path;
+  // For addon dependencies that use require.resolve(), we need to convert to a bare path
+  // so that vite will process it as a dependency (cjs -> esm, etc).
+  if (path.includes('node_modules')) {
+    return transformAbsPath(path);
+  }
+
+  return slash(path);
 }

package/src/utils/transform-abs-path.ts

@@ -0,0 +1,11 @@
+import path from 'path';
+import { normalizePath } from 'vite';
+
+// We need to convert from an absolute path, to a traditional node module import path,
+// so that vite can correctly pre-bundle/optimize
+export function transformAbsPath(absPath: string) {
+  const splits = absPath.split(`node_modules${path.sep}`);
+  // Return everything after the final "node_modules/"
+  const module = normalizePath(splits[splits.length - 1]);
+  return module;
+}

package/tsconfig.json

@@ -5,6 +5,5 @@
     "resolveJsonModule": true,
     "skipLibCheck": true
   },
-  "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.*", "src/**/__testfixtures__/**"]
+  "include": ["src/**/*"]
 }