vike 0.4.156-commit-1a83691 → 0.4.156-commit-d07fbe8

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonConfig = void 0;
+const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const buildConfig_js_1 = require("./buildConfig.js");
 const require_shim_1 = require("@brillout/require-shim");
@@ -28,7 +29,8 @@ function commonConfig() {
             configResolved: {
                 order: 'post',
                 handler(config) {
-                    setDefaultPort(config);
+                    overrideViteDefaultPort(config);
+                    overrideViteDefaultSsrExternal(config);
                     workaroundCI(config);
                     (0, buildConfig_js_1.assertRollupInput)(config);
                     (0, assertResolveAlias_js_1.assertResolveAlias)(config);
@@ -39,7 +41,7 @@ function commonConfig() {
     ];
 }
 exports.commonConfig = commonConfig;
-function setDefaultPort(config) {
+function overrideViteDefaultPort(config) {
     var _a, _b;
     // @ts-ignore
     config.server ?? (config.server = {});
@@ -48,6 +50,13 @@ function setDefaultPort(config) {
     config.preview ?? (config.preview = {});
     (_b = config.preview).port ?? (_b.port = 3000);
 }
+function overrideViteDefaultSsrExternal(config) {
+    var _a;
+    if (!isViteVersionWithSsrExternalTrue())
+        return;
+    // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
+    (_a = config.ssr).external ?? (_a.external = true);
+}
 // Workaround GitHub Action failing to access the server
 function workaroundCI(config) {
     var _a, _b;
@@ -70,3 +79,14 @@ 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 isViteVersionWithSsrExternalTrue() {
+    const versionParts = vite_1.version.split('.').map((s) => parseInt(s, 10));
+    (0, utils_js_1.assert)(versionParts.length === 3);
+    if (versionParts[0] > 5)
+        return true;
+    if (versionParts[1] > 0)
+        return true;
+    if (versionParts[2] >= 12)
+        return true;
+    return false;
+}

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

@@ -18,13 +18,13 @@ function distFileNames() {
             const rollupOutputs = getRollupOutputs(config);
             // We need to support multiple outputs: @vite/plugin-legacy adds an ouput, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
             rollupOutputs.forEach((rollupOutput) => {
-                if (!rollupOutput.entryFileNames) {
+                if (!('entryFileNames' in rollupOutput)) {
                     rollupOutput.entryFileNames = (chunkInfo) => getEntryFileName(chunkInfo, config, true);
                 }
-                if (!rollupOutput.chunkFileNames) {
+                if (!('chunkFileNames' in rollupOutput)) {
                     rollupOutput.chunkFileNames = (chunkInfo) => getChunkFileName(chunkInfo, config);
                 }
-                if (!rollupOutput.assetFileNames) {
+                if (!('assertUsage' in rollupOutput)) {
                     rollupOutput.assetFileNames = (chunkInfo) => getAssetFileName(chunkInfo, config);
                 }
             });

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

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

@@ -1,4 +1,5 @@
 export { commonConfig };
+import { version } from 'vite';
 import { assert, assertWarning, findUserPackageJsonPath } from '../utils.js';
 import { assertRollupInput } from './buildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
@@ -23,7 +24,8 @@ function commonConfig() {
             configResolved: {
                 order: 'post',
                 handler(config) {
-                    setDefaultPort(config);
+                    overrideViteDefaultPort(config);
+                    overrideViteDefaultSsrExternal(config);
                     workaroundCI(config);
                     assertRollupInput(config);
                     assertResolveAlias(config);
@@ -33,7 +35,7 @@ function commonConfig() {
         }
     ];
 }
-function setDefaultPort(config) {
+function overrideViteDefaultPort(config) {
     var _a, _b;
     // @ts-ignore
     config.server ?? (config.server = {});
@@ -42,6 +44,13 @@ function setDefaultPort(config) {
     config.preview ?? (config.preview = {});
     (_b = config.preview).port ?? (_b.port = 3000);
 }
+function overrideViteDefaultSsrExternal(config) {
+    var _a;
+    if (!isViteVersionWithSsrExternalTrue())
+        return;
+    // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
+    (_a = config.ssr).external ?? (_a.external = true);
+}
 // Workaround GitHub Action failing to access the server
 function workaroundCI(config) {
     var _a, _b;
@@ -64,3 +73,14 @@ 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 isViteVersionWithSsrExternalTrue() {
+    const versionParts = version.split('.').map((s) => parseInt(s, 10));
+    assert(versionParts.length === 3);
+    if (versionParts[0] > 5)
+        return true;
+    if (versionParts[1] > 0)
+        return true;
+    if (versionParts[2] >= 12)
+        return true;
+    return false;
+}

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

@@ -13,13 +13,13 @@ function distFileNames() {
             const rollupOutputs = getRollupOutputs(config);
             // We need to support multiple outputs: @vite/plugin-legacy adds an ouput, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
             rollupOutputs.forEach((rollupOutput) => {
-                if (!rollupOutput.entryFileNames) {
+                if (!('entryFileNames' in rollupOutput)) {
                     rollupOutput.entryFileNames = (chunkInfo) => getEntryFileName(chunkInfo, config, true);
                 }
-                if (!rollupOutput.chunkFileNames) {
+                if (!('chunkFileNames' in rollupOutput)) {
                     rollupOutput.chunkFileNames = (chunkInfo) => getChunkFileName(chunkInfo, config);
                 }
-                if (!rollupOutput.assetFileNames) {
+                if (!('assertUsage' in rollupOutput)) {
                     rollupOutput.assetFileNames = (chunkInfo) => getAssetFileName(chunkInfo, config);
                 }
             });

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.156-commit-1a83691";
+declare const PROJECT_VERSION: "0.4.156-commit-d07fbe8";
 type PackageName = typeof projectInfo.npmPackageName;
 type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.156-commit-1a83691";
+    projectVersion: "0.4.156-commit-d07fbe8";
     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.156-commit-1a83691';
+const PROJECT_VERSION = '0.4.156-commit-d07fbe8';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.156-commit-1a83691",
+  "version": "0.4.156-commit-d07fbe8",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",