vite-plugin-storybook-nextjs 1.0.8 → 1.0.9

package/dist/index.cjs

@@ -1,12 +1,13 @@
 'use strict';
 
-var path = require('path');
+var path2 = require('path');
 var module$1 = require('module');
 var defineEnvPlugin_js = require('next/dist/build/webpack/plugins/define-env-plugin.js');
 var fs3 = require('fs');
 var nextEnv = require('@next/env');
 var Log = require('next/dist/build/output/log.js');
 var index_js = require('next/dist/build/swc/index.js');
+var findPagesDir_js = require('next/dist/lib/find-pages-dir.js');
 var fs2 = require('fs/promises');
 var fetchCssFromGoogleFonts_js = require('next/dist/compiled/@next/font/dist/google/fetch-css-from-google-fonts.js');
 var getFontAxes_js = require('next/dist/compiled/@next/font/dist/google/get-font-axes.js');
@@ -16,7 +17,6 @@ var loaderUtils = require('next/dist/compiled/loader-utils3/index.js');
 var validateLocalFontFunctionCall_js = require('next/dist/compiled/@next/font/dist/local/validate-local-font-function-call.js');
 var tsDedent = require('ts-dedent');
 var nextLoadJsConfig = require('next/dist/build/load-jsconfig.js');
-var findPagesDir_js = require('next/dist/lib/find-pages-dir.js');
 var vite = require('vite');
 var utils_js = require('next/dist/build/utils.js');
 var options_js = require('next/dist/build/swc/options.js');
@@ -48,7 +48,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var path__default = /*#__PURE__*/_interopDefault(path);
+var path2__default = /*#__PURE__*/_interopDefault(path2);
 var fs3__default = /*#__PURE__*/_interopDefault(fs3);
 var nextEnv__namespace = /*#__PURE__*/_interopNamespace(nextEnv);
 var Log__default = /*#__PURE__*/_interopDefault(Log);
