vike 0.4.163-commit-2305d5b → 0.4.163-commit-407cb5c

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

@@ -10,6 +10,7 @@ const fs_1 = require("fs");
 const utils_js_1 = require("../../utils.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const buildConfig_js_1 = require("../buildConfig.js");
+const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -23,11 +24,12 @@ function fixServerAssets_isEnabled() {
 }
 exports.fixServerAssets_isEnabled = fixServerAssets_isEnabled;
 /** https://github.com/vikejs/vike/issues/1339 */
-async function fixServerAssets(outDirs) {
+async function fixServerAssets(config) {
+    const outDirs = (0, utils_js_1.getOutDirs)(config);
     const clientManifest = await loadManifest(outDirs.outDirClient);
     const serverManifest = await loadManifest(outDirs.outDirServer);
     const { clientManifestMod, filesToCopy } = addServerAssets(clientManifest, serverManifest);
-    await copyAssets(filesToCopy, outDirs);
+    await copyAssets(filesToCopy, config);
     return clientManifestMod;
 }
 exports.fixServerAssets = fixServerAssets;
@@ -39,11 +41,13 @@ async function loadManifest(outDir) {
     (0, utils_js_1.assert)(manifest);
     return manifest;
 }
-async function copyAssets(filesToCopy, { outDirClient, outDirServer }) {
-    const assetsDirServer = path_1.default.posix.join(outDirServer, 'assets');
+async function copyAssets(filesToCopy, config) {
+    const { outDirClient, outDirServer } = (0, utils_js_1.getOutDirs)(config);
+    const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
+    const assetsDirServer = path_1.default.posix.join(outDirServer, assetsDir);
+    (0, utils_js_1.assert)((0, fs_1.existsSync)(assetsDirServer));
     if (!filesToCopy.length)
         return;
-    (0, utils_js_1.assert)((0, fs_1.existsSync)(assetsDirServer));
     const concurrencyLimit = (0, utils_js_1.pLimit)(10);
     await Promise.all(filesToCopy.map((file) => concurrencyLimit(() => promises_1.default.cp(path_1.default.posix.join(outDirServer, file), path_1.default.posix.join(outDirClient, file), {
         recursive: true

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

@@ -27,13 +27,15 @@ function buildConfig() {
     let isServerAssetsFixEnabled;
     let isSsrBuild;
     let outDirs;
+    let config;
     return {
         name: 'vike:buildConfig',
         apply: 'build',
         enforce: 'post',
         configResolved: {
             order: 'post',
-            async handler(config) {
+            async handler(config_) {
+                config = config_;
                 assertNodeEnv();
                 assertRollupInput(config);
                 const entries = await getEntries(config);
@@ -81,7 +83,7 @@ function buildConfig() {
                         await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
                     }
                     else {
-                        const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(outDirs);
+                        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);

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

@@ -9,6 +9,7 @@ exports.distFileNames = void 0;
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
 const utils_js_1 = require("../utils.js");
 const path_1 = __importDefault(require("path"));
+const getAssetsDir_js_1 = require("../shared/getAssetsDir.js");
 function distFileNames() {
     return {
         name: 'vike:distFileNames',
@@ -41,7 +42,7 @@ function distFileNames() {
 }
 exports.distFileNames = distFileNames;
 function getAssetFileName(assetInfo, config) {
-    const assetsDir = getAssetsDir(config);
+    const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const dir = assetsDir + '/static';
     let { name } = assetInfo;
     if (!name) {
@@ -69,13 +70,13 @@ function getChunkFileName(_chunkInfo, config) {
     const isForClientSide = !config.build.ssr;
     let name = 'chunks/chunk-[hash].js';
     if (isForClientSide) {
-        const assetsDir = getAssetsDir(config);
+        const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
         name = `${assetsDir}/${name}`;
     }
     return name;
 }
 function getEntryFileName(chunkInfo, config, isEntry) {
-    const assetsDir = getAssetsDir(config);
+    const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const isForClientSide = !config.build.ssr;
     let { name } = chunkInfo;
     (0, utils_js_1.assertPosixPath)(name);
@@ -169,9 +170,3 @@ function getRollupOutputs(config) {
     }
     return output;
 }
-function getAssetsDir(config) {
-    let { assetsDir } = config.build;
-    (0, utils_js_1.assertUsage)(assetsDir, `${assetsDir} cannot be an empty string`);
-    assetsDir = assetsDir.split(/\/|\\/).filter(Boolean).join('/');
-    return assetsDir;
-}

package/dist/cjs/node/plugin/shared/getAssetsDir.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAssetsDir = void 0;
+const utils_js_1 = require("../utils.js");
+function getAssetsDir(config) {
+    let { assetsDir } = config.build;
+    (0, utils_js_1.assertUsage)(assetsDir, `${assetsDir} cannot be an empty string`);
+    assetsDir = assetsDir.split(/\/|\\/).filter(Boolean).join('/');
+    return assetsDir;
+}
+exports.getAssetsDir = getAssetsDir;

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.163-commit-2305d5b';
+const PROJECT_VERSION = '0.4.163-commit-407cb5c';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -1,7 +1,7 @@
 export { fixServerAssets };
 export { fixServerAssets_isEnabled };
 import { ViteManifest } from '../../../shared/ViteManifest.js';
-import { OutDirs } from '../../utils.js';
+import { ResolvedConfig } from 'vite';
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -10,4 +10,4 @@ import { OutDirs } from '../../utils.js';
  */
 declare function fixServerAssets_isEnabled(): boolean;
 /** https://github.com/vikejs/vike/issues/1339 */
-declare function fixServerAssets(outDirs: OutDirs): Promise<ViteManifest>;
+declare function fixServerAssets(config: ResolvedConfig): Promise<ViteManifest>;

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

@@ -3,9 +3,10 @@ export { fixServerAssets_isEnabled };
 import fs from 'fs/promises';
 import path from 'path';
 import { existsSync } from 'fs';
-import { assert, pLimit, unique } from '../../utils.js';
+import { assert, getOutDirs, pLimit, unique } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { manifestTempFile } from '../buildConfig.js';
+import { getAssetsDir } from '../../shared/getAssetsDir.js';
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -18,11 +19,12 @@ function fixServerAssets_isEnabled() {
     return true;
 }
 /** https://github.com/vikejs/vike/issues/1339 */
-async function fixServerAssets(outDirs) {
+async function fixServerAssets(config) {
+    const outDirs = getOutDirs(config);
     const clientManifest = await loadManifest(outDirs.outDirClient);
     const serverManifest = await loadManifest(outDirs.outDirServer);
     const { clientManifestMod, filesToCopy } = addServerAssets(clientManifest, serverManifest);
-    await copyAssets(filesToCopy, outDirs);
+    await copyAssets(filesToCopy, config);
     return clientManifestMod;
 }
 async function loadManifest(outDir) {
@@ -33,11 +35,13 @@ async function loadManifest(outDir) {
     assert(manifest);
     return manifest;
 }
-async function copyAssets(filesToCopy, { outDirClient, outDirServer }) {
-    const assetsDirServer = path.posix.join(outDirServer, 'assets');
+async function copyAssets(filesToCopy, config) {
+    const { outDirClient, outDirServer } = getOutDirs(config);
+    const assetsDir = getAssetsDir(config);
+    const assetsDirServer = path.posix.join(outDirServer, assetsDir);
+    assert(existsSync(assetsDirServer));
     if (!filesToCopy.length)
         return;
-    assert(existsSync(assetsDirServer));
     const concurrencyLimit = pLimit(10);
     await Promise.all(filesToCopy.map((file) => concurrencyLimit(() => fs.cp(path.posix.join(outDirServer, file), path.posix.join(outDirClient, file), {
         recursive: true

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

@@ -24,13 +24,15 @@ function buildConfig() {
     let isServerAssetsFixEnabled;
     let isSsrBuild;
     let outDirs;
+    let config;
     return {
         name: 'vike:buildConfig',
         apply: 'build',
         enforce: 'post',
         configResolved: {
             order: 'post',
-            async handler(config) {
+            async handler(config_) {
+                config = config_;
                 assertNodeEnv();
                 assertRollupInput(config);
                 const entries = await getEntries(config);
@@ -78,7 +80,7 @@ function buildConfig() {
                         await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
                     }
                     else {
-                        const clientManifestMod = await fixServerAssets(outDirs);
+                        const clientManifestMod = await fixServerAssets(config);
                         await fs.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
                     }
                     await fs.rm(clientManifestFilePath);

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

@@ -4,6 +4,7 @@ export { distFileNames };
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
 import { assertPosixPath, assert, assertUsage } from '../utils.js';
 import path from 'path';
+import { getAssetsDir } from '../shared/getAssetsDir.js';
 function distFileNames() {
     return {
         name: 'vike:distFileNames',
@@ -163,9 +164,3 @@ function getRollupOutputs(config) {
     }
     return output;
 }
-function getAssetsDir(config) {
-    let { assetsDir } = config.build;
-    assertUsage(assetsDir, `${assetsDir} cannot be an empty string`);
-    assetsDir = assetsDir.split(/\/|\\/).filter(Boolean).join('/');
-    return assetsDir;
-}

package/dist/esm/node/plugin/shared/getAssetsDir.d.ts

@@ -0,0 +1,3 @@
+export { getAssetsDir };
+import type { ResolvedConfig } from 'vite';
+declare function getAssetsDir(config: ResolvedConfig): string;

package/dist/esm/node/plugin/shared/getAssetsDir.js

@@ -0,0 +1,8 @@
+export { getAssetsDir };
+import { assertUsage } from '../utils.js';
+function getAssetsDir(config) {
+    let { assetsDir } = config.build;
+    assertUsage(assetsDir, `${assetsDir} cannot be an empty string`);
+    assetsDir = assetsDir.split(/\/|\\/).filter(Boolean).join('/');
+    return assetsDir;
+}

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.163-commit-2305d5b";
+declare const PROJECT_VERSION: "0.4.163-commit-407cb5c";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.163-commit-2305d5b";
+    projectVersion: "0.4.163-commit-407cb5c";
 };

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.163-commit-2305d5b';
+const PROJECT_VERSION = '0.4.163-commit-407cb5c';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.163-commit-2305d5b",
+  "version": "0.4.163-commit-407cb5c",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",