vike 0.4.165-commit-74b18b0 → 0.4.165-commit-b3cc3cb

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

@@ -38,7 +38,7 @@ function plugin(vikeConfig) {
         ...(0, commonConfig_js_1.commonConfig)(),
         (0, index_js_2.importUserCode)(),
         ...(0, index_js_1.devConfig)(),
-        (0, buildConfig_js_1.buildConfig)(),
+        ...(0, buildConfig_js_1.buildConfig)(),
         (0, previewConfig_js_1.previewConfig)(),
         ...(0, autoFullBuild_js_1.autoFullBuild)(),
         (0, packageJsonFile_js_1.packageJsonFile)(),

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

@@ -28,71 +28,81 @@ function buildConfig() {
     let isSsrBuild;
     let outDirs;
     let config;
-    return {
-        name: 'vike:buildConfig',
-        apply: 'build',
-        enforce: 'post',
-        configResolved: {
-            order: 'post',
-            async handler(config_) {
-                config = config_;
-                (0, utils_js_1.assertNodeEnv_build)();
-                assertRollupInput(config);
-                const entries = await getEntries(config);
-                (0, utils_js_1.assert)(Object.keys(entries).length > 0);
-                config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
-                addLogHook();
-                outDirs = (0, utils_js_1.getOutDirs)(config);
-                {
-                    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;
-                        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-                        config.build.cssMinify = 'esbuild';
+    return [
+        {
+            name: 'vike:buildConfig:configResolved',
+            apply: 'build',
+            enforce: 'post',
+            configResolved: {
+                order: 'post',
+                async handler(config_) {
+                    config = config_;
+                    (0, utils_js_1.assertNodeEnv_build)();
+                    assertRollupInput(config);
+                    const entries = await getEntries(config);
+                    (0, utils_js_1.assert)(Object.keys(entries).length > 0);
+                    config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
+                    addLogHook();
+                    outDirs = (0, utils_js_1.getOutDirs)(config);
+                    {
+                        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;
+                            // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
+                            config.build.cssMinify = 'esbuild';
+                        }
                     }
                 }
+            },
+            config(config) {
+                (0, utils_js_1.assertNodeEnv_build)();
+                isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
+                return {
+                    build: {
+                        outDir: (0, utils_js_1.resolveOutDir)(config),
+                        manifest: manifestTempFile,
+                        copyPublicDir: !isSsrBuild
+                    }
+                };
+            },
+            buildStart() {
+                (0, utils_js_1.assertNodeEnv_build)();
             }
         },
-        config(config) {
-            (0, utils_js_1.assertNodeEnv_build)();
-            isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
-            return {
-                build: {
-                    outDir: (0, utils_js_1.resolveOutDir)(config),
-                    manifest: manifestTempFile,
-                    copyPublicDir: !isSsrBuild
-                }
-            };
-        },
-        buildStart() {
-            (0, utils_js_1.assertNodeEnv_build)();
-        },
-        writeBundle: {
-            order: 'post',
-            sequential: true,
-            async handler(options, bundle) {
-                if (isSsrBuild) {
-                    // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
-                    //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
-                    //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                    const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
-                    const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
-                    const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
-                    if (!isServerAssetsFixEnabled) {
-                        await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
-                    }
-                    else {
-                        const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(config);
-                        await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+        {
+            name: 'vike:buildConfig:writeBundle',
+            apply: 'build',
+            // Make sure other writeBundle() hooks are called after this writeBundle() hook.
+            //  - set_constant_ASSETS_MAP() needs to be called before dist/server/ code is executed.
+            //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
+            enforce: 'pre',
+            writeBundle: {
+                order: 'pre',
+                sequential: true,
+                async handler(options, bundle) {
+                    if (isSsrBuild) {
+                        // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
+                        //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
+                        //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
+                        const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
+                        const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
+                        const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
+                        if (!isServerAssetsFixEnabled) {
+                            await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
+                        }
+                        else {
+                            const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(config);
+                            await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+                        }
+                        await promises_1.default.rm(clientManifestFilePath);
+                        await promises_1.default.rm(serverManifestFilePath);
+                        await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
                     }
-                    await promises_1.default.rm(clientManifestFilePath);
-                    await promises_1.default.rm(serverManifestFilePath);
-                    await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
                 }
             }
         }
-    };
+    ];
 }
 exports.buildConfig = buildConfig;
 async function getEntries(config) {

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

@@ -95,7 +95,7 @@ function injectBreakLines(htmlFragment, before, after) {
     const whitespaceExtra = paddingParent ? '  ' : '';
     const whitespace = `${paddingParent}${whitespaceExtra}`;
     const padding = `\n${whitespace}`;
-    htmlFragment = htmlFragment.split(/<(?=[^\/])/).join(`${padding}<`);
+    htmlFragment = htmlFragment.replace(/<[^\/]/g, (match) => `${padding}${match}`);
     if (isBlankLine) {
         (0, utils_js_1.assert)(htmlFragment.startsWith(padding), { htmlFragment });
         htmlFragment = whitespaceExtra + htmlFragment.slice(padding.length);

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.165-commit-74b18b0';
+const PROJECT_VERSION = '0.4.165-commit-b3cc3cb';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -34,7 +34,7 @@ function plugin(vikeConfig) {
         ...commonConfig(),
         importUserCode(),
         ...devConfig(),
-        buildConfig(),
+        ...buildConfig(),
         previewConfig(),
         ...autoFullBuild(),
         packageJsonFile(),

package/dist/esm/node/plugin/plugins/buildConfig.d.ts

@@ -5,7 +5,7 @@ export { manifestTempFile };
 import type { ResolvedConfig, Plugin } from 'vite';
 import type { PageConfigBuildTime } from '../../../shared/page-configs/PageConfig.js';
 declare const manifestTempFile = "_temp_manifest.json";
-declare function buildConfig(): Plugin;
+declare function buildConfig(): Plugin[];
 declare function analyzeClientEntries(pageConfigs: PageConfigBuildTime[], config: ResolvedConfig): {
     hasClientRouting: boolean;
     hasServerRouting: boolean;

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

@@ -25,71 +25,81 @@ function buildConfig() {
     let isSsrBuild;
     let outDirs;
     let config;
-    return {
-        name: 'vike:buildConfig',
-        apply: 'build',
-        enforce: 'post',
-        configResolved: {
-            order: 'post',
-            async handler(config_) {
-                config = config_;
-                assertNodeEnv_build();
-                assertRollupInput(config);
-                const entries = await getEntries(config);
-                assert(Object.keys(entries).length > 0);
-                config.build.rollupOptions.input = injectRollupInputs(entries, config);
-                addLogHook();
-                outDirs = getOutDirs(config);
-                {
-                    isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config, false));
-                    if (isServerAssetsFixEnabled) {
-                        // https://github.com/vikejs/vike/issues/1339
-                        config.build.ssrEmitAssets = true;
-                        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-                        config.build.cssMinify = 'esbuild';
+    return [
+        {
+            name: 'vike:buildConfig:configResolved',
+            apply: 'build',
+            enforce: 'post',
+            configResolved: {
+                order: 'post',
+                async handler(config_) {
+                    config = config_;
+                    assertNodeEnv_build();
+                    assertRollupInput(config);
+                    const entries = await getEntries(config);
+                    assert(Object.keys(entries).length > 0);
+                    config.build.rollupOptions.input = injectRollupInputs(entries, config);
+                    addLogHook();
+                    outDirs = getOutDirs(config);
+                    {
+                        isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config, false));
+                        if (isServerAssetsFixEnabled) {
+                            // https://github.com/vikejs/vike/issues/1339
+                            config.build.ssrEmitAssets = true;
+                            // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
+                            config.build.cssMinify = 'esbuild';
+                        }
                     }
                 }
+            },
+            config(config) {
+                assertNodeEnv_build();
+                isSsrBuild = viteIsSSR(config);
+                return {
+                    build: {
+                        outDir: resolveOutDir(config),
+                        manifest: manifestTempFile,
+                        copyPublicDir: !isSsrBuild
+                    }
+                };
+            },
+            buildStart() {
+                assertNodeEnv_build();
             }
         },
-        config(config) {
-            assertNodeEnv_build();
-            isSsrBuild = viteIsSSR(config);
-            return {
-                build: {
-                    outDir: resolveOutDir(config),
-                    manifest: manifestTempFile,
-                    copyPublicDir: !isSsrBuild
-                }
-            };
-        },
-        buildStart() {
-            assertNodeEnv_build();
-        },
-        writeBundle: {
-            order: 'post',
-            sequential: true,
-            async handler(options, bundle) {
-                if (isSsrBuild) {
-                    // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
-                    //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
-                    //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                    const assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
-                    const clientManifestFilePath = path.posix.join(outDirs.outDirClient, manifestTempFile);
-                    const serverManifestFilePath = path.posix.join(outDirs.outDirServer, manifestTempFile);
-                    if (!isServerAssetsFixEnabled) {
-                        await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
-                    }
-                    else {
-                        const clientManifestMod = await fixServerAssets(config);
-                        await fs.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+        {
+            name: 'vike:buildConfig:writeBundle',
+            apply: 'build',
+            // Make sure other writeBundle() hooks are called after this writeBundle() hook.
+            //  - set_constant_ASSETS_MAP() needs to be called before dist/server/ code is executed.
+            //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
+            enforce: 'pre',
+            writeBundle: {
+                order: 'pre',
+                sequential: true,
+                async handler(options, bundle) {
+                    if (isSsrBuild) {
+                        // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
+                        //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
+                        //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
+                        const assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
+                        const clientManifestFilePath = path.posix.join(outDirs.outDirClient, manifestTempFile);
+                        const serverManifestFilePath = path.posix.join(outDirs.outDirServer, manifestTempFile);
+                        if (!isServerAssetsFixEnabled) {
+                            await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
+                        }
+                        else {
+                            const clientManifestMod = await fixServerAssets(config);
+                            await fs.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+                        }
+                        await fs.rm(clientManifestFilePath);
+                        await fs.rm(serverManifestFilePath);
+                        await set_constant_ASSETS_MAP(options, bundle);
                     }
-                    await fs.rm(clientManifestFilePath);
-                    await fs.rm(serverManifestFilePath);
-                    await set_constant_ASSETS_MAP(options, bundle);
                 }
             }
         }
-    };
+    ];
 }
 async function getEntries(config) {
     const configVike = await getConfigVike(config);

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

@@ -94,7 +94,7 @@ function injectBreakLines(htmlFragment, before, after) {
     const whitespaceExtra = paddingParent ? '  ' : '';
     const whitespace = `${paddingParent}${whitespaceExtra}`;
     const padding = `\n${whitespace}`;
-    htmlFragment = htmlFragment.split(/<(?=[^\/])/).join(`${padding}<`);
+    htmlFragment = htmlFragment.replace(/<[^\/]/g, (match) => `${padding}${match}`);
     if (isBlankLine) {
         assert(htmlFragment.startsWith(padding), { htmlFragment });
         htmlFragment = whitespaceExtra + htmlFragment.slice(padding.length);

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.165-commit-74b18b0";
+declare const PROJECT_VERSION: "0.4.165-commit-b3cc3cb";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.165-commit-74b18b0";
+    projectVersion: "0.4.165-commit-b3cc3cb";
 };

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.165-commit-74b18b0';
+const PROJECT_VERSION = '0.4.165-commit-b3cc3cb';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.165-commit-74b18b0",
+  "version": "0.4.165-commit-b3cc3cb",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",