vite-plugin-storybook-nextjs 3.1.4 → 3.1.6

package/dist/index.cjs

@@ -22,7 +22,6 @@ var options_js = require('next/dist/build/swc/options.js');
 var nextServerConfig = require('next/dist/server/config.js');
 var constants_js = require('next/dist/shared/lib/constants.js');
 var MagicString = require('magic-string');
-var querystring = require('querystring');
 var path = require('path');
 var imageSize = require('image-size');
 
@@ -4298,6 +4297,21 @@ function vitePluginNextFont() {
     }
   };
 }
+var require2 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
+var VITEST_PLUGIN_NAME = "vite-plugin-storybook-nextjs";
+var isVitestEnv = process.env.VITEST === "true";
+function getExecutionEnvironment(config) {
+  return isVitestEnv && config.test?.browser?.enabled !== true ? "node" : "browser";
+}
+var getNextjsVersion = () => require2("next/package.json").version;
+var getNextjsMajorVersion = () => {
+  try {
+    const version = getNextjsVersion();
+    return Number.parseInt(version.split(".")[0], 10);
+  } catch (error) {
+    return 16;
+  }
+};
 
 // src/utils/swc/styles.ts
 function getStyledComponentsOptions(styledComponentsConfig, development) {
@@ -4340,8 +4354,8 @@ function getEmotionOptions(emotionConfig, development) {
 }
 
 // src/utils/swc/options.ts
-var require2 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
-var regeneratorRuntimePath = require2.resolve(
+var require3 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
+var regeneratorRuntimePath = require3.resolve(
   "next/dist/compiled/regenerator-runtime"
 );
 function getBaseSWCOptions({
@@ -4368,7 +4382,7 @@ function getBaseSWCOptions({
   const useDefineForClassFields = Boolean(
     jsConfig?.compilerOptions?.useDefineForClassFields
   );
-  const plugins = (swcPlugins ?? []).filter(Array.isArray).map(([name, options]) => [require2.resolve(name), options]);
+  const plugins = (swcPlugins ?? []).filter(Array.isArray).map(([name, options]) => [require3.resolve(name), options]);
   return {
     jsc: {
       ...resolvedBaseUrl && paths ? {
@@ -4556,8 +4570,9 @@ function vitePluginNextSwc(rootDir, nextConfigResolver) {
       await loadSWCBindingsEagerly(nextConfig);
       const serverWatchIgnored = config.server?.watch?.ignored;
       const isServerWatchIgnoredArray = Array.isArray(serverWatchIgnored);
-      if (config.test?.environment === "node" || config.test?.environment === "edge-runtime" || config.test?.browser?.enabled !== false) {
-        isServerEnvironment = true;
+      isServerEnvironment = false;
+      if (isVitestEnv) {
+        isServerEnvironment = config.test?.environment === "node" || config.test?.environment === "edge-runtime" || config.test?.browser?.enabled !== true;
       }
       return {
         // esbuild: {
@@ -4696,21 +4711,6 @@ var reservedWords = "break case class catch const continue debugger default dele
 var builtins = "arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl";
 var forbiddenIdentifiers = new Set(`${reservedWords} ${builtins}`.split(" "));
 forbiddenIdentifiers.add("");
-var require3 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
-var VITEST_PLUGIN_NAME = "vite-plugin-storybook-nextjs";
-var isVitestEnv = process.env.VITEST === "true";
-function getExecutionEnvironment(config) {
-  return isVitestEnv && config.test?.browser?.enabled !== true ? "node" : "browser";
-}
-var getNextjsVersion = () => require3("next/package.json").version;
-var getNextjsMajorVersion = () => {
-  try {
-    const version = getNextjsVersion();
-    return Number.parseInt(version.split(".")[0], 10);
-  } catch (error) {
-    return 16;
-  }
-};
 var require4 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
 var getEntryPoint = (subPath, env) => require4.resolve(`${VITEST_PLUGIN_NAME}/${env}/mocks/${subPath}`);
 var getAlias = (env) => ({
@@ -4728,9 +4728,19 @@ var warnOnce = (message) => {
 };
 var includePattern2 = /\.(png|jpg|jpeg|gif|webp|avif|ico|bmp|svg)$/;
 var excludeImporterPattern = /\.(css|scss|sass)$/;
-var virtualImage = "virtual:next-image";
+var virtualImagePrefix = "\0virtual:next-image:";
 var virtualNextImage = "virtual:next/image";
 var virtualNextLegacyImage = "virtual:next/legacy/image";
+function encodeBase64Url(str) {
+  const base64 = Buffer.from(str).toString("base64");
+  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+}
+function decodeBase64Url(str) {
+  const padding = (4 - str.length % 4) % 4;
+  const withPadding = str + "=".repeat(padding);
+  const base64 = withPadding.replace(/-/g, "+").replace(/_/g, "/");
+  return Buffer.from(base64, "base64").toString();
+}
 var require5 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
 function vitePluginNextImage(nextConfigResolver, options = {}) {
   let isBrowser = !isVitestEnv;
@@ -4778,14 +4788,14 @@ function vitePluginNextImage(nextConfigResolver, options = {}) {
           For more info and recommended configuration, see: https://github.com/storybookjs/vite-plugin-storybook-nextjs/blob/main/README.md#faq-includingexcluding-images`
         );
       }
-      if (includePattern2.test(source) && !excludeImporterPattern.test(importer ?? "") && !importer?.startsWith(virtualImage)) {
+      if (includePattern2.test(source) && !excludeImporterPattern.test(importer ?? "") && !importer?.startsWith(virtualImagePrefix)) {
         const isAbsolute3 = posix.isAbsolute(id);
         const imagePath = importer ? isAbsolute3 ? source : posix.join(posix.dirname(importer), source) : source;
         const pathForFilter = imagePath.replace(postfixRE, "");
         if (!filter(pathForFilter)) {
           return null;
         }
-        return `${virtualImage}?${querystring.encode({ imagePath })}`;
+        return `${virtualImagePrefix}${encodeBase64Url(imagePath)}`;
       }
       if (id === "next/image" && importer !== virtualNextImage) {
         return virtualNextImage;
@@ -4809,9 +4819,8 @@ function vitePluginNextImage(nextConfigResolver, options = {}) {
           )
         )).toString("utf-8");
       }
-      const [source, query] = id.split("?");
-      if (virtualImage === source) {
-        const imagePath = querystring.decode(query).imagePath;
+      if (id.startsWith(virtualImagePrefix)) {
+        const imagePath = decodeBase64Url(id.slice(virtualImagePrefix.length));
         const nextConfig = await nextConfigResolver.promise;
         try {
           if (nextConfig.images?.disableStaticImages) {

package/dist/index.js

@@ -20,7 +20,6 @@ import { getParserOptions } from 'next/dist/build/swc/options.js';
 import nextServerConfig from 'next/dist/server/config.js';
 import { PHASE_DEVELOPMENT_SERVER, PHASE_TEST, PHASE_PRODUCTION_BUILD } from 'next/dist/shared/lib/constants.js';
 import MagicString from 'magic-string';
-import { decode, encode } from 'querystring';
 import { win32 as win32$1, posix as posix$1, isAbsolute as isAbsolute$1, resolve as resolve$1 } from 'path';
 import { imageSize } from 'image-size';
 
@@ -4265,6 +4264,21 @@ function vitePluginNextFont() {
     }
   };
 }
+var require2 = createRequire(import.meta.url);
+var VITEST_PLUGIN_NAME = "vite-plugin-storybook-nextjs";
+var isVitestEnv = process.env.VITEST === "true";
+function getExecutionEnvironment(config) {
+  return isVitestEnv && config.test?.browser?.enabled !== true ? "node" : "browser";
+}
+var getNextjsVersion = () => require2("next/package.json").version;
+var getNextjsMajorVersion = () => {
+  try {
+    const version = getNextjsVersion();
+    return Number.parseInt(version.split(".")[0], 10);
+  } catch (error) {
+    return 16;
+  }
+};
 
 // src/utils/swc/styles.ts
 function getStyledComponentsOptions(styledComponentsConfig, development) {
@@ -4307,8 +4321,8 @@ function getEmotionOptions(emotionConfig, development) {
 }
 
 // src/utils/swc/options.ts
-var require2 = createRequire(import.meta.url);
-var regeneratorRuntimePath = require2.resolve(
+var require3 = createRequire(import.meta.url);
+var regeneratorRuntimePath = require3.resolve(
   "next/dist/compiled/regenerator-runtime"
 );
 function getBaseSWCOptions({
@@ -4335,7 +4349,7 @@ function getBaseSWCOptions({
   const useDefineForClassFields = Boolean(
     jsConfig?.compilerOptions?.useDefineForClassFields
   );
-  const plugins = (swcPlugins ?? []).filter(Array.isArray).map(([name, options]) => [require2.resolve(name), options]);
+  const plugins = (swcPlugins ?? []).filter(Array.isArray).map(([name, options]) => [require3.resolve(name), options]);
   return {
     jsc: {
       ...resolvedBaseUrl && paths ? {
@@ -4523,8 +4537,9 @@ function vitePluginNextSwc(rootDir, nextConfigResolver) {
       await loadSWCBindingsEagerly(nextConfig);
       const serverWatchIgnored = config.server?.watch?.ignored;
       const isServerWatchIgnoredArray = Array.isArray(serverWatchIgnored);
-      if (config.test?.environment === "node" || config.test?.environment === "edge-runtime" || config.test?.browser?.enabled !== false) {
-        isServerEnvironment = true;
+      isServerEnvironment = false;
+      if (isVitestEnv) {
+        isServerEnvironment = config.test?.environment === "node" || config.test?.environment === "edge-runtime" || config.test?.browser?.enabled !== true;
       }
       return {
         // esbuild: {
@@ -4663,21 +4678,6 @@ var reservedWords = "break case class catch const continue debugger default dele
 var builtins = "arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl";
 var forbiddenIdentifiers = new Set(`${reservedWords} ${builtins}`.split(" "));
 forbiddenIdentifiers.add("");
-var require3 = createRequire(import.meta.url);
-var VITEST_PLUGIN_NAME = "vite-plugin-storybook-nextjs";
-var isVitestEnv = process.env.VITEST === "true";
-function getExecutionEnvironment(config) {
-  return isVitestEnv && config.test?.browser?.enabled !== true ? "node" : "browser";
-}
-var getNextjsVersion = () => require3("next/package.json").version;
-var getNextjsMajorVersion = () => {
-  try {
-    const version = getNextjsVersion();
-    return Number.parseInt(version.split(".")[0], 10);
-  } catch (error) {
-    return 16;
-  }
-};
 var require4 = createRequire(import.meta.url);
 var getEntryPoint = (subPath, env) => require4.resolve(`${VITEST_PLUGIN_NAME}/${env}/mocks/${subPath}`);
 var getAlias = (env) => ({
@@ -4695,9 +4695,19 @@ var warnOnce = (message) => {
 };
 var includePattern2 = /\.(png|jpg|jpeg|gif|webp|avif|ico|bmp|svg)$/;
 var excludeImporterPattern = /\.(css|scss|sass)$/;
-var virtualImage = "virtual:next-image";
+var virtualImagePrefix = "\0virtual:next-image:";
 var virtualNextImage = "virtual:next/image";
 var virtualNextLegacyImage = "virtual:next/legacy/image";
+function encodeBase64Url(str) {
+  const base64 = Buffer.from(str).toString("base64");
+  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+}
+function decodeBase64Url(str) {
+  const padding = (4 - str.length % 4) % 4;
+  const withPadding = str + "=".repeat(padding);
+  const base64 = withPadding.replace(/-/g, "+").replace(/_/g, "/");
+  return Buffer.from(base64, "base64").toString();
+}
 var require5 = createRequire(import.meta.url);
 function vitePluginNextImage(nextConfigResolver, options = {}) {
   let isBrowser = !isVitestEnv;
@@ -4745,14 +4755,14 @@ function vitePluginNextImage(nextConfigResolver, options = {}) {
           For more info and recommended configuration, see: https://github.com/storybookjs/vite-plugin-storybook-nextjs/blob/main/README.md#faq-includingexcluding-images`
         );
       }
-      if (includePattern2.test(source) && !excludeImporterPattern.test(importer ?? "") && !importer?.startsWith(virtualImage)) {
+      if (includePattern2.test(source) && !excludeImporterPattern.test(importer ?? "") && !importer?.startsWith(virtualImagePrefix)) {
         const isAbsolute3 = posix.isAbsolute(id);
         const imagePath = importer ? isAbsolute3 ? source : posix.join(posix.dirname(importer), source) : source;
         const pathForFilter = imagePath.replace(postfixRE, "");
         if (!filter(pathForFilter)) {
           return null;
         }
-        return `${virtualImage}?${encode({ imagePath })}`;
+        return `${virtualImagePrefix}${encodeBase64Url(imagePath)}`;
       }
       if (id === "next/image" && importer !== virtualNextImage) {
         return virtualNextImage;
@@ -4776,9 +4786,8 @@ function vitePluginNextImage(nextConfigResolver, options = {}) {
           )
         )).toString("utf-8");
       }
-      const [source, query] = id.split("?");
-      if (virtualImage === source) {
-        const imagePath = decode(query).imagePath;
+      if (id.startsWith(virtualImagePrefix)) {
+        const imagePath = decodeBase64Url(id.slice(virtualImagePrefix.length));
         const nextConfig = await nextConfigResolver.promise;
         try {
           if (nextConfig.images?.disableStaticImages) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-storybook-nextjs",
-  "version": "3.1.4",
+  "version": "3.1.6",
   "description": "",
   "keywords": [
     "vite-plugin",