vike 0.4.216 → 0.4.217-commit-99ea561

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

@@ -1,81 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveVikeConfig = resolveVikeConfig;
-const assertVikeConfig_js_1 = require("./assertVikeConfig.js");
-const utils_js_1 = require("../../utils.js");
-const pickFirst_js_1 = require("./pickFirst.js");
-const resolveBase_js_1 = require("./resolveBase.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function resolveVikeConfig(vikeConfig) {
-    let isDev;
-    return {
-        name: 'vike:resolveVikeConfig',
-        enforce: 'pre',
-        apply(_config, env) {
-            isDev = (0, utils_js_1.isDevCheck)(env);
-            return true;
-        },
-        async configResolved(config) {
-            (0, utils_js_1.assert)(typeof isDev === 'boolean');
-            const promise = getConfigVikPromise(vikeConfig, config, isDev);
-            config.configVikePromise = promise;
-            await promise;
-        }
-    };
-}
-async function getConfigVikPromise(vikeConfig, config, isDev) {
-    const fromPluginOptions = (vikeConfig ?? {});
-    const fromViteConfig = (config.vike ?? {});
-    const configs = [fromPluginOptions, fromViteConfig];
-    (0, assertVikeConfig_js_1.assertVikeConfig)(fromViteConfig, ({ prop, errMsg }) => `vite.config.js#vike.${prop} ${errMsg}`);
-    // TODO/v1-release: deprecate this
-    (0, assertVikeConfig_js_1.assertVikeConfig)(fromPluginOptions, ({ prop, errMsg }) => `vite.config.js > vike option ${prop} ${errMsg}`);
-    const crawlWithGit = fromPluginOptions.crawl?.git ?? null;
-    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { crawlWithGit });
-    configs.push(fromPlusConfigFile);
-    (0, assertVikeConfig_js_1.assertVikeConfig)(fromPlusConfigFile, ({ prop, errMsg }) => {
-        // TODO: add config file path ?
-        return `config ${picocolors_1.default.cyan(prop)} ${errMsg}`;
-    });
-    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBase)(configs, config);
-    const configVike = {
-        disableAutoFullBuild: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.disableAutoFullBuild)) ?? null,
-        prerender: resolvePrerenderOptions(configs),
-        includeAssetsImportedByServer: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.includeAssetsImportedByServer)) ?? true,
-        baseServer,
-        baseAssets,
-        redirects: merge(configs.map((c) => c.redirects)) ?? {},
-        disableUrlNormalization: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.disableUrlNormalization)) ?? false,
-        trailingSlash: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.trailingSlash)) ?? false,
-        crawl: {
-            git: crawlWithGit
-        }
-    };
-    return configVike;
-}
-function resolvePrerenderOptions(configs) {
-    if (!configs.some((c) => c.prerender)) {
-        return false;
-    }
-    const configsPrerender = configs.map((c) => c.prerender).filter(isObject);
-    return {
-        partial: (0, pickFirst_js_1.pickFirst)(configsPrerender.map((c) => c.partial)) ?? false,
-        noExtraDir: (0, pickFirst_js_1.pickFirst)(configsPrerender.map((c) => c.noExtraDir)) ?? false,
-        parallel: (0, pickFirst_js_1.pickFirst)(configsPrerender.map((c) => c.parallel)) ?? true,
-        disableAutoRun: (0, pickFirst_js_1.pickFirst)(configsPrerender.map((c) => c.disableAutoRun)) ?? false
-    };
-}
-function isObject(p) {
-    return typeof p === 'object';
-}
-function merge(objs) {
-    const obj = {};
-    objs.forEach((e) => {
-        Object.assign(obj, e);
-    });
-    return obj;
-}

package/dist/cjs/node/plugin/plugins/config/pickFirst.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pickFirst = pickFirst;
-function pickFirst(arr) {
-    return arr.filter((v) => v !== undefined)[0];
-}

package/dist/cjs/node/plugin/plugins/config/resolveBase.js

