Merge pull request #29641 from storybookjs/version-non-patch-from-8.5.0-alpha.6

Release: Prerelease 8.5.0-alpha.7

Author: shilman

CHANGELOG.prerelease.md

@@ -1,3 +1,8 @@
+## 8.5.0-alpha.7
+
+- CLI: Disable corepack auto pin behavior - [#29627](https://github.com/storybookjs/storybook/pull/29627), thanks @yannbf!
+- RNW-Vite: Integrate with experimental-addon-test - [#29645](https://github.com/storybookjs/storybook/pull/29645), thanks @shilman!
+
 ## 8.5.0-alpha.6
 
 - CLI: Fix qwik init - [#29632](https://github.com/storybookjs/storybook/pull/29632), thanks @shilman!

code/addons/test/src/postinstall.ts

@@ -453,6 +453,12 @@ const getVitestPluginInfo = (framework: string) => {
     frameworkPluginCall = 'storybookVuePlugin()';
   }
 
+  if (framework === '@storybook/react-native-web-vite') {
+    frameworkPluginImport =
+      "import { storybookReactNativeWeb } from '@storybook/react-native-web-vite/vite-plugin';";
+    frameworkPluginCall = 'storybookReactNativeWeb()';
+  }
+
   // spaces for file identation
   frameworkPluginImport = `\n${frameworkPluginImport}`;
   frameworkPluginDocs = frameworkPluginDocs ? `\n    ${frameworkPluginDocs}` : '';
@@ -491,14 +497,19 @@ async function getStorybookInfo({ configDir, packageManager: pkgMgr }: Postinsta
   }
 
   const builderPackageJson = await fs.readFile(
-    `${typeof builder === 'string' ? builder : builder.name}/package.json`,
+    require.resolve(
+      path.join(typeof builder === 'string' ? builder : builder.name, 'package.json')
+    ),
     'utf8'
   );
   const builderPackageName = JSON.parse(builderPackageJson).name;
 
   let rendererPackageName: string | undefined;
   if (renderer) {
-    const rendererPackageJson = await fs.readFile(`${renderer}/package.json`, 'utf8');
+    const rendererPackageJson = await fs.readFile(
+      require.resolve(path.join(renderer, 'package.json')),
+      'utf8'
+    );
     rendererPackageName = JSON.parse(rendererPackageJson).name;
   }
 

code/core/src/common/js-package-manager/JsPackageManagerFactory.ts

@@ -141,6 +141,7 @@ function hasNPM(cwd?: string) {
     env: {
       ...process.env,
       COREPACK_ENABLE_STRICT: '0',
+      COREPACK_ENABLE_AUTO_PIN: '0',
     },
   });
   return npmVersionCommand.status === 0;
@@ -153,6 +154,7 @@ function hasBun(cwd?: string) {
     env: {
       ...process.env,
       COREPACK_ENABLE_STRICT: '0',
+      COREPACK_ENABLE_AUTO_PIN: '0',
     },
   });
   return pnpmVersionCommand.status === 0;
@@ -165,6 +167,7 @@ function hasPNPM(cwd?: string) {
     env: {
       ...process.env,
       COREPACK_ENABLE_STRICT: '0',
+      COREPACK_ENABLE_AUTO_PIN: '0',
     },
   });
   return pnpmVersionCommand.status === 0;
@@ -177,6 +180,7 @@ function getYarnVersion(cwd?: string): 1 | 2 | undefined {
     env: {
       ...process.env,
       COREPACK_ENABLE_STRICT: '0',
+      COREPACK_ENABLE_AUTO_PIN: '0',
     },
   });
 

code/frameworks/react-native-web-vite/package.json

@@ -30,6 +30,11 @@
       "types": "./dist/preset.d.ts",
       "require": "./dist/preset.js"
     },
+    "./vite-plugin": {
+      "types": "./dist/vite-plugin.d.ts",
+      "import": "./dist/vite-plugin.mjs",
+      "require": "./dist/vite-plugin.js"
+    },
     "./package.json": "./package.json"
   },
   "main": "dist/index.js",
@@ -75,7 +80,8 @@
   "bundler": {
     "entries": [
       "./src/index.ts",
-      "./src/preset.ts"
+      "./src/preset.ts",
+      "./src/vite-plugin.ts"
     ],
     "platform": "node"
   },

code/frameworks/react-native-web-vite/src/preset.ts

@@ -1,15 +1,12 @@
 // @ts-expect-error FIXME
 import { viteFinal as reactViteFinal } from '@storybook/react-vite/preset';
 
-import type { BabelOptions, Options as ReactOptions } from '@vitejs/plugin-react';
 import react from '@vitejs/plugin-react';
 import type { PluginOption } from 'vite';
 
 import type { FrameworkOptions, StorybookConfig } from './types';
 
-function reactNativeWeb(
-  reactOptions: Omit<ReactOptions, 'babel'> & { babel?: BabelOptions }
-): PluginOption {
+export function reactNativeWeb(): PluginOption {
   return {
     name: 'vite:react-native-web',
     config(_userConfig, env) {
@@ -80,7 +77,7 @@ export const viteFinal: StorybookConfig['viteFinal'] = async (config, options) =
       ...pluginReactOptions,
     })
   );
-  plugins.push(reactNativeWeb(pluginReactOptions));
+  plugins.push(reactNativeWeb());
 
   return reactConfig;
 };

code/frameworks/react-native-web-vite/src/vite-plugin.ts

@@ -0,0 +1,16 @@
+import react from '@vitejs/plugin-react';
+
+import { reactNativeWeb } from './preset';
+
+export const storybookReactNativeWeb = () => {
+  return [
+    react({
+      babel: {
+        babelrc: false,
+        configFile: false,
+      },
+      jsxRuntime: 'automatic',
+    }),
+    reactNativeWeb(),
+  ];
+};

code/package.json

@@ -293,5 +293,6 @@
         "Dependency Upgrades"
       ]
     ]
-  }
+  },
+  "deferredNextVersion": "8.5.0-alpha.7"
 }

docs/versions/next.json

@@ -1 +1 @@
-{"version":"8.5.0-alpha.6","info":{"plain":"- CLI: Fix qwik init - [#29632](https://github.com/storybookjs/storybook/pull/29632), thanks @shilman!\n- React Native Web: Add framework, CLI integration, sandboxes - [#29520](https://github.com/storybookjs/storybook/pull/29520), thanks @shilman!"}}
+{"version":"8.5.0-alpha.7","info":{"plain":"- CLI: Disable corepack auto pin behavior - [#29627](https://github.com/storybookjs/storybook/pull/29627), thanks @yannbf!\n- RNW-Vite: Integrate with experimental-addon-test - [#29645](https://github.com/storybookjs/storybook/pull/29645), thanks @shilman!"}}