vike 0.4.154 → 0.4.156-commit-f4c1d32

package/dist/cjs/node/plugin/plugins/importBuild/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importBuild = void 0;
-const plugin_js_1 = require("@brillout/vite-plugin-import-build/plugin.js");
+const plugin_js_1 = require("@brillout/vite-plugin-server-entry/plugin.js");
 const utils_js_1 = require("../../utils.js");
 const path_1 = __importDefault(require("path"));
 const module_1 = require("module");
@@ -33,7 +33,7 @@ function importBuild() {
                 await replace_ASSETS_MAP(options, bundle);
             }
         },
-        (0, plugin_js_1.importBuild)({
+        ...(0, plugin_js_1.serverEntryPlugin)({
             getImporterCode: () => {
                 return getEntryCode(config, configVike);
             },
@@ -67,17 +67,18 @@ function getEntryCode(config, configVike) {
 async function replace_ASSETS_MAP(options, bundle) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
-    // I guess importBuild won't be found in the bundle when using @vitejs/plugin-legacy
-    const importBuildEntry = (0, plugin_js_1.findImportBuildBundleEntry)(bundle);
-    const importBuildFilePath = path_1.default.join(dir, importBuildEntry.fileName);
+    // This will probably fail with @vitejs/plugin-legacy
+    //  - See `git log -p` for how we used to workaround the @vitejs/plugin-legacy issue.
+    const serverEntry = (0, plugin_js_1.findServerEntry)(bundle);
+    const serverEntryFilePath = path_1.default.join(dir, serverEntry.fileName);
     const assetsJsonFilePath = path_1.default.join(dir, '..', 'assets.json');
-    const [assetsJsonString, importBuildFileContent] = await Promise.all([
+    const [assetsJsonString, serverEntryFileContent] = await Promise.all([
         await promises_1.default.readFile(assetsJsonFilePath, 'utf8'),
-        await promises_1.default.readFile(importBuildFilePath, 'utf8')
+        await promises_1.default.readFile(serverEntryFilePath, 'utf8')
     ]);
-    const importBuildFileContentFixed = importBuildFileContent.replace(ASSETS_MAP, assetsJsonString);
-    (0, utils_js_1.assert)(importBuildFileContentFixed !== importBuildFileContent);
-    await promises_1.default.writeFile(importBuildFilePath, importBuildFileContentFixed);
+    const serverEntryFileContentPatched = serverEntryFileContent.replace(ASSETS_MAP, assetsJsonString);
+    (0, utils_js_1.assert)(serverEntryFileContentPatched !== serverEntryFileContent);
+    await promises_1.default.writeFile(serverEntryFilePath, serverEntryFileContentPatched);
 }
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct

package/dist/cjs/node/prerender/runPrerender.js

@@ -101,7 +101,7 @@ async function runPrerender(options, manuallyTriggered) {
     }
     const { partial = false, noExtraDir = false, parallel = true } = prerenderConfig || {};
     const concurrencyLimit = (0, pLimit_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
-    (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(outDirRoot); // Needed for loadServerBuild(outDir) of @brillout/vite-plugin-import-build
+    (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
     await (0, globalContext_js_1.initGlobalContext)(true, outDirRoot);
     const renderContext = await (0, renderPageAlreadyRouted_js_1.getRenderContext)();
     renderContext.pageFilesAll.forEach(assertExportNames);

package/dist/cjs/node/runtime/globalContext/loadImportBuild.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setImportBuildGetters = exports.loadImportBuild = void 0;
-const loadServerBuild_js_1 = require("@brillout/vite-plugin-import-build/loadServerBuild.js");
+const importServerEntry_js_1 = require("@brillout/vite-plugin-server-entry/importServerEntry.js");
 const utils_js_1 = require("../utils.js");
 const buildGetters = (globalThis.__vike_buildGetters = globalThis.__vike_buildGetters || {
     getters: null
@@ -12,7 +12,7 @@ function setImportBuildGetters(getters) {
 exports.setImportBuildGetters = setImportBuildGetters;
 async function loadImportBuild(outDir) {
     if (!buildGetters.getters) {
-        await (0, loadServerBuild_js_1.loadServerBuild)(outDir);
+        await (0, importServerEntry_js_1.importServerEntry)(outDir);
         (0, utils_js_1.assert)(buildGetters.getters);
     }
     const [pageFiles, clientManifest, pluginManifest] = await Promise.all([

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -90,12 +90,12 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     // See https://github.com/vikejs/vike/pull/1271
     const positionJavaScriptEntry = (() => {
         if (pageContext._pageContextPromise) {
-            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time as partial hydration won't work", { onlyOnce: true });
+            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time as progressive hydration won't work", { onlyOnce: true });
             // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/stream#initial-data-after-stream-end
             return 'HTML_END';
         }
         if (injectToStream) {
-            // If there is a stream then, in order to support partial hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary
+            // If there is a stream then, in order to support progressive hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary
             return 'STREAM';
         }
         else {

package/dist/cjs/node/runtime/html/injectAssets/inferHtmlTags.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scriptAttrs = exports.inferEarlyHintLink = exports.inferPreloadTag = exports.inferAssetTag = void 0;
 const utils_js_1 = require("../../utils.js");
-// We can't use `defer` here. With `defer`, the entry script won't start before `</body>` has been parsed, preventing partial hydration during SSR streaming, see https://github.com/vikejs/vike/pull/1271
+// We can't use `defer` here. With `defer`, the entry script won't start before `</body>` has been parsed, preventing progressive hydration during SSR streaming, see https://github.com/vikejs/vike/pull/1271
 const scriptAttrs = 'type="module" async';
 exports.scriptAttrs = scriptAttrs;
 function inferPreloadTag(pageAsset) {

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

@@ -264,7 +264,7 @@ function includesNodeModules(str) {
     return true;
 }
 function normalize(packageNames) {
-    const result = (0, utils_js_1.unique)(packageNames.filter(utils_js_1.isNotNullish));
+    const result = (0, utils_js_1.unique)(packageNames.filter(utils_js_1.isNotNullish).filter((packageName) => packageName !== '@brillout/import'));
     if (result.length === 0)
         return false;
     return result;

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

@@ -6,16 +6,17 @@ const utils_js_1 = require("./utils.js");
 const query = 'extractAssets';
 function extractAssetsAddQuery(id) {
     const fileExtension = (0, utils_js_1.getFileExtension)(id);
-    (0, utils_js_1.assert)(fileExtension || id.includes('virtual:vike:'));
-    if (!fileExtension)
+    if (!fileExtension || id.includes('virtual:vike:')) {
         return `${id}?${query}`;
-    if (id.includes('?')) {
-        id = id.replace('?', `?${query}&`);
     }
     else {
-        id = `${id}?${query}&lang.${fileExtension}`;
+        if (!id.includes('?')) {
+            return `${id}?${query}&lang.${fileExtension}`;
+        }
+        else {
+            return id.replace('?', `?${query}&`);
+        }
     }
-    return id;
 }
 exports.extractAssetsAddQuery = extractAssetsAddQuery;
 function extractAssetsRemoveQuery(id) {

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.154';
+const PROJECT_VERSION = '0.4.156-commit-f4c1d32';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/node/plugin/plugins/importBuild/index.js

@@ -1,5 +1,5 @@
 export { importBuild };
-import { importBuild as importBuild_, findImportBuildBundleEntry } from '@brillout/vite-plugin-import-build/plugin.js';
+import { serverEntryPlugin, findServerEntry } from '@brillout/vite-plugin-server-entry/plugin.js';
 import { assert, getOutDirs, projectInfo, toPosixPath, viteIsSSR } from '../../utils.js';
 import path from 'path';
 import { createRequire } from 'module';
@@ -28,7 +28,7 @@ function importBuild() {
                 await replace_ASSETS_MAP(options, bundle);
             }
         },
-        importBuild_({
+        ...serverEntryPlugin({
             getImporterCode: () => {
                 return getEntryCode(config, configVike);
             },
@@ -61,17 +61,18 @@ function getEntryCode(config, configVike) {
 async function replace_ASSETS_MAP(options, bundle) {
     const { dir } = options;
     assert(dir);
-    // I guess importBuild won't be found in the bundle when using @vitejs/plugin-legacy
-    const importBuildEntry = findImportBuildBundleEntry(bundle);
-    const importBuildFilePath = path.join(dir, importBuildEntry.fileName);
+    // This will probably fail with @vitejs/plugin-legacy
+    //  - See `git log -p` for how we used to workaround the @vitejs/plugin-legacy issue.
+    const serverEntry = findServerEntry(bundle);
+    const serverEntryFilePath = path.join(dir, serverEntry.fileName);
     const assetsJsonFilePath = path.join(dir, '..', 'assets.json');
-    const [assetsJsonString, importBuildFileContent] = await Promise.all([
+    const [assetsJsonString, serverEntryFileContent] = await Promise.all([
         await fs.readFile(assetsJsonFilePath, 'utf8'),
-        await fs.readFile(importBuildFilePath, 'utf8')
+        await fs.readFile(serverEntryFilePath, 'utf8')
     ]);
-    const importBuildFileContentFixed = importBuildFileContent.replace(ASSETS_MAP, assetsJsonString);
-    assert(importBuildFileContentFixed !== importBuildFileContent);
-    await fs.writeFile(importBuildFilePath, importBuildFileContentFixed);
+    const serverEntryFileContentPatched = serverEntryFileContent.replace(ASSETS_MAP, assetsJsonString);
+    assert(serverEntryFileContentPatched !== serverEntryFileContent);
+    await fs.writeFile(serverEntryFilePath, serverEntryFileContentPatched);
 }
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct

package/dist/esm/node/prerender/runPrerender.js

@@ -73,7 +73,7 @@ async function runPrerender(options, manuallyTriggered) {
     }
     const { partial = false, noExtraDir = false, parallel = true } = prerenderConfig || {};
     const concurrencyLimit = pLimit(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? cpus().length : parallel);
-    assertPathIsFilesystemAbsolute(outDirRoot); // Needed for loadServerBuild(outDir) of @brillout/vite-plugin-import-build
+    assertPathIsFilesystemAbsolute(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
     await initGlobalContext(true, outDirRoot);
     const renderContext = await getRenderContext();
     renderContext.pageFilesAll.forEach(assertExportNames);

package/dist/esm/node/runtime/globalContext/loadImportBuild.js

@@ -1,6 +1,6 @@
 export { loadImportBuild };
 export { setImportBuildGetters };
-import { loadServerBuild } from '@brillout/vite-plugin-import-build/loadServerBuild.js';
+import { importServerEntry } from '@brillout/vite-plugin-server-entry/importServerEntry.js';
 import { assert } from '../utils.js';
 const buildGetters = (globalThis.__vike_buildGetters = globalThis.__vike_buildGetters || {
     getters: null
@@ -10,7 +10,7 @@ function setImportBuildGetters(getters) {
 }
 async function loadImportBuild(outDir) {
     if (!buildGetters.getters) {
-        await loadServerBuild(outDir);
+        await importServerEntry(outDir);
         assert(buildGetters.getters);
     }
     const [pageFiles, clientManifest, pluginManifest] = await Promise.all([

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -85,12 +85,12 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     // See https://github.com/vikejs/vike/pull/1271
     const positionJavaScriptEntry = (() => {
         if (pageContext._pageContextPromise) {
-            assertWarning(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time as partial hydration won't work", { onlyOnce: true });
+            assertWarning(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time as progressive hydration won't work", { onlyOnce: true });
             // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/stream#initial-data-after-stream-end
             return 'HTML_END';
         }
         if (injectToStream) {
-            // If there is a stream then, in order to support partial hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary
+            // If there is a stream then, in order to support progressive hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary
             return 'STREAM';
         }
         else {

package/dist/esm/node/runtime/html/injectAssets/inferHtmlTags.js

@@ -3,7 +3,7 @@ export { inferPreloadTag };
 export { inferEarlyHintLink };
 export { scriptAttrs };
 import { assert } from '../../utils.js';
-// We can't use `defer` here. With `defer`, the entry script won't start before `</body>` has been parsed, preventing partial hydration during SSR streaming, see https://github.com/vikejs/vike/pull/1271
+// We can't use `defer` here. With `defer`, the entry script won't start before `</body>` has been parsed, preventing progressive hydration during SSR streaming, see https://github.com/vikejs/vike/pull/1271
 const scriptAttrs = 'type="module" async';
 function inferPreloadTag(pageAsset) {
     const { src, assetType, mediaType } = pageAsset;

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

@@ -259,7 +259,7 @@ function includesNodeModules(str) {
     return true;
 }
 function normalize(packageNames) {
-    const result = unique(packageNames.filter(isNotNullish));
+    const result = unique(packageNames.filter(isNotNullish).filter((packageName) => packageName !== '@brillout/import'));
     if (result.length === 0)
         return false;
     return result;

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

@@ -5,16 +5,17 @@ import { assert, getFileExtension } from './utils.js';
 const query = 'extractAssets';
 function extractAssetsAddQuery(id) {
     const fileExtension = getFileExtension(id);
-    assert(fileExtension || id.includes('virtual:vike:'));
-    if (!fileExtension)
+    if (!fileExtension || id.includes('virtual:vike:')) {
         return `${id}?${query}`;
-    if (id.includes('?')) {
-        id = id.replace('?', `?${query}&`);
     }
     else {
-        id = `${id}?${query}&lang.${fileExtension}`;
+        if (!id.includes('?')) {
+            return `${id}?${query}&lang.${fileExtension}`;
+        }
+        else {
+            return id.replace('?', `?${query}&`);
+        }
     }
-    return id;
 }
 function extractAssetsRemoveQuery(id) {
     if (!id.includes('?'))

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

@@ -1,13 +1,13 @@
 export { projectInfo };
 export type { ProjectTag };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.154";
+declare const PROJECT_VERSION: "0.4.156-commit-f4c1d32";
 type PackageName = typeof projectInfo.npmPackageName;
 type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.154";
+    projectVersion: "0.4.156-commit-f4c1d32";
     npmPackageName: "vike";
     githubRepository: "https://github.com/vikejs/vike";
 };

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.154';
+const PROJECT_VERSION = '0.4.156-commit-f4c1d32';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.154",
+  "version": "0.4.156-commit-f4c1d32",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -16,7 +16,7 @@
     "@brillout/json-serializer": "^0.5.8",
     "@brillout/picocolors": "^1.0.10",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-import-build": "^0.3.4",
+    "@brillout/vite-plugin-server-entry": "^0.4.3",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
@@ -173,7 +173,7 @@
     "@brillout/json-serializer": "^0.5.8",
     "@brillout/picocolors": "^1.0.10",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-import-build": "^0.3.1",
+    "@brillout/vite-plugin-server-entry": "^0.4.0",
     "acorn": "^8.11.2",
     "cac": "^6.7.14",
     "es-module-lexer": "^1.4.1",