vike 0.4.162-commit-49fe40c → 0.4.162-commit-6812418

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

@@ -66,24 +66,28 @@ function buildConfig() {
         buildStart() {
             assertNodeEnv();
         },
-        async writeBundle(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)(outDirs);
-                    await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+        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)(outDirs);
+                        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);
             }
         }
     };

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

@@ -14,16 +14,18 @@ const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
+const pluginName = 'vike:commonConfig-1';
 function commonConfig() {
     return [
         {
-            name: 'vike-commonConfig-1',
+            name: pluginName,
             configResolved(config) {
+                assertSingleInstance(config);
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
             }
         },
         {
-            name: 'vike-.commonConfig-2',
+            name: 'vike:commonConfig-2',
             enforce: 'post',
             configResolved: {
                 order: 'post',
@@ -81,3 +83,7 @@ function assertEsm(userViteRoot) {
     dir = picocolors_1.default.dim(dir);
     (0, utils_js_1.assertWarning)(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
 }
+function assertSingleInstance(config) {
+    const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
+    (0, utils_js_1.assertUsage)(numberOfInstances === 1, `Vike's Vite plugin (${picocolors_1.default.cyan("'import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
+}

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

@@ -327,6 +327,9 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
+    const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
+    if (isPageContextRequest)
+        return null;
     const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash, baseServer);
     if (!urlNormalized)
         return null;

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.162-commit-49fe40c';
+const PROJECT_VERSION = '0.4.162-commit-6812418';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -63,24 +63,28 @@ function buildConfig() {
         buildStart() {
             assertNodeEnv();
         },
-        async writeBundle(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(outDirs);
-                    await fs.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+        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(outDirs);
+                        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);
             }
         }
     };

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

@@ -1,5 +1,5 @@
 export { commonConfig };
-import { assert, assertWarning, findFile } from '../utils.js';
+import { assert, assertUsage, assertWarning, findFile } from '../utils.js';
 import { assertRollupInput } from './buildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
@@ -9,16 +9,18 @@ import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
+const pluginName = 'vike:commonConfig-1';
 function commonConfig() {
     return [
         {
-            name: 'vike-commonConfig-1',
+            name: pluginName,
             configResolved(config) {
+                assertSingleInstance(config);
                 installRequireShim_setUserRootDir(config.root);
             }
         },
         {
-            name: 'vike-.commonConfig-2',
+            name: 'vike:commonConfig-2',
             enforce: 'post',
             configResolved: {
                 order: 'post',
@@ -75,3 +77,7 @@ function assertEsm(userViteRoot) {
     dir = pc.dim(dir);
     assertWarning(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
 }
+function assertSingleInstance(config) {
+    const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
+    assertUsage(numberOfInstances === 1, `Vike's Vite plugin (${pc.cyan("'import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
+}

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

@@ -321,6 +321,9 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
+    const { isPageContextRequest } = handlePageContextRequestUrl(urlOriginal);
+    if (isPageContextRequest)
+        return null;
     const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash, baseServer);
     if (!urlNormalized)
         return null;

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.162-commit-49fe40c";
+declare const PROJECT_VERSION: "0.4.162-commit-6812418";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.162-commit-49fe40c";
+    projectVersion: "0.4.162-commit-6812418";
 };

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.162-commit-49fe40c';
+const PROJECT_VERSION = '0.4.162-commit-6812418';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.162-commit-49fe40c",
+  "version": "0.4.162-commit-6812418",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",