@@ -1,47 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveBase = resolveBase;
-exports.resolveBaseFromUserConfig = resolveBaseFromUserConfig;
-const utils_js_1 = require("../../utils.js");
-const pickFirst_js_1 = require("./pickFirst.js");
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function resolveBase(configs, config) {
-    const baseServer = (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.baseServer)) ?? null;
-    const baseAssets = (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.baseAssets)) ?? null;
-    let baseOriginal = config._baseOriginal;
-    if (baseOriginal === '/__UNSET__')
-        baseOriginal = null;
-    (0, utils_js_1.assert)(baseOriginal === null || typeof baseOriginal == 'string');
-    return resolve(baseOriginal, baseServer, baseAssets);
-}
-function resolveBaseFromUserConfig(config, configVike) {
-    return resolve(config.base ?? null, configVike?.baseServer ?? null, configVike?.baseAssets ?? null);
-}
-function resolve(base, baseServer_, baseAssets_) {
-    {
-        const wrongBase = (val) => `should start with ${picocolors_1.default.cyan('/')}, ${picocolors_1.default.cyan('http://')}, or ${picocolors_1.default.cyan('https://')} (it's ${picocolors_1.default.cyan(val)} instead)`;
-        (0, utils_js_1.assertUsage)(base === null || (0, utils_js_1.isBaseAssets)(base), `vite.config.js#base ${wrongBase(base)}`);
-        (0, utils_js_1.assertUsage)(baseAssets_ === null || (0, utils_js_1.isBaseAssets)(baseAssets_), `Config ${picocolors_1.default.cyan('baseAssets')} ${wrongBase(baseAssets_)}`);
-        (0, utils_js_1.assertUsage)(baseServer_ === null || baseServer_.startsWith('/'), `Config ${picocolors_1.default.cyan('baseServer')} should start with a leading slash ${picocolors_1.default.cyan('/')} (it's ${picocolors_1.default.cyan(String(baseServer_))} instead)`);
-    }
-    if (base) {
-        if (base.startsWith('http')) {
-            baseAssets_ = baseAssets_ ?? base;
-        }
-        else {
-            baseAssets_ = baseAssets_ ?? base;
-            baseServer_ = baseServer_ ?? base;
-        }
-    }
-    const baseServer = baseServer_ ?? '/';
-    const baseAssets = baseAssets_ ?? '/';
-    (0, utils_js_1.assert)((0, utils_js_1.isBaseAssets)(baseAssets));
-    (0, utils_js_1.assert)((0, utils_js_1.isBaseServer)(baseServer));
-    return {
-        baseServer,
-        baseAssets
-    };
-}

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

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfigVike = getConfigVike;
-const utils_js_1 = require("./utils.js");
-async function getConfigVike(config) {
-    const { configVikePromise } = config;
-    (0, utils_js_1.assert)(configVikePromise);
-    const configVike = await configVikePromise;
-    return configVike;
-}

package/dist/cjs/shared/ConfigVike.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/esm/node/plugin/plugins/config/assertVikeConfig.d.ts

@@ -1,7 +0,0 @@
-export { assertVikeConfig };
-import type { ConfigVikeUserProvided } from '../../../../shared/ConfigVike.js';
-type WrongUsage = {
-    prop: string;
-    errMsg: `should be a${string}`;
-};
-declare function assertVikeConfig(vikeConfig: unknown, wrongUsageMsg: (wrongUsage: WrongUsage) => string): asserts vikeConfig is ConfigVikeUserProvided;

package/dist/esm/node/plugin/plugins/config/assertVikeConfig.js

@@ -1,73 +0,0 @@
-export { assertVikeConfig };
-import { assert, assertUsage, hasProp, isObject } from '../../utils.js';
-function assertVikeConfig(vikeConfig, wrongUsageMsg) {
-    const wrongUsageError = checkConfigVike(vikeConfig);
-    if (wrongUsageError) {
-        assertUsage(false, wrongUsageMsg(wrongUsageError));
-    }
-}
-function checkConfigVike(configVike) {
-    assert(isObject(configVike));
-    {
-        const prop = 'disableUrlNormalization';
-        if (!hasProp(configVike, prop, 'boolean') && !hasProp(configVike, prop, 'undefined'))
-            return { prop, errMsg: 'should be a boolean' };
-    }
-    {
-        const prop = 'trailingSlash';
-        if (!hasProp(configVike, prop, 'boolean') && !hasProp(configVike, prop, 'undefined'))
-            return { prop, errMsg: 'should be a boolean' };
-    }
-    {
-        const prop = 'redirects';
-        const { redirects } = configVike;
-        if (!(redirects === undefined ||
-            (isObject(redirects) && Object.values(redirects).every((v) => typeof v === 'string'))))
-            return { prop, errMsg: 'should be an object of strings' };
-    }
-    {
-        const prop = 'disableAutoFullBuild';
-        if (!hasProp(configVike, prop, 'boolean') &&
-            !hasProp(configVike, prop, 'undefined') &&
-            !(configVike[prop] === 'prerender'))
-            return { prop, errMsg: "should be a boolean or 'prerender'" };
-    }
-    {
-        const prop = 'includeAssetsImportedByServer';
-        if (!hasProp(configVike, prop, 'boolean') && !hasProp(configVike, prop, 'undefined'))
-            return { prop, errMsg: 'should be a boolean' };
-    }
-    {
-        const prop = 'prerender';
-        if (!hasProp(configVike, prop, 'object') &&
-            !hasProp(configVike, prop, 'boolean') &&
-            !hasProp(configVike, prop, 'undefined'))
-            return { prop, errMsg: 'should be an object or a boolean' };
-    }
-    const configVikePrerender = configVike.prerender;
-    if (typeof configVikePrerender === 'object') {
-        {
-            const p = 'partial';
-            if (!hasProp(configVikePrerender, p, 'boolean') && !hasProp(configVikePrerender, p, 'undefined'))
-                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'noExtraDir';
-            if (!hasProp(configVikePrerender, p, 'boolean') && !hasProp(configVikePrerender, p, 'undefined'))
-                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'disableAutoRun';
-            if (!hasProp(configVikePrerender, p, 'boolean') && !hasProp(configVikePrerender, p, 'undefined'))
-                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'parallel';
-            if (!hasProp(configVikePrerender, p, 'boolean') &&
-                !hasProp(configVikePrerender, p, 'number') &&
-                !hasProp(configVikePrerender, p, 'undefined'))
-                return { prop: `prerender.${p}`, errMsg: 'should be a boolean or a number' };
-        }
-    }
-    return null;
-}

