vike 0.4.159-commit-71760c7 → 0.4.159-commit-a6bc208

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

@@ -9,7 +9,7 @@ const path_1 = __importDefault(require("path"));
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
 const filesystemRouting_js_1 = require("./getVikeConfig/filesystemRouting.js");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
-const transformImportStatements_js_1 = require("./transformImportStatements.js");
+const transformImports_js_1 = require("./transformImports.js");
 const isConfigInvalid_js_1 = require("../../../../runtime/renderPage/isConfigInvalid.js");
 const globalContext_js_1 = require("../../../../runtime/globalContext.js");
 const loggerNotProd_js_1 = require("../../../shared/loggerNotProd.js");
@@ -90,7 +90,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
     let interfaceFilesByLocationId = {};
     // Config files
     await Promise.all(configFiles.map(async (filePath) => {
-        const { configFile, extendsConfigs } = await loadConfigFile(filePath, userRootDir, []);
+        const { configFile, extendsConfigs } = await loadConfigFile(filePath, userRootDir, [], false);
         const interfaceFile = getInterfaceFileFromConfigFile(configFile, false);
         const locationId = (0, filesystemRouting_js_1.getLocationId)(filePath.filePathAbsoluteVite);
         interfaceFilesByLocationId[locationId] = interfaceFilesByLocationId[locationId] ?? [];
@@ -582,7 +582,7 @@ function isDefiningPageConfig(configName) {
 function resolveImport(configValue, importerFilePath, userRootDir, configEnv, configName) {
     if (typeof configValue !== 'string')
         return null;
-    const importData = (0, transformImportStatements_js_1.parseImportData)(configValue);
+    const importData = (0, transformImports_js_1.parseImportData)(configValue);
     if (!importData)
         return null;
     const { importPath, exportName } = importData;
@@ -845,10 +845,10 @@ function getConfigName(filePath) {
         return configName;
     }
 }
-async function loadConfigFile(configFilePath, userRootDir, visited) {
+async function loadConfigFile(configFilePath, userRootDir, visited, isConfigOfExtension) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);
-    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(configFilePath, false, userRootDir);
+    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(configFilePath, false, userRootDir, isConfigOfExtension);
     const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [
         ...visited,
         filePathAbsoluteFilesystem
@@ -875,7 +875,7 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
         const { importPath: importPath } = importData;
         const filePathAbsoluteFilesystem = resolveImportPath(importData, configFilePath);
         assertImportPath(filePathAbsoluteFilesystem, importData, configFilePath);
-        assertExtendsImportPath(importPath, filePathAbsoluteFilesystem, configFilePath);
+        warnUserLandExtension(importPath, configFilePath);
         // - filePathRelativeToUserRootDir has no functionality beyond nicer error messages for user
         // - Using importPath would be visually nicer but it's ambigous => we rather pick filePathAbsoluteFilesystem for added clarity
         const filePathRelativeToUserRootDir = determineFilePathRelativeToUserDir(filePathAbsoluteFilesystem, userRootDir);
@@ -890,7 +890,7 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
     });
     const extendsConfigs = [];
     await Promise.all(extendsConfigFiles.map(async (configFilePath) => {
-        const result = await loadConfigFile(configFilePath, userRootDir, visited);
+        const result = await loadConfigFile(configFilePath, userRootDir, visited, true);
         extendsConfigs.push(result.configFile);
         extendsConfigs.push(...result.extendsConfigs);
     }));
@@ -908,20 +908,8 @@ function determineFilePathRelativeToUserDir(filePathAbsoluteFilesystem, userRoot
         filePathRelativeToUserRootDir = '/' + filePathRelativeToUserRootDir;
     return filePathRelativeToUserRootDir;
 }
-function assertExtendsImportPath(importPath, filePath, configFilePath) {
-    if ((0, utils_js_1.isNpmPackageImport)(importPath)) {
-        const fileDir = path_1.default.posix.dirname(filePath) + '/';
-        const fileName = path_1.default.posix.basename(filePath);
-        const fileNameBaseCorrect = '+config';
-        const [fileNameBase, ...fileNameRest] = fileName.split('.');
-        const fileNameCorrect = [fileNameBaseCorrect, ...fileNameRest].join('.');
-        (0, utils_js_1.assertWarning)(fileNameBase === fileNameBaseCorrect, `Rename ${fileName} to ${fileNameCorrect} in ${fileDir}`, {
-            onlyOnce: true
-        });
-    }
-    else {
-        (0, utils_js_1.assertWarning)(false, `${configFilePath.filePathToShowToUser} uses ${picocolors_1.default.cyan('extends')} to inherit from ${picocolors_1.default.cyan(importPath)} which is a user-land file: this is experimental and may be remove at any time. Reach out to a maintainer if you need this feature.`, { onlyOnce: true });
-    }
+function warnUserLandExtension(importPath, configFilePath) {
+    (0, utils_js_1.assertWarning)((0, utils_js_1.isNpmPackageImport)(importPath), `${configFilePath.filePathToShowToUser} uses ${picocolors_1.default.cyan('extends')} to inherit from ${picocolors_1.default.cyan(importPath)} which is a user-land file: this is experimental and may be remove at any time. Reach out to a maintainer if you need this.`, { onlyOnce: true });
 }
 function getExtendsImportData(configFileExports, configFilePath) {
     const { filePathToShowToUser } = configFilePath;
@@ -941,7 +929,7 @@ function getExtendsImportData(configFileExports, configFilePath) {
         (0, utils_js_1.assertUsage)(false, wrongUsage);
     }
     const extendsImportData = extendList.map((importDataSerialized) => {
-        const importData = (0, transformImportStatements_js_1.parseImportData)(importDataSerialized);
+        const importData = (0, transformImports_js_1.parseImportData)(importDataSerialized);
         (0, utils_js_1.assertUsage)(importData, wrongUsage);
         return importData;
     });

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

@@ -3,14 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVikeRealImport = exports.isImportData = exports.parseImportData = exports.transformImportStatements = void 0;
+exports.isImportData = exports.parseImportData = exports.transformImports = 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 transformImportStatements(code, filePathToShowToUser2) {
+function transformImports(code, filePathToShowToUser2, 
+// For ./transformImports.spec.ts
+skipWarnings) {
     const spliceOperations = [];
     const fileImportsTransformed = [];
     // Performance trick
@@ -24,9 +26,29 @@ function transformImportStatements(code, filePathToShowToUser2) {
             return;
         const importPath = node.source.value;
         (0, utils_js_1.assert)(typeof importPath === 'string');
-        const { start, end } = node;
-        if (isVikeRealImport(code, end))
+        // - 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?
+        // - ?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
+        //     - But it's probably ok to tell users "to use real imports you need Node.js 21 or above".
+        //   - 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()?
+        // - 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)
+        if (importPath.endsWith('?real')) {
+            const { start, end } = node.source;
+            spliceOperations.push({
+                start,
+                end,
+                replacement: importPath.slice(0, -1 * '?real'.length)
+            });
             return;
+        }
+        const { start, end } = node;
         const importStatementCode = code.slice(start, end);
         // No variable imported
         if (node.specifiers.length === 0) {
@@ -42,10 +64,12 @@ function transformImportStatements(code, filePathToShowToUser2) {
                 `As explained in https://vike.dev/header-file the following import in ${filePathToShowToUser2} has no effect:`,
                 quote
             ].join('\n');
-            if (!isWarning) {
-                (0, utils_js_1.assertUsage)(false, errMsg);
+            if (!skipWarnings) {
+                if (!isWarning) {
+                    (0, utils_js_1.assertUsage)(false, errMsg);
+                }
+                (0, utils_js_1.assertWarning)(false, errMsg, { onlyOnce: true });
             }
-            (0, utils_js_1.assertWarning)(false, errMsg, { onlyOnce: true });
         }
         let replacement = '';
         node.specifiers.forEach((specifier) => {
@@ -82,7 +106,7 @@ function transformImportStatements(code, filePathToShowToUser2) {
     const codeMod = spliceMany(code, spliceOperations);
     return { code: codeMod, fileImportsTransformed, noTransformation: false };
 }
-exports.transformImportStatements = transformImportStatements;
+exports.transformImports = transformImports;
 function getImports(code) {
     const { body } = (0, acorn_1.parse)(code, {
         ecmaVersion: 'latest',
@@ -150,7 +174,7 @@ function spliceMany(str, operations) {
                     .join('');
         endPrev = end;
     });
-    strMod += str.slice(endPrev, str.length - 1);
+    strMod += str.slice(endPrev, str.length);
     return strMod;
 }
 function indent(str) {
@@ -159,11 +183,3 @@ function indent(str) {
         .map((s) => `  ${s}`)
         .join('\n');
 }
-function isVikeRealImport(code, posStart) {
-    let posEnd = code.indexOf('\n', posStart);
-    if (posEnd === -1)
-        posEnd = code.length;
-    const lineEnd = code.slice(posStart, posEnd);
-    return lineEnd.includes('@vike-real-import');
-}
-exports.isVikeRealImport = isVikeRealImport;

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

@@ -10,50 +10,64 @@ 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 transformImportStatements_js_1 = require("./transformImportStatements.js");
+const transformImports_js_1 = require("./transformImports.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) {
-    const { code, fileImportsTransformed } = await transpileFile(filePath, isValueFile, userRootDir);
-    const { fileExports } = await executeFile(filePath, code, fileImportsTransformed, isValueFile);
-    return { fileExports };
+async function transpileAndExecuteFile(filePath, isValueFile, userRootDir, isConfigOfExtension = false) {
+    if (isConfigOfExtension) {
+        const fileExports = await executeFile(filePath.filePathAbsoluteFilesystem, filePath);
+        if (isHeaderFile(filePath.filePathAbsoluteFilesystem)) {
+            const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
+            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser2} is a JavaScript header file (.h.js), but JavaScript header files don't apply to the config files of extensions`, { onlyOnce: true });
+        }
+        return { fileExports };
+    }
+    else {
+        const { code, fileImportsTransformed } = await transpileFile(filePath, isValueFile, userRootDir);
+        const fileExports = await executeTranspiledFile(filePath, code, fileImportsTransformed, isValueFile);
+        return { fileExports };
+    }
 }
 exports.transpileAndExecuteFile = transpileAndExecuteFile;
 async function transpileFile(filePath, isValueFile, userRootDir) {
     const { filePathAbsoluteFilesystem } = filePath;
+    const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     getVikeConfig_js_1.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
-    let code = await transpileWithEsbuild(filePath, isValueFile, userRootDir);
+    const importsAreTransformed = !isValueFile;
+    let code = await transpileWithEsbuild(filePath, userRootDir, importsAreTransformed, isValueFile);
     let fileImportsTransformed = null;
-    {
-        const res = transformImports(code, filePath, isValueFile);
+    if (importsAreTransformed) {
+        const res = transformImports_(code, filePath);
         if (res) {
             code = res.code;
             fileImportsTransformed = res.fileImportsTransformed;
         }
     }
+    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);
+            }
+        }
+    }
     return { code, fileImportsTransformed };
 }
-function transformImports(codeOriginal, filePath, isValueFile) {
-    // Do we need to remove the imports?
+function transformImports_(codeOriginal, filePath) {
     const { filePathAbsoluteFilesystem } = filePath;
     const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
-    (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
-    const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
-    const isPageConfigFile = !isValueFile;
-    if (!isHeader && !isPageConfigFile) {
-        return null;
-    }
-    (0, utils_js_1.assertWarning)(isPageConfigFile, `${filePathToShowToUser2} is a JavaScript header file (.h.js), but JavaScript header files should only be used for +config.h.js, see https://vike.dev/header-file`, { onlyOnce: true });
-    // Remove the imports
-    const res = (0, transformImportStatements_js_1.transformImportStatements)(codeOriginal, filePathToShowToUser2);
+    // Replace import statements with import strings
+    const res = (0, transformImports_js_1.transformImports)(codeOriginal, filePathToShowToUser2);
     if (res.noTransformation) {
         return null;
     }
     const { code, fileImportsTransformed } = res;
-    if (!isHeader) {
+    if (!isHeaderFile(filePathAbsoluteFilesystem)) {
         const filePathCorrect = appendHeaderFileExtension(filePathToShowToUser2);
         (0, utils_js_1.assertWarning)(false, `Rename ${filePathToShowToUser2} to ${filePathCorrect}, see https://vike.dev/header-file`, {
             onlyOnce: true
@@ -61,7 +75,8 @@ function transformImports(codeOriginal, filePath, isValueFile) {
     }
     return { code, fileImportsTransformed };
 }
-async function transpileWithEsbuild(filePath, bundle, userRootDir) {
+async function transpileWithEsbuild(filePath, userRootDir, importsAreTransformed, isValueFile) {
+    const isConfigFile = !isValueFile;
     const entryFilePath = filePath.filePathAbsoluteFilesystem;
     const entryFileDir = path_1.default.posix.dirname(entryFilePath);
     const options = {
@@ -77,22 +92,26 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
         'NEVER_EMITTED.js'),
         logLevel: 'silent',
         format: 'esm',
-        bundle,
+        absWorkingDir: userRootDir,
+        // Disable tree-shaking to avoid dead-code elimination, so that unused imports aren't removed.
+        // Esbuild still sometimes removes unused imports because of TypeScript: https://github.com/evanw/esbuild/issues/3034
+        treeShaking: false,
         minify: false,
-        metafile: bundle,
-        absWorkingDir: userRootDir
+        metafile: isConfigFile,
+        // We cannot bundle imports that are meant to be transformed
+        bundle: !importsAreTransformed
     };
-    if (bundle) {
-        options.bundle = true;
+    // Track dependencies
+    if (isConfigFile) {
         options.packages = 'external';
         options.plugins = [
             {
-                name: 'vike:import-hook',
+                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)
                         let { path } = args;
                         path = (0, utils_js_1.toPosixPath)(path);
-                        // We collect the dependency args.path in case it fails to build (upon build error => error is thrown => no metafile)
                         getVikeConfig_js_1.vikeConfigDependencies.add(path);
                         return undefined;
                     });
@@ -109,11 +128,6 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
             }
         ];
     }
-    else {
-        // Avoid dead-code elimination to ensure unused imports aren't removed.
-        // Esbuild still sometimes removes unused imports because of TypeScript: https://github.com/evanw/esbuild/issues/3034
-        options.treeShaking = false;
-    }
     let result;
     try {
         result = await (0, esbuild_1.build)(options);
@@ -122,7 +136,8 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
         await formatBuildErr(err, filePath);
         throw err;
     }
-    if (bundle) {
+    // Track dependencies
+    if (isConfigFile) {
         (0, utils_js_1.assert)(result.metafile);
         Object.keys(result.metafile.inputs).forEach((filePathRelative) => {
             filePathRelative = (0, utils_js_1.toPosixPath)(filePathRelative);
@@ -135,7 +150,7 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
     (0, utils_js_1.assert)(typeof code === 'string');
     return code;
 }
-async function executeFile(filePath, code, fileImportsTransformed, isValueFile) {
+async function executeTranspiledFile(filePath, code, fileImportsTransformed, isValueFile) {
     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
@@ -144,28 +159,35 @@ async function executeFile(filePath, code, fileImportsTransformed, isValueFile)
     const clean = () => fs_1.default.unlinkSync(filePathTmp);
     let fileExports = {};
     try {
-        fileExports = await (0, import_1.import_)(filePathTmp);
-    }
-    catch (err) {
-        triggerPrepareStackTrace(err);
-        const errIntroMsg = getErrIntroMsg('execute', filePath);
-        (0, utils_js_1.assert)((0, utils_js_1.isObject)(err));
-        execErrIntroMsg.set(err, errIntroMsg);
-        throw err;
+        fileExports = await executeFile(filePathTmp, filePath);
     }
     finally {
         clean();
     }
-    // Return a plain JavaScript object
-    //  - import() returns `[Module: null prototype] { default: { onRenderClient: '...' }}`
-    //  - We don't need this special object
-    fileExports = { ...fileExports };
     if (fileImportsTransformed && !isValueFile) {
         (0, utils_js_1.assert)(filePathRelativeToUserRootDir !== undefined);
         const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
         assertImportsAreReExported(fileImportsTransformed, fileExports, filePathToShowToUser2);
     }
-    return { fileExports };
+    return fileExports;
+}
+async function executeFile(filePathToExecuteAbsoluteFilesystem, filePathSourceFile) {
+    let fileExports = {};
+    try {
+        fileExports = await (0, import_1.import_)(filePathToExecuteAbsoluteFilesystem);
+    }
+    catch (err) {
+        triggerPrepareStackTrace(err);
+        const errIntroMsg = getErrIntroMsg('execute', filePathSourceFile);
+        (0, utils_js_1.assert)((0, utils_js_1.isObject)(err));
+        execErrIntroMsg.set(err, errIntroMsg);
+        throw err;
+    }
+    // Return a plain JavaScript object:
+    //  - import() returns `[Module: null prototype] { default: { onRenderClient: '...' }}`
+    //  - We don't need this special object.
+    fileExports = { ...fileExports };
+    return fileExports;
 }
 const formatted = '_formatted';
 function getConfigBuildErrorFormatted(err) {
@@ -197,10 +219,10 @@ function getConfigExecutionErrorIntroMsg(err) {
 }
 exports.getConfigExecutionErrorIntroMsg = getConfigExecutionErrorIntroMsg;
 const tmpPrefix = `[build-`;
-function getFilePathTmp(filePath) {
-    (0, utils_js_1.assertPosixPath)(filePath);
-    const dirname = path_1.default.posix.dirname(filePath);
-    const filename = path_1.default.posix.basename(filePath);
+function getFilePathTmp(filePathAbsoluteFilesystem) {
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
+    const dirname = path_1.default.posix.dirname(filePathAbsoluteFilesystem);
+    const filename = 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 tag = `${tmpPrefix}${(0, utils_js_1.getRandomId)(12)}]`;
     const filePathTmp = path_1.default.posix.join(dirname, `${tag}${filename}.mjs`);
@@ -218,7 +240,7 @@ function assertImportsAreReExported(fileImportsTransformed, fileExports, filePat
     Object.values(exportedStrings).forEach((exportVal) => {
         if (typeof exportVal !== 'string')
             return;
-        if (!(0, transformImportStatements_js_1.isImportData)(exportVal))
+        if (!(0, transformImports_js_1.isImportData)(exportVal))
             return;
         const importString = exportVal;
         fileImportsTransformed.forEach((fileImport) => {
@@ -256,6 +278,7 @@ function getExportedStrings(obj) {
     return exportedStrings;
 }
 function isHeaderFile(filePath) {
+    (0, utils_js_1.assertPosixPath)(filePath);
     const basenameParts = path_1.default.posix.basename(filePath).split('.');
     return basenameParts.includes('h');
 }

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.159-commit-71760c7';
+const PROJECT_VERSION = '0.4.159-commit-a6bc208';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -7,7 +7,7 @@ import path from 'path';
 import { configDefinitionsBuiltIn, configDefinitionsBuiltInGlobal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, isGlobalLocation, applyFilesystemRoutingRootEffect } from './getVikeConfig/filesystemRouting.js';
 import { isTmpFile, transpileAndExecuteFile } from './transpileAndExecuteFile.js';
-import { parseImportData } from './transformImportStatements.js';
+import { parseImportData } from './transformImports.js';
 import { isConfigInvalid, isConfigInvalid_set } from '../../../../runtime/renderPage/isConfigInvalid.js';
 import { getViteDevServer } from '../../../../runtime/globalContext.js';
 import { logConfigError, logConfigErrorRecover } from '../../../shared/loggerNotProd.js';
@@ -85,7 +85,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
     let interfaceFilesByLocationId = {};
     // Config files
     await Promise.all(configFiles.map(async (filePath) => {
-        const { configFile, extendsConfigs } = await loadConfigFile(filePath, userRootDir, []);
+        const { configFile, extendsConfigs } = await loadConfigFile(filePath, userRootDir, [], false);
         const interfaceFile = getInterfaceFileFromConfigFile(configFile, false);
         const locationId = getLocationId(filePath.filePathAbsoluteVite);
         interfaceFilesByLocationId[locationId] = interfaceFilesByLocationId[locationId] ?? [];
@@ -840,10 +840,10 @@ function getConfigName(filePath) {
         return configName;
     }
 }
-async function loadConfigFile(configFilePath, userRootDir, visited) {
+async function loadConfigFile(configFilePath, userRootDir, visited, isConfigOfExtension) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);
-    const { fileExports } = await transpileAndExecuteFile(configFilePath, false, userRootDir);
+    const { fileExports } = await transpileAndExecuteFile(configFilePath, false, userRootDir, isConfigOfExtension);
     const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [
         ...visited,
         filePathAbsoluteFilesystem
@@ -870,7 +870,7 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
         const { importPath: importPath } = importData;
         const filePathAbsoluteFilesystem = resolveImportPath(importData, configFilePath);
         assertImportPath(filePathAbsoluteFilesystem, importData, configFilePath);
-        assertExtendsImportPath(importPath, filePathAbsoluteFilesystem, configFilePath);
+        warnUserLandExtension(importPath, configFilePath);
         // - filePathRelativeToUserRootDir has no functionality beyond nicer error messages for user
         // - Using importPath would be visually nicer but it's ambigous => we rather pick filePathAbsoluteFilesystem for added clarity
         const filePathRelativeToUserRootDir = determineFilePathRelativeToUserDir(filePathAbsoluteFilesystem, userRootDir);
@@ -885,7 +885,7 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
     });
     const extendsConfigs = [];
     await Promise.all(extendsConfigFiles.map(async (configFilePath) => {
-        const result = await loadConfigFile(configFilePath, userRootDir, visited);
+        const result = await loadConfigFile(configFilePath, userRootDir, visited, true);
         extendsConfigs.push(result.configFile);
         extendsConfigs.push(...result.extendsConfigs);
     }));
@@ -903,20 +903,8 @@ function determineFilePathRelativeToUserDir(filePathAbsoluteFilesystem, userRoot
         filePathRelativeToUserRootDir = '/' + filePathRelativeToUserRootDir;
     return filePathRelativeToUserRootDir;
 }
-function assertExtendsImportPath(importPath, filePath, configFilePath) {
-    if (isNpmPackageImport(importPath)) {
-        const fileDir = path.posix.dirname(filePath) + '/';
-        const fileName = path.posix.basename(filePath);
-        const fileNameBaseCorrect = '+config';
-        const [fileNameBase, ...fileNameRest] = fileName.split('.');
-        const fileNameCorrect = [fileNameBaseCorrect, ...fileNameRest].join('.');
-        assertWarning(fileNameBase === fileNameBaseCorrect, `Rename ${fileName} to ${fileNameCorrect} in ${fileDir}`, {
-            onlyOnce: true
-        });
-    }
-    else {
-        assertWarning(false, `${configFilePath.filePathToShowToUser} uses ${pc.cyan('extends')} to inherit from ${pc.cyan(importPath)} which is a user-land file: this is experimental and may be remove at any time. Reach out to a maintainer if you need this feature.`, { onlyOnce: true });
-    }
+function warnUserLandExtension(importPath, configFilePath) {
+    assertWarning(isNpmPackageImport(importPath), `${configFilePath.filePathToShowToUser} uses ${pc.cyan('extends')} to inherit from ${pc.cyan(importPath)} which is a user-land file: this is experimental and may be remove at any time. Reach out to a maintainer if you need this.`, { onlyOnce: true });
 }
 function getExtendsImportData(configFileExports, configFilePath) {
     const { filePathToShowToUser } = configFilePath;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/{transformImportStatements.d.ts → transformImports.d.ts}

@@ -1,15 +1,14 @@
-export { transformImportStatements };
+export { transformImports };
 export { parseImportData };
 export { isImportData };
 export type { FileImport };
 export type { ImportData };
-export { isVikeRealImport };
 type FileImport = {
     importStatementCode: string;
     importString: string;
     importLocalName: string;
 };
-declare function transformImportStatements(code: string, filePathToShowToUser2: string): {
+declare function transformImports(code: string, filePathToShowToUser2: string, skipWarnings?: true): {
     noTransformation: true;
 } | {
     noTransformation: false;
@@ -42,4 +41,3 @@ declare module 'estree' {
         end: number;
     }
 }
-declare function isVikeRealImport(code: string, posStart: number): boolean;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/{transformImportStatements.js → transformImports.js}

@@ -1,15 +1,15 @@
-export { transformImportStatements };
+export { transformImports };
 export { parseImportData };
 export { isImportData };
-// For ./transformImportStatements.spec.ts
-export { isVikeRealImport };
 // 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
 import { parse } from 'acorn';
 import { assert, assertUsage, assertWarning, styleFileRE } from '../../../utils.js';
 import pc from '@brillout/picocolors';
-function transformImportStatements(code, filePathToShowToUser2) {
+function transformImports(code, filePathToShowToUser2, 
+// For ./transformImports.spec.ts
+skipWarnings) {
     const spliceOperations = [];
     const fileImportsTransformed = [];
     // Performance trick
@@ -23,9 +23,29 @@ function transformImportStatements(code, filePathToShowToUser2) {
             return;
         const importPath = node.source.value;
         assert(typeof importPath === 'string');
-        const { start, end } = node;
-        if (isVikeRealImport(code, end))
+        // - 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?
+        // - ?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
+        //     - But it's probably ok to tell users "to use real imports you need Node.js 21 or above".
+        //   - 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()?
+        // - 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)
+        if (importPath.endsWith('?real')) {
+            const { start, end } = node.source;
+            spliceOperations.push({
+                start,
+                end,
+                replacement: importPath.slice(0, -1 * '?real'.length)
+            });
             return;
+        }
+        const { start, end } = node;
         const importStatementCode = code.slice(start, end);
         // No variable imported
         if (node.specifiers.length === 0) {
@@ -41,10 +61,12 @@ function transformImportStatements(code, filePathToShowToUser2) {
                 `As explained in https://vike.dev/header-file the following import in ${filePathToShowToUser2} has no effect:`,
                 quote
             ].join('\n');
-            if (!isWarning) {
-                assertUsage(false, errMsg);
+            if (!skipWarnings) {
+                if (!isWarning) {
+                    assertUsage(false, errMsg);
+                }
+                assertWarning(false, errMsg, { onlyOnce: true });
             }
-            assertWarning(false, errMsg, { onlyOnce: true });
         }
         let replacement = '';
         node.specifiers.forEach((specifier) => {
@@ -146,7 +168,7 @@ function spliceMany(str, operations) {
                     .join('');
         endPrev = end;
     });
-    strMod += str.slice(endPrev, str.length - 1);
+    strMod += str.slice(endPrev, str.length);
     return strMod;
 }
 function indent(str) {
@@ -155,10 +177,3 @@ function indent(str) {
         .map((s) => `  ${s}`)
         .join('\n');
 }
-function isVikeRealImport(code, posStart) {
-    let posEnd = code.indexOf('\n', posStart);
-    if (posEnd === -1)
-        posEnd = code.length;
-    const lineEnd = code.slice(posStart, posEnd);
-    return lineEnd.includes('@vike-real-import');
-}

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/transpileAndExecuteFile.d.ts

@@ -4,7 +4,7 @@ export { getConfigExecutionErrorIntroMsg as getConfigExecutionErrorIntroMsg };
 export { isTmpFile };
 import 'source-map-support/register.js';
 import type { FilePathResolved } from '../../../../../shared/page-configs/PageConfig.js';
-declare function transpileAndExecuteFile(filePath: FilePathResolved, isValueFile: boolean, userRootDir: string): Promise<{
+declare function transpileAndExecuteFile(filePath: FilePathResolved, isValueFile: boolean, userRootDir: string, isConfigOfExtension?: boolean): Promise<{
     fileExports: Record<string, unknown>;
 }>;
 declare function getConfigBuildErrorFormatted(err: unknown): null | string;

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

@@ -8,49 +8,63 @@ import path from 'path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
 import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, unique, assertWarning, isObject, toPosixPath } from '../../../utils.js';
-import { isImportData, transformImportStatements } from './transformImportStatements.js';
+import { isImportData, transformImports } from './transformImports.js';
 import { vikeConfigDependencies } from './getVikeConfig.js';
 import 'source-map-support/register.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 assertIsNotProductionRuntime();
-async function transpileAndExecuteFile(filePath, isValueFile, userRootDir) {
-    const { code, fileImportsTransformed } = await transpileFile(filePath, isValueFile, userRootDir);
-    const { fileExports } = await executeFile(filePath, code, fileImportsTransformed, isValueFile);
-    return { fileExports };
+async function transpileAndExecuteFile(filePath, isValueFile, userRootDir, isConfigOfExtension = false) {
+    if (isConfigOfExtension) {
+        const fileExports = await executeFile(filePath.filePathAbsoluteFilesystem, filePath);
+        if (isHeaderFile(filePath.filePathAbsoluteFilesystem)) {
+            const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
+            assertWarning(false, `${filePathToShowToUser2} is a JavaScript header file (.h.js), but JavaScript header files don't apply to the config files of extensions`, { onlyOnce: true });
+        }
+        return { fileExports };
+    }
+    else {
+        const { code, fileImportsTransformed } = await transpileFile(filePath, isValueFile, userRootDir);
+        const fileExports = await executeTranspiledFile(filePath, code, fileImportsTransformed, isValueFile);
+        return { fileExports };
+    }
 }
 async function transpileFile(filePath, isValueFile, userRootDir) {
     const { filePathAbsoluteFilesystem } = filePath;
+    const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
     assertPosixPath(filePathAbsoluteFilesystem);
     vikeConfigDependencies.add(filePathAbsoluteFilesystem);
-    let code = await transpileWithEsbuild(filePath, isValueFile, userRootDir);
+    const importsAreTransformed = !isValueFile;
+    let code = await transpileWithEsbuild(filePath, userRootDir, importsAreTransformed, isValueFile);
     let fileImportsTransformed = null;
-    {
-        const res = transformImports(code, filePath, isValueFile);
+    if (importsAreTransformed) {
+        const res = transformImports_(code, filePath);
         if (res) {
             code = res.code;
             fileImportsTransformed = res.fileImportsTransformed;
         }
     }
+    else {
+        if (isHeaderFile(filePathAbsoluteFilesystem)) {
+            if (isValueFile) {
+                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 {
+                assert(false);
+            }
+        }
+    }
     return { code, fileImportsTransformed };
 }
-function transformImports(codeOriginal, filePath, isValueFile) {
-    // Do we need to remove the imports?
+function transformImports_(codeOriginal, filePath) {
     const { filePathAbsoluteFilesystem } = filePath;
     const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
-    assertPosixPath(filePathAbsoluteFilesystem);
-    const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
-    const isPageConfigFile = !isValueFile;
-    if (!isHeader && !isPageConfigFile) {
-        return null;
-    }
-    assertWarning(isPageConfigFile, `${filePathToShowToUser2} is a JavaScript header file (.h.js), but JavaScript header files should only be used for +config.h.js, see https://vike.dev/header-file`, { onlyOnce: true });
-    // Remove the imports
-    const res = transformImportStatements(codeOriginal, filePathToShowToUser2);
+    // Replace import statements with import strings
+    const res = transformImports(codeOriginal, filePathToShowToUser2);
     if (res.noTransformation) {
         return null;
     }
     const { code, fileImportsTransformed } = res;
-    if (!isHeader) {
+    if (!isHeaderFile(filePathAbsoluteFilesystem)) {
         const filePathCorrect = appendHeaderFileExtension(filePathToShowToUser2);
         assertWarning(false, `Rename ${filePathToShowToUser2} to ${filePathCorrect}, see https://vike.dev/header-file`, {
             onlyOnce: true
@@ -58,7 +72,8 @@ function transformImports(codeOriginal, filePath, isValueFile) {
     }
     return { code, fileImportsTransformed };
 }
-async function transpileWithEsbuild(filePath, bundle, userRootDir) {
+async function transpileWithEsbuild(filePath, userRootDir, importsAreTransformed, isValueFile) {
+    const isConfigFile = !isValueFile;
     const entryFilePath = filePath.filePathAbsoluteFilesystem;
     const entryFileDir = path.posix.dirname(entryFilePath);
     const options = {
@@ -74,22 +89,26 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
         'NEVER_EMITTED.js'),
         logLevel: 'silent',
         format: 'esm',
-        bundle,
+        absWorkingDir: userRootDir,
+        // Disable tree-shaking to avoid dead-code elimination, so that unused imports aren't removed.
+        // Esbuild still sometimes removes unused imports because of TypeScript: https://github.com/evanw/esbuild/issues/3034
+        treeShaking: false,
         minify: false,
-        metafile: bundle,
-        absWorkingDir: userRootDir
+        metafile: isConfigFile,
+        // We cannot bundle imports that are meant to be transformed
+        bundle: !importsAreTransformed
     };
-    if (bundle) {
-        options.bundle = true;
+    // Track dependencies
+    if (isConfigFile) {
         options.packages = 'external';
         options.plugins = [
             {
-                name: 'vike:import-hook',
+                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)
                         let { path } = args;
                         path = toPosixPath(path);
-                        // We collect the dependency args.path in case it fails to build (upon build error => error is thrown => no metafile)
                         vikeConfigDependencies.add(path);
                         return undefined;
                     });
@@ -106,11 +125,6 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
             }
         ];
     }
-    else {
-        // Avoid dead-code elimination to ensure unused imports aren't removed.
-        // Esbuild still sometimes removes unused imports because of TypeScript: https://github.com/evanw/esbuild/issues/3034
-        options.treeShaking = false;
-    }
     let result;
     try {
         result = await build(options);
@@ -119,7 +133,8 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
         await formatBuildErr(err, filePath);
         throw err;
     }
-    if (bundle) {
+    // Track dependencies
+    if (isConfigFile) {
         assert(result.metafile);
         Object.keys(result.metafile.inputs).forEach((filePathRelative) => {
             filePathRelative = toPosixPath(filePathRelative);
@@ -132,7 +147,7 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
     assert(typeof code === 'string');
     return code;
 }
-async function executeFile(filePath, code, fileImportsTransformed, isValueFile) {
+async function executeTranspiledFile(filePath, code, fileImportsTransformed, isValueFile) {
     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
@@ -141,28 +156,35 @@ async function executeFile(filePath, code, fileImportsTransformed, isValueFile)
     const clean = () => fs.unlinkSync(filePathTmp);
     let fileExports = {};
     try {
-        fileExports = await import_(filePathTmp);
-    }
-    catch (err) {
-        triggerPrepareStackTrace(err);
-        const errIntroMsg = getErrIntroMsg('execute', filePath);
-        assert(isObject(err));
-        execErrIntroMsg.set(err, errIntroMsg);
-        throw err;
+        fileExports = await executeFile(filePathTmp, filePath);
     }
     finally {
         clean();
     }
-    // Return a plain JavaScript object
-    //  - import() returns `[Module: null prototype] { default: { onRenderClient: '...' }}`
-    //  - We don't need this special object
-    fileExports = { ...fileExports };
     if (fileImportsTransformed && !isValueFile) {
         assert(filePathRelativeToUserRootDir !== undefined);
         const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
         assertImportsAreReExported(fileImportsTransformed, fileExports, filePathToShowToUser2);
     }
-    return { fileExports };
+    return fileExports;
+}
+async function executeFile(filePathToExecuteAbsoluteFilesystem, filePathSourceFile) {
+    let fileExports = {};
+    try {
+        fileExports = await import_(filePathToExecuteAbsoluteFilesystem);
+    }
+    catch (err) {
+        triggerPrepareStackTrace(err);
+        const errIntroMsg = getErrIntroMsg('execute', filePathSourceFile);
+        assert(isObject(err));
+        execErrIntroMsg.set(err, errIntroMsg);
+        throw err;
+    }
+    // Return a plain JavaScript object:
+    //  - import() returns `[Module: null prototype] { default: { onRenderClient: '...' }}`
+    //  - We don't need this special object.
+    fileExports = { ...fileExports };
+    return fileExports;
 }
 const formatted = '_formatted';
 function getConfigBuildErrorFormatted(err) {
@@ -192,10 +214,10 @@ function getConfigExecutionErrorIntroMsg(err) {
     return errIntroMsg ?? null;
 }
 const tmpPrefix = `[build-`;
-function getFilePathTmp(filePath) {
-    assertPosixPath(filePath);
-    const dirname = path.posix.dirname(filePath);
-    const filename = path.posix.basename(filePath);
+function getFilePathTmp(filePathAbsoluteFilesystem) {
+    assertPosixPath(filePathAbsoluteFilesystem);
+    const dirname = path.posix.dirname(filePathAbsoluteFilesystem);
+    const filename = path.posix.basename(filePathAbsoluteFilesystem);
     // Syntax with semicolon `[build:${/*...*/}]` doesn't work on Windows: https://github.com/vikejs/vike/issues/800#issuecomment-1517329455
     const tag = `${tmpPrefix}${getRandomId(12)}]`;
     const filePathTmp = path.posix.join(dirname, `${tag}${filename}.mjs`);
@@ -250,6 +272,7 @@ function getExportedStrings(obj) {
     return exportedStrings;
 }
 function isHeaderFile(filePath) {
+    assertPosixPath(filePath);
     const basenameParts = path.posix.basename(filePath).split('.');
     return basenameParts.includes('h');
 }

package/dist/esm/utils/projectInfo.d.ts

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.159-commit-71760c7";
+declare const PROJECT_VERSION: "0.4.159-commit-a6bc208";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.159-commit-71760c7";
+    projectVersion: "0.4.159-commit-a6bc208";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.159-commit-71760c7';
+const PROJECT_VERSION = '0.4.159-commit-a6bc208';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.159-commit-71760c7",
+  "version": "0.4.159-commit-a6bc208",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",