vite-plugin-storybook-nextjs 3.1.3 → 3.1.5

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');
 
@@ -4728,9 +4727,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 +4787,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 +4818,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';
 
@@ -4695,9 +4694,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 +4754,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 +4785,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/dist/plugins/next-mocks/alias/dynamic/index.cjs

@@ -19,9 +19,6 @@ function noSSR() {
 }
 function dynamic(dynamicOptions, options) {
   const loadableFn = Loadable__default.default;
-  if (options?.ssr === false) {
-    delete options.ssr;
-  }
   let loadableOptions = {
     // A loading component is not required, so we default it
     loading: ({ error, isLoading, pastDelay }) => {
@@ -54,6 +51,11 @@ function dynamic(dynamicOptions, options) {
     };
     delete loadableOptions.loadableGenerated;
   }
+  if (typeof loadableOptions.ssr === "boolean" && !loadableOptions.ssr) {
+    delete loadableOptions.ssr;
+    delete loadableOptions.webpack;
+    delete loadableOptions.modules;
+  }
   return loadableFn({ ...loadableOptions, loader });
 }
 

package/dist/plugins/next-mocks/alias/dynamic/index.js

@@ -10,9 +10,6 @@ function noSSR() {
 }
 function dynamic(dynamicOptions, options) {
   const loadableFn = Loadable;
-  if (options?.ssr === false) {
-    delete options.ssr;
-  }
   let loadableOptions = {
     // A loading component is not required, so we default it
     loading: ({ error, isLoading, pastDelay }) => {
@@ -45,6 +42,11 @@ function dynamic(dynamicOptions, options) {
     };
     delete loadableOptions.loadableGenerated;
   }
+  if (typeof loadableOptions.ssr === "boolean" && !loadableOptions.ssr) {
+    delete loadableOptions.ssr;
+    delete loadableOptions.webpack;
+    delete loadableOptions.modules;
+  }
   return loadableFn({ ...loadableOptions, loader });
 }
 

package/package.json

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