@@ -81,7 +81,7 @@ async function loadClosestPackageJson(dir, attempts = 1) {
   const mainPath = attempts === 1 ? ["."] : new Array(attempts).fill("..");
   try {
     const file = await fs3__default.default.promises.readFile(
-      path.join(dir, ...mainPath, "package.json"),
+      path2.join(dir, ...mainPath, "package.json"),
       "utf8"
     );
     return JSON.parse(file);
@@ -89,12 +89,22 @@ async function loadClosestPackageJson(dir, attempts = 1) {
     return loadClosestPackageJson(dir, attempts + 1);
   }
 }
+function findNextDirectories(dir) {
+  try {
+    return findPagesDir_js.findPagesDir(dir);
+  } catch (e) {
+    return {
+      appDir: path2__default.default.join(dir, "app"),
+      pagesDir: path2__default.default.join(dir, "pages")
+    };
+  }
+}
 
 // src/plugins/next-env/plugin.ts
 function vitePluginNextEnv(rootDir, nextConfigResolver) {
   let envConfig;
   let isDev;
-  const resolvedDir = path.resolve(rootDir);
+  const resolvedDir = path2.resolve(rootDir);
   return {
     name: "vite-plugin-storybook-nextjs-env",
     enforce: "pre",
@@ -344,7 +354,7 @@ function vitePluginNextFont() {
         return null;
       }
       let fontFaceDeclaration;
-      const pathSep = path__default.default.sep;
+      const pathSep = path2__default.default.sep;
       if (sourceWithoutQuery.endsWith(
         ["next", "font", "google", "target.css"].join(pathSep)
       )) {
@@ -353,17 +363,17 @@ function vitePluginNextFont() {
       if (sourceWithoutQuery.endsWith(
         ["next", "font", "local", "target.css"].join(pathSep)
       )) {
-        const importerDirPath = path__default.default.dirname(fontOptions.filename);
+        const importerDirPath = path2__default.default.dirname(fontOptions.filename);
         const emitFont = async (importerRelativeFontPath) => {
-          const fontExtension = path__default.default.extname(importerRelativeFontPath);
-          const fontBaseName = path__default.default.basename(
+          const fontExtension = path2__default.default.extname(importerRelativeFontPath);
+          const fontBaseName = path2__default.default.basename(
             importerRelativeFontPath,
             fontExtension
           );
-          const fontPath = path__default.default.join(importerDirPath, importerRelativeFontPath);
+          const fontPath = path2__default.default.join(importerDirPath, importerRelativeFontPath);
           if (devMode) {
             return {
-              fontPath: path__default.default.join(cwd, fontPath),
+              fontPath: path2__default.default.join(cwd, fontPath),
               fontReferenceId: void 0
             };
           }
@@ -610,7 +620,7 @@ var getVitestSWCTransformConfig = ({
     swcPlugins: nextConfig.experimental.swcPlugins,
     compiler: nextConfig?.compiler,
     esm: isEsmProject,
-    swcCacheDir: path__default.default.join(
+    swcCacheDir: path2__default.default.join(
       rootDir,
       nextConfig.distDir ?? ".next",
       "cache",
@@ -623,7 +633,7 @@ var getVitestSWCTransformConfig = ({
     ...baseOptions,
     fontLoaders: {
       fontLoaders: ["next/font/local", "next/font/google"],
-      relativeFilePathFromRoot: path__default.default.relative(rootDir, filename)
+      relativeFilePathFromRoot: path2__default.default.relative(rootDir, filename)
     },
     cjsRequireOptimizer: {
       packages: {
@@ -683,13 +693,13 @@ function vitePluginNextSwc(rootDir, nextConfigResolver) {
   let isDev;
   let isEsmProject;
   const filter = vite.createFilter(included, excluded);
-  const resolvedDir = path.resolve(rootDir);
+  const resolvedDir = path2.resolve(rootDir);
   return {
     name: "vite-plugin-storybook-nextjs-swc",
     enforce: "pre",
     async config(config, env) {
       const nextConfig = await nextConfigResolver.promise;
-      nextDirectories = findPagesDir_js.findPagesDir(resolvedDir);
+      nextDirectories = findNextDirectories(resolvedDir);
       loadedJSConfig = await loadJsConfig(resolvedDir, nextConfig);
       isDev = env.mode !== "production";
       await loadClosestPackageJson(resolvedDir);
@@ -827,8 +837,8 @@ function vitePluginNextImage(nextConfigResolver) {
         return null;
       }
       if (includePattern2.test(source) && !excludeImporterPattern.test(importer ?? "") && !importer?.startsWith(virtualImage)) {
-        const isAbsolute = path__default.default.isAbsolute(id);
-        const imagePath = importer ? isAbsolute ? source : path__default.default.join(path__default.default.dirname(importer), source) : source;
+        const isAbsolute = path2__default.default.isAbsolute(id);
+        const imagePath = importer ? isAbsolute ? source : path2__default.default.join(path2__default.default.dirname(importer), source) : source;
         return `${virtualImage}?imagePath=${imagePath}`;
       }
       if (id === "next/image" && importer !== virtualNextImage) {
@@ -857,7 +867,7 @@ function vitePluginNextImage(nextConfigResolver) {
       if (virtualImage === source) {
         const imagePath = querystring.decode(query).imagePath;
         const nextConfig = await nextConfigResolver.promise;
-        const extension = path__default.default.extname(imagePath);
+        const extension = path2__default.default.extname(imagePath);
         try {
           if (nextConfig.images?.disableStaticImages) {
             return tsDedent.dedent`
@@ -949,7 +959,7 @@ var loadConfig = (
   nextServerConfig__default.default.default || nextServerConfig__default.default
 );
 function VitePlugin({ dir = process.cwd() } = {}) {
-  const resolvedDir = path.resolve(dir);
+  const resolvedDir = path2.resolve(dir);
   const nextConfigResolver = Promise.withResolvers();
   return [
     {

package/dist/index.js

@@ -1,10 +1,11 @@
-import path, { resolve, join } from 'node:path';
+import path2, { resolve, join } from 'node:path';
 import { createRequire } from 'node:module';
 import { getDefineEnv } from 'next/dist/build/webpack/plugins/define-env-plugin.js';
 import fs3 from 'node:fs';
 import * as nextEnv from '@next/env';
 import Log from 'next/dist/build/output/log.js';
 import { transform, loadBindings, lockfilePatchPromise } from 'next/dist/build/swc/index.js';
+import { findPagesDir } from 'next/dist/lib/find-pages-dir.js';
 import fs2 from 'node:fs/promises';
 import { fetchCSSFromGoogleFonts } from 'next/dist/compiled/@next/font/dist/google/fetch-css-from-google-fonts.js';
 import { getFontAxes } from 'next/dist/compiled/@next/font/dist/google/get-font-axes.js';
@@ -14,7 +15,6 @@ import loaderUtils from 'next/dist/compiled/loader-utils3/index.js';
 import { validateLocalFontFunctionCall } from 'next/dist/compiled/@next/font/dist/local/validate-local-font-function-call.js';
 import { dedent } from 'ts-dedent';
 import nextLoadJsConfig from 'next/dist/build/load-jsconfig.js';
-import { findPagesDir } from 'next/dist/lib/find-pages-dir.js';
 import { createFilter } from 'vite';
 import { getSupportedBrowsers } from 'next/dist/build/utils.js';
 import { getParserOptions } from 'next/dist/build/swc/options.js';
@@ -55,6 +55,16 @@ async function loadClosestPackageJson(dir, attempts = 1) {
     return loadClosestPackageJson(dir, attempts + 1);
   }
 }
+function findNextDirectories(dir) {
+  try {
+    return findPagesDir(dir);
+  } catch (e) {
+    return {
+      appDir: path2.join(dir, "app"),
+      pagesDir: path2.join(dir, "pages")
+    };
+  }
+}
 
 // src/plugins/next-env/plugin.ts
 function vitePluginNextEnv(rootDir, nextConfigResolver) {
@@ -310,7 +320,7 @@ function vitePluginNextFont() {
         return null;
       }
       let fontFaceDeclaration;
-      const pathSep = path.sep;
+      const pathSep = path2.sep;
       if (sourceWithoutQuery.endsWith(
         ["next", "font", "google", "target.css"].join(pathSep)
       )) {
@@ -319,17 +329,17 @@ function vitePluginNextFont() {
       if (sourceWithoutQuery.endsWith(
         ["next", "font", "local", "target.css"].join(pathSep)
       )) {
-        const importerDirPath = path.dirname(fontOptions.filename);
+        const importerDirPath = path2.dirname(fontOptions.filename);
         const emitFont = async (importerRelativeFontPath) => {
-          const fontExtension = path.extname(importerRelativeFontPath);
-          const fontBaseName = path.basename(
+          const fontExtension = path2.extname(importerRelativeFontPath);
+          const fontBaseName = path2.basename(
             importerRelativeFontPath,
             fontExtension
           );
-          const fontPath = path.join(importerDirPath, importerRelativeFontPath);
+          const fontPath = path2.join(importerDirPath, importerRelativeFontPath);
           if (devMode) {
             return {
-              fontPath: path.join(cwd, fontPath),
+              fontPath: path2.join(cwd, fontPath),
               fontReferenceId: void 0
             };
           }
@@ -576,7 +586,7 @@ var getVitestSWCTransformConfig = ({
     swcPlugins: nextConfig.experimental.swcPlugins,
     compiler: nextConfig?.compiler,
     esm: isEsmProject,
-    swcCacheDir: path.join(
+    swcCacheDir: path2.join(
       rootDir,
       nextConfig.distDir ?? ".next",
       "cache",
@@ -589,7 +599,7 @@ var getVitestSWCTransformConfig = ({
     ...baseOptions,
     fontLoaders: {
       fontLoaders: ["next/font/local", "next/font/google"],
-      relativeFilePathFromRoot: path.relative(rootDir, filename)
+      relativeFilePathFromRoot: path2.relative(rootDir, filename)
     },
     cjsRequireOptimizer: {
       packages: {
@@ -655,7 +665,7 @@ function vitePluginNextSwc(rootDir, nextConfigResolver) {
     enforce: "pre",
     async config(config, env) {
       const nextConfig = await nextConfigResolver.promise;
-      nextDirectories = findPagesDir(resolvedDir);
+      nextDirectories = findNextDirectories(resolvedDir);
       loadedJSConfig = await loadJsConfig(resolvedDir, nextConfig);
       isDev = env.mode !== "production";
       await loadClosestPackageJson(resolvedDir);
@@ -793,8 +803,8 @@ function vitePluginNextImage(nextConfigResolver) {
         return null;
       }
       if (includePattern2.test(source) && !excludeImporterPattern.test(importer ?? "") && !importer?.startsWith(virtualImage)) {
-        const isAbsolute = path.isAbsolute(id);
-        const imagePath = importer ? isAbsolute ? source : path.join(path.dirname(importer), source) : source;
+        const isAbsolute = path2.isAbsolute(id);
+        const imagePath = importer ? isAbsolute ? source : path2.join(path2.dirname(importer), source) : source;
         return `${virtualImage}?imagePath=${imagePath}`;
       }
       if (id === "next/image" && importer !== virtualNextImage) {
@@ -823,7 +833,7 @@ function vitePluginNextImage(nextConfigResolver) {
       if (virtualImage === source) {
         const imagePath = decode(query).imagePath;
         const nextConfig = await nextConfigResolver.promise;
-        const extension = path.extname(imagePath);
+        const extension = path2.extname(imagePath);
         try {
           if (nextConfig.images?.disableStaticImages) {
             return dedent`

package/dist/plugins/next-image/alias/next-image.d.cts

@@ -2,7 +2,7 @@ import * as next_dist_shared_lib_get_img_props from 'next/dist/shared/lib/get-im
 import * as _NextImage from 'next/image';
 import React__default from 'next/dist/compiled/react';
 
-declare const MockedNextImage: React__default.ForwardRefExoticComponent<Omit<React__default.DetailedHTMLProps<React__default.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, "src" | "width" | "height" | "loading" | "ref" | "alt" | "srcSet"> & {
+declare const MockedNextImage: React__default.ForwardRefExoticComponent<Omit<React__default.DetailedHTMLProps<React__default.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, "height" | "width" | "loading" | "ref" | "alt" | "src" | "srcSet"> & {
     src: string | next_dist_shared_lib_get_img_props.StaticImport;
     alt: string;
     width?: number | `${number}` | undefined;

package/dist/plugins/next-image/alias/next-image.d.ts

@@ -2,7 +2,7 @@ import * as next_dist_shared_lib_get_img_props from 'next/dist/shared/lib/get-im
 import * as _NextImage from 'next/image';
 import React__default from 'next/dist/compiled/react';
 
-declare const MockedNextImage: React__default.ForwardRefExoticComponent<Omit<React__default.DetailedHTMLProps<React__default.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, "src" | "width" | "height" | "loading" | "ref" | "alt" | "srcSet"> & {
+declare const MockedNextImage: React__default.ForwardRefExoticComponent<Omit<React__default.DetailedHTMLProps<React__default.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, "height" | "width" | "loading" | "ref" | "alt" | "src" | "srcSet"> & {
     src: string | next_dist_shared_lib_get_img_props.StaticImport;
     alt: string;
     width?: number | `${number}` | undefined;

package/dist/plugins/next-mocks/alias/headers/cookies.d.cts

@@ -4,7 +4,7 @@ import { RequestCookies } from 'next/dist/compiled/@edge-runtime/cookies/index.j
 
 declare class RequestCookiesMock extends RequestCookies {
     get: vitest.Mock<[name: string] | [next_dist_compiled__edge_runtime_cookies.RequestCookie], next_dist_compiled__edge_runtime_cookies.RequestCookie | undefined>;
-    getAll: vitest.Mock<[next_dist_compiled__edge_runtime_cookies.RequestCookie] | [name: string] | [], next_dist_compiled__edge_runtime_cookies.RequestCookie[]>;
+    getAll: vitest.Mock<[] | [next_dist_compiled__edge_runtime_cookies.RequestCookie] | [name: string], next_dist_compiled__edge_runtime_cookies.RequestCookie[]>;
     has: vitest.Mock<[name: string], boolean>;
     set: vitest.Mock<[key: string, value: string] | [options: next_dist_compiled__edge_runtime_cookies.RequestCookie], this>;
     delete: vitest.Mock<[names: string | string[]], boolean | boolean[]>;

package/dist/plugins/next-mocks/alias/headers/cookies.d.ts

@@ -4,7 +4,7 @@ import { RequestCookies } from 'next/dist/compiled/@edge-runtime/cookies/index.j
 
 declare class RequestCookiesMock extends RequestCookies {
     get: vitest.Mock<[name: string] | [next_dist_compiled__edge_runtime_cookies.RequestCookie], next_dist_compiled__edge_runtime_cookies.RequestCookie | undefined>;
-    getAll: vitest.Mock<[next_dist_compiled__edge_runtime_cookies.RequestCookie] | [name: string] | [], next_dist_compiled__edge_runtime_cookies.RequestCookie[]>;
+    getAll: vitest.Mock<[] | [next_dist_compiled__edge_runtime_cookies.RequestCookie] | [name: string], next_dist_compiled__edge_runtime_cookies.RequestCookie[]>;
     has: vitest.Mock<[name: string], boolean>;
     set: vitest.Mock<[key: string, value: string] | [options: next_dist_compiled__edge_runtime_cookies.RequestCookie], this>;
     delete: vitest.Mock<[names: string | string[]], boolean | boolean[]>;

package/package.json

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