package/dist/esm/node/plugin/plugins/config/index.d.ts

@@ -1,3 +0,0 @@
-export { resolveVikeConfig };
-import type { Plugin } from 'vite';
-declare function resolveVikeConfig(vikeConfig: unknown): Plugin;

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

@@ -1,76 +0,0 @@
-export { resolveVikeConfig };
-import { assertVikeConfig } from './assertVikeConfig.js';
-import { assert, isDevCheck } from '../../utils.js';
-import { pickFirst } from './pickFirst.js';
-import { resolveBase } from './resolveBase.js';
-import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
-import pc from '@brillout/picocolors';
-function resolveVikeConfig(vikeConfig) {
-    let isDev;
-    return {
-        name: 'vike:resolveVikeConfig',
-        enforce: 'pre',
-        apply(_config, env) {
-            isDev = isDevCheck(env);
-            return true;
-        },
-        async configResolved(config) {
-            assert(typeof isDev === 'boolean');
-            const promise = getConfigVikPromise(vikeConfig, config, isDev);
-            config.configVikePromise = promise;
-            await promise;
-        }
-    };
-}
-async function getConfigVikPromise(vikeConfig, config, isDev) {
-    const fromPluginOptions = (vikeConfig ?? {});
-    const fromViteConfig = (config.vike ?? {});
-    const configs = [fromPluginOptions, fromViteConfig];
-    assertVikeConfig(fromViteConfig, ({ prop, errMsg }) => `vite.config.js#vike.${prop} ${errMsg}`);
-    // TODO/v1-release: deprecate this
-    assertVikeConfig(fromPluginOptions, ({ prop, errMsg }) => `vite.config.js > vike option ${prop} ${errMsg}`);
-    const crawlWithGit = fromPluginOptions.crawl?.git ?? null;
-    const { globalVikeConfig: fromPlusConfigFile } = await getVikeConfig(config, isDev, { crawlWithGit });
-    configs.push(fromPlusConfigFile);
-    assertVikeConfig(fromPlusConfigFile, ({ prop, errMsg }) => {
-        // TODO: add config file path ?
-        return `config ${pc.cyan(prop)} ${errMsg}`;
-    });
-    const { baseServer, baseAssets } = resolveBase(configs, config);
-    const configVike = {
-        disableAutoFullBuild: pickFirst(configs.map((c) => c.disableAutoFullBuild)) ?? null,
-        prerender: resolvePrerenderOptions(configs),
-        includeAssetsImportedByServer: pickFirst(configs.map((c) => c.includeAssetsImportedByServer)) ?? true,
-        baseServer,
-        baseAssets,
-        redirects: merge(configs.map((c) => c.redirects)) ?? {},
-        disableUrlNormalization: pickFirst(configs.map((c) => c.disableUrlNormalization)) ?? false,
-        trailingSlash: pickFirst(configs.map((c) => c.trailingSlash)) ?? false,
-        crawl: {
-            git: crawlWithGit
-        }
-    };
-    return configVike;
-}
-function resolvePrerenderOptions(configs) {
-    if (!configs.some((c) => c.prerender)) {
-        return false;
-    }
-    const configsPrerender = configs.map((c) => c.prerender).filter(isObject);
-    return {
-        partial: pickFirst(configsPrerender.map((c) => c.partial)) ?? false,
-        noExtraDir: pickFirst(configsPrerender.map((c) => c.noExtraDir)) ?? false,
-        parallel: pickFirst(configsPrerender.map((c) => c.parallel)) ?? true,
-        disableAutoRun: pickFirst(configsPrerender.map((c) => c.disableAutoRun)) ?? false
-    };
-}
-function isObject(p) {
-    return typeof p === 'object';
-}
-function merge(objs) {
-    const obj = {};
-    objs.forEach((e) => {
-        Object.assign(obj, e);
-    });
-    return obj;
-}

