vike 0.4.231-commit-e1c3295 → 0.4.232-commit-134207d

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/filesystemRouting.js

@@ -34,7 +34,16 @@ function getFilesystemRouteString(locationId) {
 }
 /** Filesystem Inheritance: get the apply root */
 function getInheritanceRoot(locationId) {
-    return getLogicalPath(locationId, ['renderer']);
+    return getLogicalPath(locationId, [
+        'renderer',
+        // - Enable hooks defined by vike-{react,vue,solid} such as +onBeforeRenderClient to be defined at the root directory. In other words, avoid following error:
+        //   ```bash
+        //   [11:09:43.072][/test-preview.test.ts][npm run preview][stderr] Error: [vike][Wrong Usage] /+onBeforeRenderClient.ts sets the value of the config onBeforeRenderClient which is a custom config that is defined with https://vike.dev/meta at a path that doesn't apply to / — see https://vike.dev/config#inheritance
+        //   ```
+        // - Not sure if it's a good idea? Could it make config inheritance confusing? Let's try for now and see how it goes.
+        // - TO-DO/eventually: update docs https://github.com/vikejs/vike/blob/5fcdc4d5094f1a4dcbefc0b481cdd30a205aef2d/docs/pages/filesystem-routing/%2BPage.mdx?plain=1#L98
+        'pages',
+    ]);
 }
 /**
  * getLogicalPath('/pages/some-page', ['pages']) => '/some-page'
@@ -113,14 +122,14 @@ function assertRedundantParentheses(dir, ignoredDirs, somePath) {
         return;
     }
     const dirnameActual = dir;
-    const dirnameCorect = dirWithoutParentheses;
+    const dirnameCorrect = dirWithoutParentheses;
     const dirpathActual = somePath.slice(0, somePath.indexOf(dirnameActual) + dirnameActual.length);
-    const dirpathCorect = dirpathActual.replaceAll(dirnameActual, dirnameCorect);
+    const dirpathCorrect = dirpathActual.replaceAll(dirnameActual, dirnameCorrect);
     const logDir = (d) => picocolors_1.default.bold(d + '/');
     (0, utils_js_1.assertWarning)(false, [
-        `The directories ${logDir(dirnameCorect)} are always ignored by Vike's Filesystem Routing`,
+        `The directories ${logDir(dirnameCorrect)} are always ignored by Vike's Filesystem Routing`,
         '(https://vike.dev/filesystem-routing):',
-        `rename directory ${logDir(dirpathActual)} to ${logDir(dirpathCorect)}`
+        `rename directory ${logDir(dirpathActual)} to ${logDir(dirpathCorrect)}`,
     ].join(' '), { onlyOnce: true });
 }
 function removeFilename(filePathAbsoluteUserRootDir) {

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/getPlusFilesAll.js

@@ -68,7 +68,7 @@ async function getPlusFilesAll(userRootDir, esbuildCache) {
                 filePath,
                 isConfigFile: false,
                 isNotLoaded: true,
-                configName
+                configName,
             };
             plusFilesAll[locationId] = plusFilesAll[locationId] ?? [];
             plusFilesAll[locationId].push(plusFile);
@@ -76,7 +76,7 @@ async function getPlusFilesAll(userRootDir, esbuildCache) {
             //  - If `configDef` is `undefined` => we load the file +{configName}.js later.
             //  - We already need to load +meta.js here (to get the custom config definitions defined by the user)
             await (0, loadFileAtConfigTime_js_1.loadValueFile)(plusFile, configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn, userRootDir, esbuildCache);
-        })
+        }),
     ]);
     // Make lists element order deterministic
     Object.entries(plusFilesAll).forEach(([_locationId, plusFiles]) => {
@@ -101,7 +101,7 @@ function getPlusFileFromConfigFile(configFile, isExtensionConfig, locationId, us
         if (pointerImport) {
             pointerImportsByConfigName[configName] = {
                 ...pointerImport,
-                fileExportValueLoaded: false
+                fileExportValueLoaded: false,
             };
         }
     });
@@ -112,7 +112,7 @@ function getPlusFileFromConfigFile(configFile, isExtensionConfig, locationId, us
         pointerImportsByConfigName,
         isConfigFile: true,
         isExtensionConfig,
-        extendsFilePaths
+        extendsFilePaths,
     };
     return plusFile;
 }

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/loadFileAtConfigTime.js

@@ -61,7 +61,7 @@ async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionC
     const configFile = {
         fileExports,
         filePath: configFilePath,
-        extendsFilePaths
+        extendsFilePaths,
     };
     return { configFile, extendsConfigs };
 }

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/pointerImports.js

@@ -14,7 +14,7 @@ exports.assertPointerImportPath = assertPointerImportPath;
 //   - Acorn plugin: https://github.com/acornjs/acorn/issues/983
 //   - Isn't stage 4 yet: https://github.com/tc39/proposal-import-attributes
 // - Using a import path suffix such as `import { Layout } from './Layout?real` breaks TypeScript, and TypeScript isn't working on supporting query params: https://github.com/microsoft/TypeScript/issues/10988#issuecomment-867135453
-// - Node.js >=21 supports import attribtues: https://nodejs.org/api/esm.html#import-attributes
+// - Node.js >=21 supports import attributes: https://nodejs.org/api/esm.html#import-attributes
 // - Esbuid supports
 //   - Blocker: https://github.com/evanw/esbuild/issues/3646
 //     - Ugly hack to make it work: https://github.com/brillout/esbuild-playground/tree/experiment/import-attribute
@@ -68,7 +68,7 @@ skipWarnings) {
             const errMsg = [
                 `The following import in ${filePathToShowToUser2} has no effect:`,
                 quote,
-                'See https://vike.dev/config#pointer-imports'
+                'See https://vike.dev/config#pointer-imports',
             ].join('\n');
             if (!skipWarnings) {
                 if (!isWarning) {
@@ -101,7 +101,7 @@ skipWarnings) {
         spliceOperations.push({
             start,
             end,
-            replacement
+            replacement,
         });
     });
     const codeMod = spliceMany(code, spliceOperations);
@@ -110,7 +110,7 @@ skipWarnings) {
 function getImports(code) {
     const { body } = (0, acorn_1.parse)(code, {
         ecmaVersion: 'latest',
-        sourceType: 'module'
+        sourceType: 'module',
         // https://github.com/acornjs/acorn/issues/1136
     });
     const imports = [];
@@ -123,7 +123,7 @@ function getImports(code) {
 const import_ = 'import';
 const SEP = ':';
 const zeroWidthSpace = '\u200b';
-function serializePointerImportData({ importPath, exportName, importStringWasGenerated }) {
+function serializePointerImportData({ importPath, exportName, importStringWasGenerated, }) {
     const tag = importStringWasGenerated ? zeroWidthSpace : '';
     // `import:${importPath}:${importPath}`
     return `${tag}${import_}${SEP}${importPath}${SEP}${exportName}`;

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/resolvePointerImport.js

@@ -21,7 +21,7 @@ function resolvePointerImport(configValue, importerFilePath, userRootDir, config
     const fileExportPath = {
         ...filePath,
         fileExportName: exportName,
-        fileExportPathToShowToUser
+        fileExportPathToShowToUser,
     };
     return { fileExportPath };
 }
@@ -45,7 +45,7 @@ function resolvePointerImportData(pointerImportData, importerFilePath, userRootD
             (0, utils_js_1.assertUsage)(filePathAbsoluteUserRootDir, `The import path ${importPath} defined by ${importerFilePath.filePathToShowToUser} is ${errSuffix}`);
         }
         // Forbid node_modules/ because it's brittle: if node_modules/ lives outside of userRootDir then it crashes.
-        (0, utils_js_1.assertUsage)(!filePathAbsoluteUserRootDir.includes('/node_modules/'), `The import path ${importPath} defined by ${importerFilePath.filePathToShowToUser} resolves to ${filePathAbsoluteFilesystem} inside of node_modules/ which is forbbiden: use an npm package import instead.`);
+        (0, utils_js_1.assertUsage)(!filePathAbsoluteUserRootDir.includes('/node_modules/'), `The import path ${importPath} defined by ${importerFilePath.filePathToShowToUser} resolves to ${filePathAbsoluteFilesystem} inside of node_modules/ which is forbidden: use an npm package import instead.`);
         filePath = (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir });
     }
     else {
@@ -55,13 +55,13 @@ function resolvePointerImportData(pointerImportData, importerFilePath, userRootD
             filePath = (0, getFilePath_js_1.getFilePathResolved)({
                 userRootDir,
                 filePathAbsoluteFilesystem,
-                importPathAbsolute
+                importPathAbsolute,
             });
         }
         else {
             // We cannot resolve path aliases defined only in Vite
             filePath = (0, getFilePath_js_1.getFilePathUnresolved)({
-                importPathAbsolute
+                importPathAbsolute,
             });
         }
     }
@@ -74,7 +74,7 @@ function resolveImportPathWithNode(pointerImportData, importerFilePath, userRoot
     const filePathAbsoluteFilesystem = (0, utils_js_1.requireResolveOptional)({
         importPath: pointerImportData.importPath,
         importerFilePath: importerFilePathAbsolute,
-        userRootDir
+        userRootDir,
     });
     if (!filePathAbsoluteFilesystem) {
         (0, utils_js_1.assert)(!(0, utils_js_1.isImportPathRelative)(pointerImportData.importPath));

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.js

@@ -8,8 +8,8 @@ exports.getConfigBuildErrorFormatted = getConfigBuildErrorFormatted;
 exports.getConfigExecutionErrorIntroMsg = getConfigExecutionErrorIntroMsg;
 exports.isTemporaryBuildFile = isTemporaryBuildFile;
 const esbuild_1 = require("esbuild");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const import_1 = require("@brillout/import");
 const utils_js_1 = require("../../utils.js");
@@ -77,14 +77,14 @@ async function transpileFile(filePath, transformImports, userRootDir, esbuildCac
 }
 async function transpileWithEsbuild(filePath, userRootDir, transformImports, esbuildCache) {
     const entryFilePath = filePath.filePathAbsoluteFilesystem;
-    const entryFileDir = path_1.default.posix.dirname(entryFilePath);
+    const entryFileDir = node_path_1.default.posix.dirname(entryFilePath);
     const options = {
         platform: 'node',
         entryPoints: [entryFilePath],
         sourcemap: 'inline',
         write: false,
         target: ['node14.18', 'node16'],
-        outfile: path_1.default.posix.join(
+        outfile: node_path_1.default.posix.join(
         // Needed for correct inline source map
         entryFileDir, 
         // `write: false` => no file is actually emitted
@@ -97,7 +97,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
         treeShaking: false,
         minify: false,
         metafile: true,
-        bundle: true
+        bundle: true,
     };
     const pointerImports = {};
     options.plugins = [
@@ -123,13 +123,13 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     if (debugEsbuildResolve.isActivated)
                         debugEsbuildResolve('resolved', resolved);
                     // Temporary workaround for https://github.com/evanw/esbuild/issues/3973
-                    // - Sitll required for esbuild@0.24.0 (November 2024).
+                    // - Still required for esbuild@0.24.0 (November 2024).
                     // - Let's try to remove this workaround again later.
                     if (resolved.errors.length > 0) {
                         const resolvedWithNode = (0, utils_js_1.requireResolveOptionalDir)({
                             importPath: path,
                             importerDir: (0, utils_js_1.toPosixPath)(args.resolveDir),
-                            userRootDir
+                            userRootDir,
                         });
                         if (debugEsbuildResolve.isActivated)
                             debugEsbuildResolve('resolvedWithNode', resolvedWithNode);
@@ -204,7 +204,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                         //  - Path alias
                         const filePathAbsoluteUserRootDir = (0, getFilePath_js_1.getFilePathAbsoluteUserRootDir)({
                             filePathAbsoluteFilesystem: importPathResolved,
-                            userRootDir
+                            userRootDir,
                         });
                         if (filePathAbsoluteUserRootDir && !isNpmPkgImport) {
                             // `importPathOriginal` is most likely a path alias.
@@ -232,14 +232,14 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     pointerImports[importPathTranspiled] = isPointerImport;
                     return { external: true, path: importPathTranspiled };
                 });
-            }
+            },
         },
         // Track dependencies
         {
             name: 'vike:dependency-tracker',
             setup(b) {
                 b.onLoad({ filter: /./ }, (args) => {
-                    // We collect the dependency `args.path` in case the bulid fails (upon build error => error is thrown => no metafile)
+                    // We collect the dependency `args.path` in case the build fails (upon build error => error is thrown => no metafile)
                     let { path } = args;
                     path = (0, utils_js_1.toPosixPath)(path);
                     esbuildCache.vikeConfigDependencies.add(path);
@@ -254,8 +254,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                  *  - But implementing a fix is complex and isn't worth it.
                 b.onResolve(...)
                 */
