vike 0.4.160 → 0.4.161

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/{loadFileConfigEnv.js → loadFileAtConfigTime.js}

@@ -9,7 +9,7 @@ const utils_js_1 = require("../../../../utils.js");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
 const assertPlusFileExport_js_1 = require("../../../../../../shared/page-configs/assertPlusFileExport.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const transformImports_js_1 = require("./transformImports.js");
+const transformFileImports_js_1 = require("./transformFileImports.js");
 const getConfigFileExport_js_1 = require("../getConfigFileExport.js");
 const resolveImportPath_js_1 = require("./resolveImportPath.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
@@ -17,7 +17,7 @@ const resolveImportPath_js_1 = require("./resolveImportPath.js");
 async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {
     const f = import_.filePathAbsoluteFilesystem;
     if (!importedFilesLoaded[f]) {
-        importedFilesLoaded[f] = (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(import_, true, userRootDir).then((r) => r.fileExports);
+        importedFilesLoaded[f] = (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(import_, false, userRootDir).then((r) => r.fileExports);
     }
     const fileExports = await importedFilesLoaded[f];
     const fileExport = fileExports[import_.fileExportName];
@@ -26,7 +26,7 @@ async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {
 exports.loadImportedFile = loadImportedFile;
 // Load +{configName}.js
 async function loadValueFile(interfaceValueFile, configName, userRootDir) {
-    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(interfaceValueFile.filePath, true, userRootDir);
+    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(interfaceValueFile.filePath, false, userRootDir);
     const { filePathToShowToUser } = interfaceValueFile.filePath;
     (0, assertPlusFileExport_js_1.assertPlusFileExport)(fileExports, filePathToShowToUser, configName);
     Object.entries(fileExports).forEach(([exportName, configValue]) => {
@@ -39,7 +39,7 @@ exports.loadValueFile = loadValueFile;
 async function loadConfigFile(configFilePath, userRootDir, visited, isConfigOfExtension) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);
-    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(configFilePath, false, userRootDir, isConfigOfExtension);
+    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(configFilePath, !isConfigOfExtension, userRootDir, isConfigOfExtension);
     const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [
         ...visited,
         filePathAbsoluteFilesystem
@@ -121,7 +121,7 @@ function getExtendsImportData(configFileExports, configFilePath) {
         (0, utils_js_1.assertUsage)(false, wrongUsage);
     }
     const extendsImportData = extendList.map((importDataSerialized) => {
-        const importData = (0, transformImports_js_1.parseImportData)(importDataSerialized);
+        const importData = (0, transformFileImports_js_1.parseImportData)(importDataSerialized);
         (0, utils_js_1.assertUsage)(importData, wrongUsage);
         return importData;
     });

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveFilePath.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveFilePathAbsoluteFilesystem = exports.resolveFilePathRelativeToUserRootDir = void 0;
+const path_1 = __importDefault(require("path"));
+const utils_js_1 = require("../../../../utils.js");
+function resolveFilePathRelativeToUserRootDir(filePathRelativeToUserRootDir, userRootDir) {
+    (0, utils_js_1.assertPosixPath)(filePathRelativeToUserRootDir);
+    (0, utils_js_1.assertPosixPath)(userRootDir);
+    const filePathAbsoluteFilesystem = path_1.default.posix.join(userRootDir, filePathRelativeToUserRootDir);
+    return getFilePathResolved(filePathRelativeToUserRootDir, filePathAbsoluteFilesystem);
+}
+exports.resolveFilePathRelativeToUserRootDir = resolveFilePathRelativeToUserRootDir;
+function resolveFilePathAbsoluteFilesystem(filePathAbsoluteFilesystem, userRootDir) {
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
+    (0, utils_js_1.assertPosixPath)(userRootDir);
+    let filePathRelativeToUserRootDir = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
+    (0, utils_js_1.assert)(!filePathRelativeToUserRootDir.startsWith('.') && !filePathRelativeToUserRootDir.startsWith('/'));
+    filePathRelativeToUserRootDir = '/' + filePathRelativeToUserRootDir;
+    return getFilePathResolved(filePathRelativeToUserRootDir, filePathAbsoluteFilesystem);
+}
+exports.resolveFilePathAbsoluteFilesystem = resolveFilePathAbsoluteFilesystem;
+function getFilePathResolved(filePathRelativeToUserRootDir, filePathAbsoluteFilesystem) {
+    return {
+        filePathRelativeToUserRootDir,
+        filePathAbsoluteVite: filePathRelativeToUserRootDir,
+        filePathAbsoluteFilesystem,
+        filePathToShowToUser: filePathRelativeToUserRootDir,
+        importPathAbsolute: null
+    };
+}

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveImportPath.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearFilesEnvMap = exports.assertImportPath = exports.resolveImportPath = exports.resolveImport = void 0;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../../../../utils.js");
-const transformImports_js_1 = require("./transformImports.js");
+const transformFileImports_js_1 = require("./transformFileImports.js");
 const path_1 = __importDefault(require("path"));
 const filesEnvMap = new Map();
 function resolveImport(configValue, importerFilePath, userRootDir, configEnv, configName) {
     if (typeof configValue !== 'string')
         return null;
-    const importData = (0, transformImports_js_1.parseImportData)(configValue);
+    const importData = (0, transformFileImports_js_1.parseImportData)(configValue);
     if (!importData)
         return null;
     const { importPath, exportName } = importData;

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/{transformImports.js → transformFileImports.js}

@@ -3,15 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isImportData = exports.parseImportData = exports.transformImports = void 0;
+exports.isImportData = exports.parseImportData = exports.transformFileImports = void 0;
 // Playground: https://github.com/brillout/acorn-playground
 // Import attributes support: https://github.com/acornjs/acorn/issues/983
 //  - Isn't stage 4 yet: https://github.com/tc39/proposal-import-attributes
 const acorn_1 = require("acorn");
 const utils_js_1 = require("../../../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function transformImports(code, filePathToShowToUser2, 
-// For ./transformImports.spec.ts
+function transformFileImports(code, filePathToShowToUser2, 
+// For ./transformFileImports.spec.ts
 skipWarnings) {
     const spliceOperations = [];
     const fileImportsTransformed = [];
@@ -26,8 +26,8 @@ skipWarnings) {
             return;
         const importPath = node.source.value;
         (0, utils_js_1.assert)(typeof importPath === 'string');
-        // - This doesn't work. To make it work we would need to run esbuild twice: esbuild for TypeScript to JavaScript => transformImports() => esbuild for bundling.
-        //   - Or we use an esbuild plugin to apply transformImports(). Maybe we can completely skip the need for acorn?
+        // - This doesn't work. To make it work we would need to run esbuild twice: esbuild for TypeScript to JavaScript => transformFileImports() => esbuild for bundling.
+        //   - Or we use an esbuild plugin to apply transformFileImports(). Maybe we can completely skip the need for acorn?
         // - ?real breaks TypeScript, and TypeScript isn't working on supporting query params: https://github.com/microsoft/TypeScript/issues/10988#issuecomment-867135453
         // - Import attributes would be the best.
         //   - But it only works with Node.js >=21: https://nodejs.org/api/esm.html#import-attributes
@@ -35,7 +35,7 @@ skipWarnings) {
         //   - It works well with TypeScript: it doesn't complain upon `with { type: 'unknown-to-typescript' }` and go-to-definition & types are preserved: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-3.html#import-attributes
         //   - Esbuid seems to support it: https://esbuild.github.io/plugins/#on-load-arguments:~:text=This%20contains%20a%20map%20of%20the%20import%20attributes%20that
         //   - acorn supports it over an acorn plugin: https://github.com/acornjs/acorn/issues/983
-        //     - Maybe we can use an esbuild plugin instead of acorn to apply transformImports()?
+        //     - Maybe we can use an esbuild plugin instead of acorn to apply transformFileImports()?
         // - Using a magic comment `// @vike-real-import` is tricky:
         //   - Esbuild removes comments: https://github.com/evanw/esbuild/issues/1439#issuecomment-877656182
         //   - Using source maps to track these magic comments is brittle (source maps can easily break)
@@ -106,7 +106,7 @@ skipWarnings) {
     const codeMod = spliceMany(code, spliceOperations);
     return { code: codeMod, fileImportsTransformed, noTransformation: false };
 }
-exports.transformImports = transformImports;
+exports.transformFileImports = transformFileImports;
 function getImports(code) {
     const { body } = (0, acorn_1.parse)(code, {
         ecmaVersion: 'latest',

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js

@@ -10,13 +10,14 @@ const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const import_1 = require("@brillout/import");
 const utils_js_1 = require("../../../../utils.js");
-const transformImports_js_1 = require("./transformImports.js");
+const transformFileImports_js_1 = require("./transformFileImports.js");
 const getVikeConfig_js_1 = require("../getVikeConfig.js");
 require("source-map-support/register.js");
 const getConfigFileExport_js_1 = require("../getConfigFileExport.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-async function transpileAndExecuteFile(filePath, isValueFile, userRootDir, isConfigOfExtension = false) {
-    if (isConfigOfExtension) {
+async function transpileAndExecuteFile(filePath, transformImports, userRootDir, doNotTranspile = false) {
+    if (doNotTranspile) {
+        (0, utils_js_1.assert)(!transformImports);
         const fileExports = await executeFile(filePath.filePathAbsoluteFilesystem, filePath);
         if (isHeaderFile(filePath.filePathAbsoluteFilesystem)) {
             const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
@@ -25,22 +26,21 @@ async function transpileAndExecuteFile(filePath, isValueFile, userRootDir, isCon
         return { fileExports };
     }
     else {
-        const { code, fileImportsTransformed } = await transpileFile(filePath, isValueFile, userRootDir);
-        const fileExports = await executeTranspiledFile(filePath, code, fileImportsTransformed, isValueFile);
+        const { code, fileImportsTransformed } = await transpileFile(filePath, transformImports, userRootDir);
+        const fileExports = await executeTranspiledFile(filePath, code, fileImportsTransformed);
         return { fileExports };
     }
 }
 exports.transpileAndExecuteFile = transpileAndExecuteFile;
-async function transpileFile(filePath, isValueFile, userRootDir) {
+async function transpileFile(filePath, transformImports, userRootDir) {
     const { filePathAbsoluteFilesystem } = filePath;
     const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     getVikeConfig_js_1.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
-    const importsAreTransformed = !isValueFile;
-    let code = await transpileWithEsbuild(filePath, userRootDir, importsAreTransformed, isValueFile);
+    let code = await transpileWithEsbuild(filePath, userRootDir, transformImports);
     let fileImportsTransformed = null;
-    if (importsAreTransformed) {
-        const res = transformImports_(code, filePath);
+    if (transformImports) {
+        const res = transformFileImports_(code, filePath);
         if (res) {
             code = res.code;
             fileImportsTransformed = res.fileImportsTransformed;
@@ -48,21 +48,16 @@ async function transpileFile(filePath, isValueFile, userRootDir) {
     }
     else {
         if (isHeaderFile(filePathAbsoluteFilesystem)) {
-            if (isValueFile) {
-                (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser2} is a JavaScript header file (.h.js), but JavaScript header files only apply to +config.h.js, see https://vike.dev/header-file`, { onlyOnce: true });
-            }
-            else {
-                (0, utils_js_1.assert)(false);
-            }
+            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser2} is a JavaScript header file (.h.js), but JavaScript header files only apply to +config.h.js, see https://vike.dev/header-file`, { onlyOnce: true });
         }
     }
     return { code, fileImportsTransformed };
 }
-function transformImports_(codeOriginal, filePath) {
+function transformFileImports_(codeOriginal, filePath) {
     const { filePathAbsoluteFilesystem } = filePath;
     const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
     // Replace import statements with import strings
-    const res = (0, transformImports_js_1.transformImports)(codeOriginal, filePathToShowToUser2);
+    const res = (0, transformFileImports_js_1.transformFileImports)(codeOriginal, filePathToShowToUser2);
     if (res.noTransformation) {
         return null;
     }
@@ -75,8 +70,7 @@ function transformImports_(codeOriginal, filePath) {
     }
     return { code, fileImportsTransformed };
 }
-async function transpileWithEsbuild(filePath, userRootDir, importsAreTransformed, isValueFile) {
-    const isConfigFile = !isValueFile;
+async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
     const entryFilePath = filePath.filePathAbsoluteFilesystem;
     const entryFileDir = path_1.default.posix.dirname(entryFilePath);
     const options = {
@@ -97,12 +91,12 @@ async function transpileWithEsbuild(filePath, userRootDir, importsAreTransformed
         // Esbuild still sometimes removes unused imports because of TypeScript: https://github.com/evanw/esbuild/issues/3034
         treeShaking: false,
         minify: false,
-        metafile: isConfigFile,
+        metafile: !transformImports,
         // We cannot bundle imports that are meant to be transformed
-        bundle: !importsAreTransformed
+        bundle: !transformImports
     };
     // Track dependencies
-    if (isConfigFile) {
+    if (!transformImports) {
         options.packages = 'external';
         options.plugins = [
             {
@@ -137,7 +131,7 @@ async function transpileWithEsbuild(filePath, userRootDir, importsAreTransformed
         throw err;
     }
     // Track dependencies
-    if (isConfigFile) {
+    if (!transformImports) {
         (0, utils_js_1.assert)(result.metafile);
         Object.keys(result.metafile.inputs).forEach((filePathRelative) => {
             filePathRelative = (0, utils_js_1.toPosixPath)(filePathRelative);
@@ -150,7 +144,7 @@ async function transpileWithEsbuild(filePath, userRootDir, importsAreTransformed
     (0, utils_js_1.assert)(typeof code === 'string');
     return code;
 }
-async function executeTranspiledFile(filePath, code, fileImportsTransformed, isValueFile) {
+async function executeTranspiledFile(filePath, code, fileImportsTransformed) {
     const { filePathAbsoluteFilesystem, filePathRelativeToUserRootDir } = filePath;
     // 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
@@ -164,7 +158,7 @@ async function executeTranspiledFile(filePath, code, fileImportsTransformed, isV
     finally {
         clean();
     }
-    if (fileImportsTransformed && !isValueFile) {
+    if (fileImportsTransformed) {
         (0, utils_js_1.assert)(filePathRelativeToUserRootDir !== undefined);
         const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
         assertImportsAreReExported(fileImportsTransformed, fileExports, filePathToShowToUser2);
@@ -240,7 +234,7 @@ function assertImportsAreReExported(fileImportsTransformed, fileExports, filePat
     Object.values(exportedStrings).forEach((exportVal) => {
         if (typeof exportVal !== 'string')
             return;
-        if (!(0, transformImports_js_1.isImportData)(exportVal))
+        if (!(0, transformFileImports_js_1.isImportData)(exportVal))
             return;
         const importString = exportVal;
         fileImportsTransformed.forEach((fileImport) => {