vike 0.4.159-commit-0424983 → 0.4.159-commit-a6bc208

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

@@ -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);
@@ -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;

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

@@ -26,13 +26,13 @@ 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.
+        // - 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 seems to work well with the latest TypeScript versions: TypeScript doesn't complain upon `with { type: 'unknown-to-typescript' }` and go-to-definition & types are preserved.
+        //   - 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()?

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

@@ -16,17 +16,27 @@ 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) {
-    const { code, fileImportsTransformed } = await transpileFile(filePath, isValueFile, userRootDir, isConfigOfExtension);
-    const { fileExports } = await executeFile(filePath, code, fileImportsTransformed, isValueFile);
-    return { fileExports };
+    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, isConfigOfExtension) {
+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);
-    const importsAreTransformed = !isConfigOfExtension && !isValueFile;
+    const importsAreTransformed = !isValueFile;
     let code = await transpileWithEsbuild(filePath, userRootDir, importsAreTransformed, isValueFile);
     let fileImportsTransformed = null;
     if (importsAreTransformed) {
@@ -41,9 +51,6 @@ async function transpileFile(filePath, isValueFile, userRootDir, isConfigOfExten
             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 if (isConfigOfExtension) {
-                (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 });
-            }
             else {
                 (0, utils_js_1.assert)(false);
             }
@@ -143,7 +150,7 @@ async function transpileWithEsbuild(filePath, userRootDir, importsAreTransformed
     (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
@@ -152,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) {
@@ -205,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`);

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-0424983';
+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

@@ -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);
@@ -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/transformImports.js

@@ -23,13 +23,13 @@ skipWarnings) {
             return;
         const importPath = node.source.value;
         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.
+        // - 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 seems to work well with the latest TypeScript versions: TypeScript doesn't complain upon `with { type: 'unknown-to-typescript' }` and go-to-definition & types are preserved.
+        //   - 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()?

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

@@ -14,16 +14,26 @@ import 'source-map-support/register.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 assertIsNotProductionRuntime();
 async function transpileAndExecuteFile(filePath, isValueFile, userRootDir, isConfigOfExtension = false) {
-    const { code, fileImportsTransformed } = await transpileFile(filePath, isValueFile, userRootDir, isConfigOfExtension);
-    const { fileExports } = await executeFile(filePath, code, fileImportsTransformed, isValueFile);
-    return { fileExports };
+    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, isConfigOfExtension) {
+async function transpileFile(filePath, isValueFile, userRootDir) {
     const { filePathAbsoluteFilesystem } = filePath;
     const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
     assertPosixPath(filePathAbsoluteFilesystem);
     vikeConfigDependencies.add(filePathAbsoluteFilesystem);
-    const importsAreTransformed = !isConfigOfExtension && !isValueFile;
+    const importsAreTransformed = !isValueFile;
     let code = await transpileWithEsbuild(filePath, userRootDir, importsAreTransformed, isValueFile);
     let fileImportsTransformed = null;
     if (importsAreTransformed) {
@@ -38,9 +48,6 @@ async function transpileFile(filePath, isValueFile, userRootDir, isConfigOfExten
             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 if (isConfigOfExtension) {
-                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 });
-            }
             else {
                 assert(false);
             }
@@ -140,7 +147,7 @@ async function transpileWithEsbuild(filePath, userRootDir, importsAreTransformed
     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
@@ -149,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) {
@@ -200,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`);

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.159-commit-0424983";
+declare const PROJECT_VERSION: "0.4.159-commit-a6bc208";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.159-commit-0424983";
+    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-0424983';
+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-0424983",
+  "version": "0.4.159-commit-a6bc208",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",