-            }
-        }
+            },
+        },
     ];
     let result;
     try {
@@ -270,7 +270,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
     Object.keys(result.metafile.inputs).forEach((filePathRelative) => {
         filePathRelative = (0, utils_js_1.toPosixPath)(filePathRelative);
         (0, utils_js_1.assertPosixPath)(userRootDir);
-        const filePathAbsoluteFilesystem = path_1.default.posix.join(userRootDir, filePathRelative);
+        const filePathAbsoluteFilesystem = node_path_1.default.posix.join(userRootDir, filePathRelative);
         esbuildCache.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
     });
     const code = result.outputFiles[0].text;
@@ -282,8 +282,8 @@ async function executeTranspiledFile(filePath, code) {
     // Alternative to using a temporary file: https://github.com/vitejs/vite/pull/13269
     //  - But seems to break source maps, so I don't think it's worth it
     const filePathTmp = getTemporaryBuildFilePath(filePathAbsoluteFilesystem);
-    fs_1.default.writeFileSync(filePathTmp, code);
-    const clean = () => fs_1.default.unlinkSync(filePathTmp);
+    node_fs_1.default.writeFileSync(filePathTmp, code);
+    const clean = () => node_fs_1.default.unlinkSync(filePathTmp);
     let fileExports = {};
     try {
         fileExports = await executeFile(filePathTmp, filePath);
@@ -324,7 +324,7 @@ async function formatBuildErr(err, filePath) {
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(err) && err.errors);
     const msgEsbuild = (await (0, esbuild_1.formatMessages)(err.errors, {
         kind: 'error',
-        color: true
+        color: true,
     }))
         .map((m) => m.trim())
         .join('\n');
@@ -340,16 +340,16 @@ function getConfigExecutionErrorIntroMsg(err) {
 }
 function getTemporaryBuildFilePath(filePathAbsoluteFilesystem) {
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
-    const dirname = path_1.default.posix.dirname(filePathAbsoluteFilesystem);
-    const filename = path_1.default.posix.basename(filePathAbsoluteFilesystem);
+    const dirname = node_path_1.default.posix.dirname(filePathAbsoluteFilesystem);
+    const filename = node_path_1.default.posix.basename(filePathAbsoluteFilesystem);
     // Syntax with semicolon `build:${/*...*/}` doesn't work on Windows: https://github.com/vikejs/vike/issues/800#issuecomment-1517329455
-    const filePathTmp = path_1.default.posix.join(dirname, `${filename}.build-${(0, utils_js_1.getRandomId)()}.mjs`);
+    const filePathTmp = node_path_1.default.posix.join(dirname, `${filename}.build-${(0, utils_js_1.getRandomId)()}.mjs`);
     (0, utils_js_1.assert)(isTemporaryBuildFile(filePathTmp));
     return filePathTmp;
 }
 function isTemporaryBuildFile(filePath) {
     (0, utils_js_1.assertPosixPath)(filePath);
-    const fileName = path_1.default.posix.basename(filePath);
+    const fileName = node_path_1.default.posix.basename(filePath);
     return /\.build-[a-z0-9]{12}\.mjs$/.test(fileName);
 }
 // TODO/next-major: remove
@@ -359,21 +359,21 @@ function isHeaderFile(filePath) {
     return fileExtensions.includes('h');
 }
 function getFileExtensions(filePath) {
-    const fileExtensions = path_1.default.posix.basename(filePath).split('.').slice(1);
+    const fileExtensions = node_path_1.default.posix.basename(filePath).split('.').slice(1);
     return fileExtensions;
 }
 function getFileExtension(filePath) {
-    const fileExtensions = path_1.default.posix.basename(filePath).split('.').slice(1);
+    const fileExtensions = node_path_1.default.posix.basename(filePath).split('.').slice(1);
     return fileExtensions.pop();
 }
 function removeHeaderFileExtension(filePath) {
     (0, utils_js_1.assertPosixPath)(filePath);
-    const fileName = path_1.default.posix.basename(filePath);
+    const fileName = node_path_1.default.posix.basename(filePath);
     const fileNameParts = fileName.split('.');
     const fileNamePartsMod = fileNameParts.filter((p) => p !== 'h');
     (0, utils_js_1.assert)(fileNamePartsMod.length < fileNameParts.length);
     const fileNameMod = fileNamePartsMod.join('.');
-    return path_1.default.posix.join(path_1.default.posix.dirname(filePath), fileNameMod);
+    return node_path_1.default.posix.join(node_path_1.default.posix.dirname(filePath), fileNameMod);
 }
 // Needed for the npm package 'source-map-support'. The Error.prepareStackTrace() hook of 'source-map-support' needs to be called before the file containing the source map is removed. The clean() call above removes the transpiled file from disk but it contains the inline source map.
 function triggerPrepareStackTrace(err) {
@@ -391,7 +391,7 @@ function getErrIntroMsg(operation, filePath) {
         // prettier ignore
         picocolors_1.default.red(`Failed to ${operation}`),
         picocolors_1.default.bold(picocolors_1.default.red(filePathToShowToUserResolved)),
-        picocolors_1.default.red(`because:`)
+        picocolors_1.default.red(`because:`),
     ].join(' ');
     return msg;
 }