package/dist/esm/node/plugin/plugins/config/pickFirst.d.ts

@@ -1 +0,0 @@
-export declare function pickFirst<T>(arr: T[]): T | undefined;

package/dist/esm/node/plugin/plugins/config/pickFirst.js

@@ -1,3 +0,0 @@
-export function pickFirst(arr) {
-    return arr.filter((v) => v !== undefined)[0];
-}

package/dist/esm/node/plugin/plugins/config/resolveBase.d.ts

@@ -1,10 +0,0 @@
-export { resolveBase };
-export { resolveBaseFromUserConfig };
-import type { ResolvedConfig, UserConfig } from 'vite';
-import type { ConfigVikeUserProvided } from '../../../../shared/ConfigVike.js';
-type BaseServers = {
-    baseServer: string;
-    baseAssets: string;
-};
-declare function resolveBase(configs: ConfigVikeUserProvided[], config: ResolvedConfig): BaseServers;
-declare function resolveBaseFromUserConfig(config: UserConfig, configVike: undefined | ConfigVikeUserProvided): BaseServers;

package/dist/esm/node/plugin/plugins/config/resolveBase.js

@@ -1,42 +0,0 @@
-export { resolveBase };
-export { resolveBaseFromUserConfig };
-import { assert, assertUsage, isBaseServer, isBaseAssets } from '../../utils.js';
-import { pickFirst } from './pickFirst.js';
-import pc from '@brillout/picocolors';
-function resolveBase(configs, config) {
-    const baseServer = pickFirst(configs.map((c) => c.baseServer)) ?? null;
-    const baseAssets = pickFirst(configs.map((c) => c.baseAssets)) ?? null;
-    let baseOriginal = config._baseOriginal;
-    if (baseOriginal === '/__UNSET__')
-        baseOriginal = null;
-    assert(baseOriginal === null || typeof baseOriginal == 'string');
-    return resolve(baseOriginal, baseServer, baseAssets);
-}
-function resolveBaseFromUserConfig(config, configVike) {
-    return resolve(config.base ?? null, configVike?.baseServer ?? null, configVike?.baseAssets ?? null);
-}
-function resolve(base, baseServer_, baseAssets_) {
-    {
-        const wrongBase = (val) => `should start with ${pc.cyan('/')}, ${pc.cyan('http://')}, or ${pc.cyan('https://')} (it's ${pc.cyan(val)} instead)`;
-        assertUsage(base === null || isBaseAssets(base), `vite.config.js#base ${wrongBase(base)}`);
-        assertUsage(baseAssets_ === null || isBaseAssets(baseAssets_), `Config ${pc.cyan('baseAssets')} ${wrongBase(baseAssets_)}`);
-        assertUsage(baseServer_ === null || baseServer_.startsWith('/'), `Config ${pc.cyan('baseServer')} should start with a leading slash ${pc.cyan('/')} (it's ${pc.cyan(String(baseServer_))} instead)`);
-    }
-    if (base) {
-        if (base.startsWith('http')) {
-            baseAssets_ = baseAssets_ ?? base;
-        }
-        else {
-            baseAssets_ = baseAssets_ ?? base;
-            baseServer_ = baseServer_ ?? base;
-        }
-    }
-    const baseServer = baseServer_ ?? '/';
-    const baseAssets = baseAssets_ ?? '/';
-    assert(isBaseAssets(baseAssets));
-    assert(isBaseServer(baseServer));
-    return {
-        baseServer,
-        baseAssets
-    };
-}

package/dist/esm/node/shared/getConfigVike.d.ts

@@ -1,4 +0,0 @@
-export { getConfigVike };
-import { ResolvedConfig } from 'vite';
-import type { ConfigVikeResolved } from '../../shared/ConfigVike.js';
-declare function getConfigVike(config: ResolvedConfig): Promise<ConfigVikeResolved>;

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

@@ -1,8 +0,0 @@
-export { getConfigVike };
-import { assert } from './utils.js';
-async function getConfigVike(config) {
-    const { configVikePromise } = config;
-    assert(configVikePromise);
-    const configVike = await configVikePromise;
-    return configVike;
-}

package/dist/esm/shared/ConfigVike.js

@@ -1 +0,0 @@
-export {};