@storybook/react 10.1.0-beta.3 → 10.1.0-beta.5

package/dist/preset.js

@@ -1,10 +1,10 @@
-import CJS_COMPAT_NODE_URL_myofsff6kim from 'node:url';
-import CJS_COMPAT_NODE_PATH_myofsff6kim from 'node:path';
-import CJS_COMPAT_NODE_MODULE_myofsff6kim from "node:module";
+import CJS_COMPAT_NODE_URL_jftxvcjteu8 from 'node:url';
+import CJS_COMPAT_NODE_PATH_jftxvcjteu8 from 'node:path';
+import CJS_COMPAT_NODE_MODULE_jftxvcjteu8 from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_myofsff6kim.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_myofsff6kim.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_myofsff6kim.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_jftxvcjteu8.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_jftxvcjteu8.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_jftxvcjteu8.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
@@ -3796,29 +3796,6 @@ function getImportTag(docgen) {
   return (jsdocComment ? extractJSDocInfo(jsdocComment).tags : void 0)?.import?.[0];
 }
 
-// src/componentManifest/valid-package-name.ts
-var scopedPackagePattern = new RegExp("^(?:@([^/]+?)[/])?([^/]+?)$");
-function stripSubpath(name) {
-  let parts = name.split("/");
-  return name.startsWith("@") ? parts.length >= 3 ? `${parts[0]}/${parts[1]}` : name : parts[0];
-}
-function validPackageName(name) {
-  if (!name.length || name.startsWith(".") || name.match(/^_/) || name.trim() !== name || name.length > 214 || name.toLowerCase() !== name || /[~'!()*]/.test(name.split("/").slice(-1)[0]))
-    return !1;
-  if (encodeURIComponent(name) !== name) {
-    let nameMatch = name.match(scopedPackagePattern);
-    if (nameMatch) {
-      let org = nameMatch[1], pkg = nameMatch[2];
-      if (pkg.startsWith("."))
-        return !1;
-      if (encodeURIComponent(org) === org && encodeURIComponent(pkg) === pkg)
-        return !0;
-    }
-    return !1;
-  }
-  return !0;
-}
-
 // src/componentManifest/getComponentImports.ts
 var baseIdentifier = (component) => component.split(".")[0] ?? component, isTypeSpecifier = (s) => t3.isImportSpecifier(s) && s.importKind === "type", importedName = (im) => t3.isIdentifier(im) ? im.name : im.value, addUniqueBy = (arr, item, eq) => {
   arr.find(eq) || arr.push(item);
@@ -3895,7 +3872,7 @@ var baseIdentifier = (component) => component.split(".")[0] ?? component, isType
       importName: direct.importName
     } : { componentName: c };
   }).map((component) => {
-    let path2;
+    let path2, isPackage = !1;
     try {
       component.importId && storyFilePath && (path2 = cachedResolveImport(matchPath(component.importId, dirname4(storyFilePath)), {
         basedir: dirname4(storyFilePath)
@@ -3903,16 +3880,21 @@ var baseIdentifier = (component) => component.split(".")[0] ?? component, isType
     } catch (e) {
       logger3.debug(e);
     }
+    try {
+      component.importId && !component.importId.startsWith(".") && storyFilePath && (cachedResolveImport(component.importId, { basedir: dirname4(storyFilePath) }), isPackage = !0);
+    } catch {
+    }
+    let componentWithPackage = { ...component, isPackage };
     if (path2) {
-      let reactDocgen = getReactDocgen(path2, component);
+      let reactDocgen = getReactDocgen(path2, componentWithPackage);
       return {
-        ...component,
+        ...componentWithPackage,
         path: path2,
         reactDocgen,
         importOverride: reactDocgen.type === "success" ? getImportTag(reactDocgen.data) : void 0
       };
     }
-    return component;
+    return componentWithPackage;
   }).sort((a, b) => a.componentName.localeCompare(b.componentName));
 }, getImports = ({
   components,
@@ -3927,7 +3909,11 @@ var baseIdentifier = (component) => component.split(".")[0] ?? component, isType
         } catch {
           return;
         }
-    })(), rewritten = overrideSource !== void 0 ? overrideSource : packageName && !validPackageName(stripSubpath(importId)) ? packageName : importId;
+    })(), rewritten = overrideSource !== void 0 ? overrideSource : (
+      // only rewrite to the package name it the import id is not already a valid package
+      // tsconfig paths such as ~/components/Button and components/Button are not seen as packages
+      packageName && !c.isPackage ? packageName : importId
+    );
     return { c, src: t3.stringLiteral(rewritten), key: rewritten, ord: idx };
   }), orderOfSource = {};
   for (let w of withSource)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "10.1.0-beta.3",
+  "version": "10.1.0-beta.5",
   "description": "Storybook React renderer",
   "keywords": [
     "storybook"
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "@storybook/global": "^5.0.0",
-    "@storybook/react-dom-shim": "10.1.0-beta.3",
+    "@storybook/react-dom-shim": "10.1.0-beta.5",
     "react-docgen": "^8.0.2"
   },
   "devDependencies": {
@@ -81,7 +81,7 @@
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-    "storybook": "^10.1.0-beta.3",
+    "storybook": "^10.1.0-beta.5",
     "typescript": ">= 4.9.x"
   },
   "peerDependenciesMeta": {