vike 0.4.160-commit-d574f51 → 0.4.161-commit-ba539a4

package/dist/cjs/node/plugin/plugins/buildConfig.js

@@ -12,11 +12,12 @@ const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const module_1 = require("module");
-const getClientEntryFilePath_js_1 = require("../../shared/getClientEntryFilePath.js");
+const getClientEntry_js_1 = require("../../shared/getClientEntry.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
 const index_js_1 = require("./importBuild/index.js");
+const prependEntriesDir_js_1 = require("../../shared/prependEntriesDir.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
@@ -41,7 +42,7 @@ function buildConfig() {
                 addLogHook();
                 outDirs = (0, utils_js_1.getOutDirs)(config);
                 {
-                    isServerAssetsFixEnabled = (await (0, getVikeConfig_js_1.isV1Design)(config, false)) && (0, fixServerAssets_js_1.fixServerAssets_isEnabled)();
+                    isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
                     if (isServerAssetsFixEnabled) {
                         // https://github.com/vikejs/vike/issues/1339
                         config.build.ssrEmitAssets = true;
@@ -136,7 +137,7 @@ function analyzeClientEntries(pageConfigs, config) {
     let hasClientRouting = false;
     let hasServerRouting = false;
     let clientEntries = {};
-    let clientFilePaths = [];
+    let clientEntryList = [];
     pageConfigs.forEach((pageConfig) => {
         const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean');
         if (configValue?.value) {
@@ -151,15 +152,15 @@ function analyzeClientEntries(pageConfigs, config) {
             clientEntries[entryName] = entryTarget;
         }
         {
-            const clientFilePath = (0, getClientEntryFilePath_js_1.getClientEntryFilePath)(pageConfig);
-            if (clientFilePath) {
-                clientFilePaths.push(clientFilePath);
+            const clientEntry = (0, getClientEntry_js_1.getClientEntry)(pageConfig);
+            if (clientEntry) {
+                clientEntryList.push(clientEntry);
             }
         }
     });
-    clientFilePaths = (0, utils_js_1.unique)(clientFilePaths);
-    clientFilePaths.forEach((pageFile) => {
-        const { entryName, entryTarget } = getEntryFromFilePath(pageFile, config);
+    clientEntryList = (0, utils_js_1.unique)(clientEntryList);
+    clientEntryList.forEach((clientEntry) => {
+        const { entryName, entryTarget } = getEntryFromClientEntry(clientEntry, config);
         clientEntries[entryName] = entryTarget;
     });
     return { hasClientRouting, hasServerRouting, clientEntries };
@@ -182,12 +183,18 @@ async function getPageFileEntries(config, includeAssetsImportedByServer) {
             (0, utils_js_1.assert)(includeAssetsImportedByServer);
             addExtractAssetsQuery = true;
         }
-        const { entryName, entryTarget } = getEntryFromFilePath(pageFile, config, addExtractAssetsQuery);
+        const { entryName, entryTarget } = getEntryFromClientEntry(pageFile, config, addExtractAssetsQuery);
         pageFileEntries[entryName] = entryTarget;
     });
     return pageFileEntries;
 }
-function getEntryFromFilePath(filePath, config, addExtractAssetsQuery) {
+function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
+    if ((0, utils_js_1.isNpmPackageImport)(clientEntry)) {
+        const entryTarget = clientEntry;
+        const entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(clientEntry);
+        return { entryName, entryTarget };
+    }
+    const filePath = clientEntry;
     (0, utils_js_1.assertPosixPath)(filePath);
     (0, utils_js_1.assert)(filePath.startsWith('/'));
     let entryTarget = (0, utils_js_1.getFilePathAbsolute)(filePath, config);
@@ -197,24 +204,16 @@ function getEntryFromFilePath(filePath, config, addExtractAssetsQuery) {
     if (addExtractAssetsQuery)
         entryName = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(entryName);
     entryName = (0, utils_js_1.removeFileExtention)(entryName);
-    entryName = prependEntriesDir(entryName);
+    entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(entryName);
     return { entryName, entryTarget };
 }
 function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
     const entryTarget = (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, isForClientSide);
     let entryName = pageId;
-    entryName = prependEntriesDir(entryName);
+    entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(entryName);
     return { entryName, entryTarget };
 }
-function prependEntriesDir(entryName) {
-    if (entryName.startsWith('/')) {
-        entryName = entryName.slice(1);
-    }
-    (0, utils_js_1.assert)(!entryName.startsWith('/'));
-    entryName = `entries/${entryName}`;
-    return entryName;
-}
 function resolve(filePath) {
     (0, utils_js_1.assert)(filePath.startsWith('dist/'));
     // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/

package/dist/cjs/node/plugin/plugins/commonConfig.js

@@ -31,7 +31,7 @@ function commonConfig() {
                     overrideViteDefaultPort(config);
                     /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
                     overrideViteDefaultSsrExternal(config)
-                    */
+                    //*/
                     workaroundCI(config);
                     (0, buildConfig_js_1.assertRollupInput)(config);
                     (0, assertResolveAlias_js_1.assertResolveAlias)(config);
@@ -52,21 +52,13 @@ function overrideViteDefaultPort(config) {
     (_b = config.preview).port ?? (_b.port = 3000);
 }
 /*
+import { version } from 'vite'
 function overrideViteDefaultSsrExternal(config: ResolvedConfig) {
-  if (!isViteVersionWithSsrExternalTrue()) return
+  if (!isVersionOrAbove(version, '5.0.12')) return
   // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
   config.ssr.external ??= true
 }
-import { version } from 'vite'
-function isViteVersionWithSsrExternalTrue(): boolean {
-  const versionParts = version.split('.').map((s) => parseInt(s, 10)) as [number, number, number]
-  assert(versionParts.length === 3)
-  if (versionParts[0] > 5) return true
-  if (versionParts[1] > 0) return true
-  if (versionParts[2] >= 12) return true
-  return false
-}
-*/
+//*/
 // Workaround GitHub Action failing to access the server
 function workaroundCI(config) {
     var _a, _b;

package/dist/cjs/node/plugin/plugins/distFileNames.js

@@ -33,7 +33,7 @@ function distFileNames() {
                     //    - It's needed for getHash() of fixServerAssets()
                     //    - Asset URLs should always contain a hash: it's paramount for caching assets.
                     //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
-                    (0, utils_js_1.assertUsage)(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (Contact a maintainer if you need this as it's possible to support this.)");
+                    (0, utils_js_1.assertUsage)(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (It's possible to support, thus contact a maintainer if you need this.)");
                 }
             });
         }

package/dist/cjs/node/plugin/plugins/extractAssetsPlugin.js

@@ -9,12 +9,12 @@ exports.extractAssetsRE = exports.extractAssetsPlugin = void 0;
 const utils_js_1 = require("../utils.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const removeSourceMap_js_1 = require("../shared/removeSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -136,7 +136,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await (0, getConfigVike_js_1.getConfigVike)(config_);
                 config = config_;
-                isServerAssetsFixEnabled = (await (0, getVikeConfig_js_1.isV1Design)(config, false)) && (0, fixServerAssets_js_1.fixServerAssets_isEnabled)();
+                isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
             },
             load(id) {
                 if (!(0, utils_js_1.isVirtualFileId)(id))

package/dist/cjs/node/plugin/utils.js

@@ -42,3 +42,4 @@ __exportStar(require("../../utils/assertKeys.js"), exports);
 __exportStar(require("../../utils/injectRollupInputs.js"), exports);
 __exportStar(require("../../utils/humanizeTime.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
+__exportStar(require("../../utils/isVersionOrAbove.js"), exports);

package/dist/cjs/node/runtime/renderPage/analyzePage.js

@@ -6,11 +6,11 @@ const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyze
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const globalContext_js_1 = require("../globalContext.js");
-const getClientEntryFilePath_js_1 = require("../../shared/getClientEntryFilePath.js");
+const getClientEntry_js_1 = require("../../shared/getClientEntry.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = (0, getClientEntryFilePath_js_1.getClientEntryFilePath)(pageConfig);
+        const clientFilePath = (0, getClientEntry_js_1.getClientEntry)(pageConfig);
         const clientEntry = !isClientSideRenderable ? clientFilePath : (0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting);
         const clientDependencies = [];
         clientDependencies.push({

package/dist/cjs/node/runtime/renderPage/getPageAssets/assertClientEntryId.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertClientEntryId = void 0;
-const globalContext_js_1 = require("../../globalContext.js");
 const utils_js_1 = require("../../utils.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 function assertClientEntryId(id) {
@@ -17,9 +16,5 @@ function assertClientEntryId(id) {
         (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id) ||
         // Stem packages
         isPkg, id);
-    if (isPkg) {
-        const { configVike } = (0, globalContext_js_1.getGlobalContext)();
-        (0, utils_js_1.assert)(configVike === null || configVike.extensions.some(({ npmPackageName }) => id.startsWith(npmPackageName)), id);
-    }
 }
 exports.assertClientEntryId = assertClientEntryId;

package/dist/cjs/node/runtime/renderPage/getPageAssets/getManifestEntry.js

@@ -4,7 +4,10 @@ exports.getManifestEntry = void 0;
 const utils_js_1 = require("../../utils.js");
 const assertClientEntryId_js_1 = require("./assertClientEntryId.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-function getManifestEntry(id, clientManifest, manifestKeyMap) {
+const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
+function getManifestEntry(id, clientManifest, 
+// TODO: remove
+manifestKeyMap) {
     (0, assertClientEntryId_js_1.assertClientEntryId)(id);
     const debugInfo = getDebugInfo(id, clientManifest);
     // Vike client entry
@@ -42,13 +45,11 @@ function getManifestEntry(id, clientManifest, manifestKeyMap) {
         (0, utils_js_1.assert)(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
-    // extensions[number].pageConfigsDistFiles
+    // npm package import
     if ((0, utils_js_1.isNpmPackageImport)(id)) {
-        const manifestKey = manifestKeyMap[id];
-        const debugInfo2 = { ...debugInfo, manifestKey };
-        (0, utils_js_1.assert)(manifestKey, debugInfo2);
-        const manifestEntry = clientManifest[manifestKey];
-        (0, utils_js_1.assert)(manifestEntry, debugInfo2);
+        const found = Object.entries(clientManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
+        (0, utils_js_1.assert)(found);
+        const [manifestKey, manifestEntry] = found;
         return { manifestEntry, manifestKey };
     }
     // extensions[number].pageConfigsSrcDir

package/dist/cjs/node/runtime/renderPage/getPageAssets.js

@@ -80,7 +80,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         // User files
         filePath = (0, utils_js_1.pathJoin)(root, clientEntry);
     }
-    else if (clientEntry.startsWith('@@vike/')) {
+    else if (clientEntry.startsWith('@@vike/') || (0, utils_js_1.isNpmPackageImport)(clientEntry)) {
         // Vike client entry
         const { createRequire } = (await (0, import_1.import_)('module')).default;
         const { dirname } = (await (0, import_1.import_)('path')).default;
@@ -92,27 +92,23 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         // @ts-expect-error
         // Bun workaround https://github.com/vikejs/vike/pull/1048
         const res = typeof Bun !== 'undefined' ? (toPath) => Bun.resolveSync(toPath, __dirname_) : require_.resolve;
-        (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
-        try {
-            // For Vitest (which doesn't resolve vike to its dist but to its source files)
-            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/runtime/renderPage/getPageAssets.js
-            filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
+        if ((0, utils_js_1.isNpmPackageImport)(clientEntry)) {
+            filePath = res(clientEntry);
         }
-        catch {
-            // For users
-            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/runtime/renderPage/getPageAssets.js
-            filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+        else {
+            (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
+            try {
+                // For Vitest (which doesn't resolve vike to its dist but to its source files)
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/runtime/renderPage/getPageAssets.js
+                filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
+            }
+            catch {
+                // For users
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/runtime/renderPage/getPageAssets.js
+                filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+            }
         }
     }
-    else if ((0, utils_js_1.isNpmPackageImport)(clientEntry)) {
-        const extensionPageFile = configVike.extensions
-            .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-            .flat()
-            .filter(utils_js_1.isNotNullish)
-            .find((e) => e.importPath === clientEntry);
-        (0, utils_js_1.assert)(extensionPageFile, clientEntry);
-        filePath = extensionPageFile.filePath;
-    }
     else {
         (0, utils_js_1.assert)(false);
     }

package/dist/cjs/node/shared/{getClientEntryFilePath.js → getClientEntry.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClientEntryFilePath = void 0;
+exports.getClientEntry = void 0;
 const helpers_js_1 = require("../../shared/page-configs/helpers.js");
-function getClientEntryFilePath(pageConfig) {
+function getClientEntry(pageConfig) {
     const configName = 'client';
     const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, configName, 'string');
     if (!configValue)
         return null;
     return configValue.value;
 }
-exports.getClientEntryFilePath = getClientEntryFilePath;
+exports.getClientEntry = getClientEntry;

package/dist/cjs/node/shared/prependEntriesDir.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prependEntriesDir = void 0;
+const utils_js_1 = require("./utils.js");
+function prependEntriesDir(entryName) {
+    if (entryName.startsWith('/')) {
+        entryName = entryName.slice(1);
+    }
+    (0, utils_js_1.assert)(!entryName.startsWith('/'));
+    entryName = `entries/${entryName}`;
+    return entryName;
+}
+exports.prependEntriesDir = prependEntriesDir;

package/dist/cjs/utils/assertNodeVersion.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertNodeVersion = void 0;
 const assert_js_1 = require("./assert.js");
 const isNodeJS_js_1 = require("./isNodeJS.js");
+const isVersionOrAbove_js_1 = require("./isVersionOrAbove.js");
 // package.json#engines.node isn't enough as users can ignore it
 function assertNodeVersion() {
     if (!(0, isNodeJS_js_1.isNodeJS)())
         return;
     const version = process.versions.node;
-    const major = parseInt(version.split('.')[0], 10);
-    (0, assert_js_1.assertUsage)(major >= 16, `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
+    (0, assert_js_1.assertUsage)((0, isVersionOrAbove_js_1.isVersionOrAbove)(version, '16.0.0'), `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
 }
 exports.assertNodeVersion = assertNodeVersion;

package/dist/cjs/utils/isVersionOrAbove.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVersionOrAbove = void 0;
+const assert_js_1 = require("./assert.js");
+function isVersionOrAbove(versionActual, versionExpected) {
+    const p1 = parseVersion(versionActual);
+    const p2 = parseVersion(versionExpected);
+    // major
+    if (p1[0] !== p2[0])
+        return p1[0] > p2[0];
+    // minor
+    if (p1[1] !== p2[1])
+        return p1[1] > p2[1];
+    // patch
+    if (p1[2] !== p2[2])
+        return p1[2] > p2[2];
+    // Same version
+    return true;
+}
+exports.isVersionOrAbove = isVersionOrAbove;
+function parseVersion(version) {
+    // Remove pre-release tag
+    version = version.split('-')[0];
+    // major.minor.patch
+    const partsStr = version.split('.');
+    (0, assert_js_1.assert)(partsStr.length === 3);
+    const parts = partsStr.map((s) => parseInt(s, 10));
+    return parts;
+}

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.160-commit-d574f51';
+const PROJECT_VERSION = '0.4.161-commit-ba539a4';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/node/plugin/plugins/buildConfig.js

@@ -2,7 +2,7 @@ export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, resolveOutDir, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, assertNodeEnvIsNotDev, getOutDirs } from '../utils.js';
+import { assert, resolveOutDir, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, assertNodeEnvIsNotDev, getOutDirs, isNpmPackageImport } from '../utils.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValue } from '../../../shared/page-configs/helpers.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
@@ -10,11 +10,12 @@ import { getConfigVike } from '../../shared/getConfigVike.js';
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { createRequire } from 'module';
-import { getClientEntryFilePath } from '../../shared/getClientEntryFilePath.js';
+import { getClientEntry } from '../../shared/getClientEntry.js';
 import fs from 'fs/promises';
 import path from 'path';
 import { fixServerAssets, fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 import { set_constant_ASSETS_MAP } from './importBuild/index.js';
+import { prependEntriesDir } from '../../shared/prependEntriesDir.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
@@ -38,7 +39,7 @@ function buildConfig() {
                 addLogHook();
                 outDirs = getOutDirs(config);
                 {
-                    isServerAssetsFixEnabled = (await isV1Design(config, false)) && fixServerAssets_isEnabled();
+                    isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config, false));
                     if (isServerAssetsFixEnabled) {
                         // https://github.com/vikejs/vike/issues/1339
                         config.build.ssrEmitAssets = true;
@@ -132,7 +133,7 @@ function analyzeClientEntries(pageConfigs, config) {
     let hasClientRouting = false;
     let hasServerRouting = false;
     let clientEntries = {};
-    let clientFilePaths = [];
+    let clientEntryList = [];
     pageConfigs.forEach((pageConfig) => {
         const configValue = getConfigValue(pageConfig, 'clientRouting', 'boolean');
         if (configValue?.value) {
@@ -147,15 +148,15 @@ function analyzeClientEntries(pageConfigs, config) {
             clientEntries[entryName] = entryTarget;
         }
         {
-            const clientFilePath = getClientEntryFilePath(pageConfig);
-            if (clientFilePath) {
-                clientFilePaths.push(clientFilePath);
+            const clientEntry = getClientEntry(pageConfig);
+            if (clientEntry) {
+                clientEntryList.push(clientEntry);
             }
         }
     });
-    clientFilePaths = unique(clientFilePaths);
-    clientFilePaths.forEach((pageFile) => {
-        const { entryName, entryTarget } = getEntryFromFilePath(pageFile, config);
+    clientEntryList = unique(clientEntryList);
+    clientEntryList.forEach((clientEntry) => {
+        const { entryName, entryTarget } = getEntryFromClientEntry(clientEntry, config);
         clientEntries[entryName] = entryTarget;
     });
     return { hasClientRouting, hasServerRouting, clientEntries };
@@ -177,12 +178,18 @@ async function getPageFileEntries(config, includeAssetsImportedByServer) {
             assert(includeAssetsImportedByServer);
             addExtractAssetsQuery = true;
         }
-        const { entryName, entryTarget } = getEntryFromFilePath(pageFile, config, addExtractAssetsQuery);
+        const { entryName, entryTarget } = getEntryFromClientEntry(pageFile, config, addExtractAssetsQuery);
         pageFileEntries[entryName] = entryTarget;
     });
     return pageFileEntries;
 }
-function getEntryFromFilePath(filePath, config, addExtractAssetsQuery) {
+function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
+    if (isNpmPackageImport(clientEntry)) {
+        const entryTarget = clientEntry;
+        const entryName = prependEntriesDir(clientEntry);
+        return { entryName, entryTarget };
+    }
+    const filePath = clientEntry;
     assertPosixPath(filePath);
     assert(filePath.startsWith('/'));
     let entryTarget = getFilePathAbsolute(filePath, config);
@@ -202,14 +209,6 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
     entryName = prependEntriesDir(entryName);
     return { entryName, entryTarget };
 }
-function prependEntriesDir(entryName) {
-    if (entryName.startsWith('/')) {
-        entryName = entryName.slice(1);
-    }
-    assert(!entryName.startsWith('/'));
-    entryName = `entries/${entryName}`;
-    return entryName;
-}
 function resolve(filePath) {
     assert(filePath.startsWith('dist/'));
     // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/

package/dist/esm/node/plugin/plugins/commonConfig.js

@@ -26,7 +26,7 @@ function commonConfig() {
                     overrideViteDefaultPort(config);
                     /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
                     overrideViteDefaultSsrExternal(config)
-                    */
+                    //*/
                     workaroundCI(config);
                     assertRollupInput(config);
                     assertResolveAlias(config);
@@ -46,21 +46,13 @@ function overrideViteDefaultPort(config) {
     (_b = config.preview).port ?? (_b.port = 3000);
 }
 /*
+import { version } from 'vite'
 function overrideViteDefaultSsrExternal(config: ResolvedConfig) {
-  if (!isViteVersionWithSsrExternalTrue()) return
+  if (!isVersionOrAbove(version, '5.0.12')) return
   // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
   config.ssr.external ??= true
 }
-import { version } from 'vite'
-function isViteVersionWithSsrExternalTrue(): boolean {
-  const versionParts = version.split('.').map((s) => parseInt(s, 10)) as [number, number, number]
-  assert(versionParts.length === 3)
-  if (versionParts[0] > 5) return true
-  if (versionParts[1] > 0) return true
-  if (versionParts[2] >= 12) return true
-  return false
-}
-*/
+//*/
 // Workaround GitHub Action failing to access the server
 function workaroundCI(config) {
     var _a, _b;

package/dist/esm/node/plugin/plugins/distFileNames.js

@@ -28,7 +28,7 @@ function distFileNames() {
                     //    - It's needed for getHash() of fixServerAssets()
                     //    - Asset URLs should always contain a hash: it's paramount for caching assets.
                     //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
-                    assertUsage(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (Contact a maintainer if you need this as it's possible to support this.)");
+                    assertUsage(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (It's possible to support, thus contact a maintainer if you need this.)");
                 }
             });
         }

package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js

@@ -9,12 +9,12 @@ export { extractAssetsRE };
 import { viteIsSSR_options, assert, assertPosixPath, styleFileRE, createDebugger, isDebugEnabled, isScriptFile, resolveVirtualFileId, isVirtualFileId, getVirtualFileId, assertUsage } from '../utils.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { getConfigVike } from '../../shared/getConfigVike.js';
-import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
 import { removeSourceMap } from '../shared/removeSourceMap.js';
 import pc from '@brillout/picocolors';
 import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
+import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -135,7 +135,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await getConfigVike(config_);
                 config = config_;
-                isServerAssetsFixEnabled = (await isV1Design(config, false)) && fixServerAssets_isEnabled();
+                isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config, false));
             },
             load(id) {
                 if (!isVirtualFileId(id))

package/dist/esm/node/plugin/utils.d.ts

@@ -20,3 +20,4 @@ export * from '../../utils/assertKeys.js';
 export * from '../../utils/injectRollupInputs.js';
 export * from '../../utils/humanizeTime.js';
 export * from '../../utils/pLimit.js';
+export * from '../../utils/isVersionOrAbove.js';

package/dist/esm/node/plugin/utils.js

@@ -26,3 +26,4 @@ export * from '../../utils/assertKeys.js';
 export * from '../../utils/injectRollupInputs.js';
 export * from '../../utils/humanizeTime.js';
 export * from '../../utils/pLimit.js';
+export * from '../../utils/isVersionOrAbove.js';

package/dist/esm/node/runtime/renderPage/analyzePage.js

@@ -4,11 +4,11 @@ import { analyzePageClientSide } from '../../../shared/getPageFiles/analyzePageC
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { analyzeClientSide } from '../../../shared/getPageFiles/analyzeClientSide.js';
 import { getGlobalContext } from '../globalContext.js';
-import { getClientEntryFilePath } from '../../shared/getClientEntryFilePath.js';
+import { getClientEntry } from '../../shared/getClientEntry.js';
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = getClientEntryFilePath(pageConfig);
+        const clientFilePath = getClientEntry(pageConfig);
         const clientEntry = !isClientSideRenderable ? clientFilePath : getVikeClientEntry(isClientRouting);
         const clientDependencies = [];
         clientDependencies.push({

package/dist/esm/node/runtime/renderPage/getPageAssets/assertClientEntryId.js

@@ -1,5 +1,4 @@
 export { assertClientEntryId };
-import { getGlobalContext } from '../../globalContext.js';
 import { assert, assertPosixPath, isNpmPackageImport } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 function assertClientEntryId(id) {
@@ -15,8 +14,4 @@ function assertClientEntryId(id) {
         isVirtualFileIdPageConfigValuesAll(id) ||
         // Stem packages
         isPkg, id);
-    if (isPkg) {
-        const { configVike } = getGlobalContext();
-        assert(configVike === null || configVike.extensions.some(({ npmPackageName }) => id.startsWith(npmPackageName)), id);
-    }
 }

package/dist/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.js

@@ -2,7 +2,10 @@ export { getManifestEntry };
 import { assert, slice, isNpmPackageImport } from '../../utils.js';
 import { assertClientEntryId } from './assertClientEntryId.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
-function getManifestEntry(id, clientManifest, manifestKeyMap) {
+import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
+function getManifestEntry(id, clientManifest, 
+// TODO: remove
+manifestKeyMap) {
     assertClientEntryId(id);
     const debugInfo = getDebugInfo(id, clientManifest);
     // Vike client entry
@@ -40,13 +43,11 @@ function getManifestEntry(id, clientManifest, manifestKeyMap) {
         assert(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
-    // extensions[number].pageConfigsDistFiles
+    // npm package import
     if (isNpmPackageImport(id)) {
-        const manifestKey = manifestKeyMap[id];
-        const debugInfo2 = { ...debugInfo, manifestKey };
-        assert(manifestKey, debugInfo2);
-        const manifestEntry = clientManifest[manifestKey];
-        assert(manifestEntry, debugInfo2);
+        const found = Object.entries(clientManifest).find(([, e]) => e.name === prependEntriesDir(id));
+        assert(found);
+        const [manifestKey, manifestEntry] = found;
         return { manifestEntry, manifestKey };
     }
     // extensions[number].pageConfigsSrcDir

package/dist/esm/node/runtime/renderPage/getPageAssets.js

@@ -1,5 +1,5 @@
 export { getPageAssets };
-import { assert, prependBase, assertPosixPath, toPosixPath, isNpmPackageImport, unique, isNotNullish, pathJoin } from '../utils.js';
+import { assert, prependBase, assertPosixPath, toPosixPath, isNpmPackageImport, unique, pathJoin } from '../utils.js';
 import { retrieveAssetsDev } from './getPageAssets/retrieveAssetsDev.js';
 import { retrieveAssetsProd } from './getPageAssets/retrieveAssetsProd.js';
 import { inferMediaType } from './inferMediaType.js';
@@ -77,7 +77,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         // User files
         filePath = pathJoin(root, clientEntry);
     }
-    else if (clientEntry.startsWith('@@vike/')) {
+    else if (clientEntry.startsWith('@@vike/') || isNpmPackageImport(clientEntry)) {
         // Vike client entry
         const { createRequire } = (await import_('module')).default;
         const { dirname } = (await import_('path')).default;
@@ -89,27 +89,23 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         // @ts-expect-error
         // Bun workaround https://github.com/vikejs/vike/pull/1048
         const res = typeof Bun !== 'undefined' ? (toPath) => Bun.resolveSync(toPath, __dirname_) : require_.resolve;
-        assert(clientEntry.endsWith('.js'));
-        try {
-            // For Vitest (which doesn't resolve vike to its dist but to its source files)
-            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/runtime/renderPage/getPageAssets.js
-            filePath = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
+        if (isNpmPackageImport(clientEntry)) {
+            filePath = res(clientEntry);
         }
-        catch {
-            // For users
-            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/runtime/renderPage/getPageAssets.js
-            filePath = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+        else {
+            assert(clientEntry.endsWith('.js'));
+            try {
+                // For Vitest (which doesn't resolve vike to its dist but to its source files)
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/runtime/renderPage/getPageAssets.js
+                filePath = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
+            }
+            catch {
+                // For users
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/runtime/renderPage/getPageAssets.js
+                filePath = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+            }
         }
     }
-    else if (isNpmPackageImport(clientEntry)) {
-        const extensionPageFile = configVike.extensions
-            .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-            .flat()
-            .filter(isNotNullish)
-            .find((e) => e.importPath === clientEntry);
-        assert(extensionPageFile, clientEntry);
-        filePath = extensionPageFile.filePath;
-    }
     else {
         assert(false);
     }

package/dist/esm/node/shared/ViteManifest.d.ts

@@ -6,6 +6,7 @@ type ViteManifestEntry = {
     css?: string[];
     assets?: string[];
     isEntry?: boolean;
+    name?: string;
     isDynamicEntry?: boolean;
     imports?: string[];
     dynamicImports?: string[];

package/dist/esm/node/shared/getClientEntry.d.ts

@@ -0,0 +1,3 @@
+export { getClientEntry };
+import type { PageConfigRuntime, PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
+declare function getClientEntry(pageConfig: PageConfigRuntime | PageConfigBuildTime): null | string;

package/dist/esm/node/shared/{getClientEntryFilePath.js → getClientEntry.js}

@@ -1,6 +1,6 @@
-export { getClientEntryFilePath };
+export { getClientEntry };
 import { getConfigValue } from '../../shared/page-configs/helpers.js';
-function getClientEntryFilePath(pageConfig) {
+function getClientEntry(pageConfig) {
     const configName = 'client';
     const configValue = getConfigValue(pageConfig, configName, 'string');
     if (!configValue)

package/dist/esm/node/shared/prependEntriesDir.d.ts

@@ -0,0 +1,2 @@
+export { prependEntriesDir };
+declare function prependEntriesDir(entryName: string): string;

package/dist/esm/node/shared/prependEntriesDir.js

@@ -0,0 +1,10 @@
+export { prependEntriesDir };
+import { assert } from './utils.js';
+function prependEntriesDir(entryName) {
+    if (entryName.startsWith('/')) {
+        entryName = entryName.slice(1);
+    }
+    assert(!entryName.startsWith('/'));
+    entryName = `entries/${entryName}`;
+    return entryName;
+}

package/dist/esm/utils/assertNodeVersion.js

@@ -1,11 +1,11 @@
 export { assertNodeVersion };
 import { assertUsage } from './assert.js';
 import { isNodeJS } from './isNodeJS.js';
+import { isVersionOrAbove } from './isVersionOrAbove.js';
 // package.json#engines.node isn't enough as users can ignore it
 function assertNodeVersion() {
     if (!isNodeJS())
         return;
     const version = process.versions.node;
-    const major = parseInt(version.split('.')[0], 10);
-    assertUsage(major >= 16, `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
+    assertUsage(isVersionOrAbove(version, '16.0.0'), `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
 }

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

@@ -0,0 +1,2 @@
+export { isVersionOrAbove };
+declare function isVersionOrAbove(versionActual: string, versionExpected: `${number}.${number}.${number}`): boolean;

package/dist/esm/utils/isVersionOrAbove.js

@@ -0,0 +1,26 @@
+export { isVersionOrAbove };
+import { assert } from './assert.js';
+function isVersionOrAbove(versionActual, versionExpected) {
+    const p1 = parseVersion(versionActual);
+    const p2 = parseVersion(versionExpected);
+    // major
+    if (p1[0] !== p2[0])
+        return p1[0] > p2[0];
+    // minor
+    if (p1[1] !== p2[1])
+        return p1[1] > p2[1];
+    // patch
+    if (p1[2] !== p2[2])
+        return p1[2] > p2[2];
+    // Same version
+    return true;
+}
+function parseVersion(version) {
+    // Remove pre-release tag
+    version = version.split('-')[0];
+    // major.minor.patch
+    const partsStr = version.split('.');
+    assert(partsStr.length === 3);
+    const parts = partsStr.map((s) => parseInt(s, 10));
+    return parts;
+}

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.160-commit-d574f51";
+declare const PROJECT_VERSION: "0.4.161-commit-ba539a4";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.160-commit-d574f51";
+    projectVersion: "0.4.161-commit-ba539a4";
 };

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.160-commit-d574f51';
+const PROJECT_VERSION = '0.4.161-commit-ba539a4';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.160-commit-d574f51",
+  "version": "0.4.161-commit-ba539a4",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -189,7 +189,7 @@
     "@types/source-map-support": "^0.5.10",
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3",
-    "vite": "^5.0.10"
+    "vite": "npm:@brillout/vite@5.1.0-commit-3dc7abd"
   },
   "engines": {
     "node": ">=16.0.0"

package/dist/esm/node/shared/getClientEntryFilePath.d.ts

@@ -1,3 +0,0 @@
-export { getClientEntryFilePath };
-import type { PageConfigRuntime, PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
-declare function getClientEntryFilePath(pageConfig: PageConfigRuntime | PageConfigBuildTime): null | string;