vike 0.4.230 → 0.4.231-commit-a0ca5e4

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/assertExtensions.js

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertExtensionsConventions = assertExtensionsConventions;
 exports.assertExtensionsRequire = assertExtensionsRequire;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const isObjectOfStrings_js_1 = require("../../../../../../utils/isObjectOfStrings.js");
-const utils_js_1 = require("../../../../utils.js");
-const getVikeConfig_js_1 = require("../getVikeConfig.js");
+const utils_js_1 = require("../../utils.js");
+const resolveVikeConfigInternal_js_1 = require("../resolveVikeConfigInternal.js");
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
 function assertExtensionsConventions(plusFile) {
@@ -33,8 +32,8 @@ function assertExtensionName(plusFile) {
     const name = getNameValue(plusFile);
     (0, utils_js_1.assertUsage)(name, `Vike extension name missing: the config ${filePathToShowToUser} must define the setting ${picocolors_1.default.cyan('name')}`);
 }
-function assertExtensionsRequire(pageConfig) {
-    const plusFilesRelevantList = pageConfig.plusFiles;
+function assertExtensionsRequire(plusFiles) {
+    const plusFilesRelevantList = plusFiles;
     // Collect extensions
     const extensions = {};
     plusFilesRelevantList.forEach((plusFile) => {
@@ -46,37 +45,60 @@ function assertExtensionsRequire(pageConfig) {
     });
     // Enforce `require`
     plusFilesRelevantList.forEach((plusFile) => {
-        const require = getConfigRequireValue(plusFile);
+        const require = resolveRequireSetting(plusFile);
         if (!require)
             return;
         const name = getNameValue(plusFile);
         const filePathToShowToUser = getFilePathToShowToUser(plusFile);
         (0, utils_js_1.assertUsage)(name, `Setting ${picocolors_1.default.bold('name')} is required for being able to use setting ${picocolors_1.default.bold('require')} in ${filePathToShowToUser}.`);
-        Object.entries(require).forEach(([reqName, reqVersion]) => {
+        Object.entries(require).forEach(([reqName, req]) => {
             const errBase = `${picocolors_1.default.bold(name)} requires ${picocolors_1.default.bold(reqName)}`;
             if (reqName === 'vike') {
-                (0, utils_js_1.assertUsage)(isVersionRange(utils_js_1.PROJECT_VERSION, reqVersion), `${errBase} version ${picocolors_1.default.bold(reqVersion)}, but ${picocolors_1.default.bold(utils_js_1.PROJECT_VERSION)} is installed.`);
+                let errMsg = `${errBase} version ${picocolors_1.default.bold(req.version)}, but ${picocolors_1.default.bold(utils_js_1.PROJECT_VERSION)} is installed.`;
+                if (req.optional) {
+                    errMsg += " Either update it, or remove it (it's an optional peer dependency).";
+                }
+                (0, utils_js_1.assertUsage)(isVersionRange(utils_js_1.PROJECT_VERSION, req.version), errMsg);
                 return;
             }
             const extensionVersion = extensions[reqName];
-            (0, utils_js_1.assertUsage)(extensionVersion, `${errBase}.`);
-            (0, utils_js_1.assertUsage)(isVersionRange(extensionVersion, reqVersion), `${errBase} version ${picocolors_1.default.bold(reqVersion)}, but ${picocolors_1.default.bold(extensionVersion)} is installed.`);
+            if (!extensionVersion) {
+                if (req.optional) {
+                    return;
+                }
+                else {
+                    (0, utils_js_1.assertUsage)(false, `${errBase}.`);
+                }
+            }
+            (0, utils_js_1.assertUsage)(isVersionRange(extensionVersion, req.version), `${errBase} version ${picocolors_1.default.bold(req.version)}, but ${picocolors_1.default.bold(extensionVersion)} is installed.`);
         });
     });
 }
-function getConfigRequireValue(plusFile) {
-    const confVal = (0, getVikeConfig_js_1.getConfVal)(plusFile, 'require');
+function resolveRequireSetting(plusFile) {
+    const confVal = (0, resolveVikeConfigInternal_js_1.getConfVal)(plusFile, 'require');
     if (!confVal)
         return null;
     (0, utils_js_1.assert)(confVal.valueIsLoaded);
-    const require = confVal.value;
+    const requireValue = confVal.value;
     const { filePathToShowToUserResolved } = plusFile.filePath;
     (0, utils_js_1.assert)(filePathToShowToUserResolved);
-    (0, utils_js_1.assertUsage)((0, isObjectOfStrings_js_1.isObjectOfStrings)(require), `The setting ${picocolors_1.default.bold('require')} defined at ${filePathToShowToUserResolved} should be an object with string values (${picocolors_1.default.bold('Record<string, string>')}).`);
-    return require;
+    (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(requireValue), `The setting ${picocolors_1.default.bold('+require')} defined at ${filePathToShowToUserResolved} should be an object`);
+    const requireSetting = {};
+    Object.entries(requireValue).forEach(([reqName, req]) => {
+        if (typeof req === 'string') {
+            requireSetting[reqName] = { version: req, optional: false };
+            return;
+        }
+        if ((0, utils_js_1.isObject)(req)) {
+            requireSetting[reqName] = req;
+            return;
+        }
+        (0, utils_js_1.assertUsage)(false, `Invalid +require[${JSON.stringify(reqName)}] value ${picocolors_1.default.cyan(JSON.stringify(req))}`);
+    });
+    return requireSetting;
 }
 function getNameValue(plusFile) {
-    const confVal = (0, getVikeConfig_js_1.getConfVal)(plusFile, 'name');
+    const confVal = (0, resolveVikeConfigInternal_js_1.getConfVal)(plusFile, 'name');
     if (!confVal)
         return null;
     (0, utils_js_1.assert)(confVal.valueIsLoaded);

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/configDefinitionsBuiltIn.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configDefinitionsBuiltIn = void 0;
-const utils_js_1 = require("../../../../utils.js");
-const getConfigDefinedAt_js_1 = require("../../../../../../shared/page-configs/getConfigDefinedAt.js");
+const utils_js_1 = require("../../utils.js");
+const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true }
@@ -178,54 +178,41 @@ const configDefinitionsBuiltIn = {
     prerender: {
         env: { config: true },
         global: (value, { isGlobalLocation }) => typeof value === 'object' || isGlobalLocation,
-        type: ['boolean', 'object'],
         cumulative: true
     },
-    vite: { env: { config: true }, global: true, cumulative: true, type: 'object' },
+    vite: { env: { config: true }, global: true, cumulative: true },
     disableAutoFullBuild: {
         env: { config: true },
-        global: true,
-        type: [
-            'boolean',
-            // Can be 'prerender'
-            'string'
-        ]
+        global: true
     },
     vite6BuilderApp: {
         env: { config: true },
-        global: true,
-        type: 'boolean'
+        global: true
     },
     includeAssetsImportedByServer: {
         env: { config: true },
-        global: true,
-        type: 'boolean'
+        global: true
     },
     baseAssets: {
         env: { config: true, server: true },
-        global: true,
-        type: 'string'
+        global: true
     },
     baseServer: {
         env: { config: true, server: true },
-        global: true,
-        type: 'string'
+        global: true
     },
     redirects: {
         env: { server: true },
         global: true,
-        type: 'string{}',
         cumulative: true
     },
     trailingSlash: {
         env: { server: true },
-        global: true,
-        type: 'boolean'
+        global: true
     },
     disableUrlNormalization: {
         env: { server: true },
-        global: true,
-        type: 'boolean'
+        global: true
     }
 };
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/crawlPlusFiles.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.crawlPlusFiles = crawlPlusFiles;
 exports.isPlusFile = isPlusFile;
 exports.getPlusFileValueConfigName = getPlusFileValueConfigName;
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const path_1 = __importDefault(require("path"));
 const tinyglobby_1 = require("tinyglobby");
 const child_process_1 = require("child_process");
 const util_1 = require("util");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
-const getEnvVarObject_js_1 = require("../../../../shared/getEnvVarObject.js");
+const getEnvVarObject_js_1 = require("../getEnvVarObject.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const picomatch_1 = __importDefault(require("picomatch"));
 const ignorePatternsBuiltIn_js_1 = require("./crawlPlusFiles/ignorePatternsBuiltIn.js");

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/filesystemRouting.js

@@ -11,7 +11,7 @@ exports.sortAfterInheritanceOrder = sortAfterInheritanceOrder;
 exports.applyFilesystemRoutingRootEffect = applyFilesystemRoutingRootEffect;
 exports.getLogicalPath = getLogicalPath;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 /**
  * `getLocationId('/pages/some-page/+Page.js')` => `'/pages/some-page'`

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/getConfigFileExport.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigFileExport = getConfigFileExport;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const assertPlusFileExport_js_1 = require("../../../../../../shared/page-configs/assertPlusFileExport.js");
-const utils_js_1 = require("../../../../utils.js");
+const assertPlusFileExport_js_1 = require("../../../../shared/page-configs/assertPlusFileExport.js");
+const utils_js_1 = require("../../utils.js");
 function getConfigFileExport(fileExports, filePathToShowToUser) {
     (0, assertPlusFileExport_js_1.assertPlusFileExport)(fileExports, filePathToShowToUser, 'config');
     const usesNamedExport = !!fileExports.config;

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/getPlusFilesAll.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlusFilesAll = getPlusFilesAll;
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const configDefinitionsBuiltIn_js_1 = require("./configDefinitionsBuiltIn.js");
 const filesystemRouting_js_1 = require("./filesystemRouting.js");
 const crawlPlusFiles_js_1 = require("./crawlPlusFiles.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 const loadFileAtConfigTime_js_1 = require("./loadFileAtConfigTime.js");
 const resolvePointerImport_js_1 = require("./resolvePointerImport.js");
-const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
+const getFilePath_js_1 = require("../getFilePath.js");
 const assertExtensions_js_1 = require("./assertExtensions.js");
 async function getPlusFilesAll(userRootDir, esbuildCache) {
     const plusFiles = await findPlusFiles(userRootDir);
@@ -82,8 +82,14 @@ async function getPlusFilesAll(userRootDir, esbuildCache) {
     Object.entries(plusFilesAll).forEach(([_locationId, plusFiles]) => {
         plusFiles.sort(sortMakeDeterministic);
     });
+    assertPlusFiles(plusFilesAll);
     return plusFilesAll;
 }
+function assertPlusFiles(plusFilesAll) {
+    const plusFiles = Object.values(plusFilesAll).flat();
+    // The earlier we call it the better, so that +require can be used by Vike extensions to depend on new Vike features
+    (0, assertExtensions_js_1.assertExtensionsRequire)(plusFiles);
+}
 function getPlusFileFromConfigFile(configFile, isExtensionConfig, locationId, userRootDir) {
     const { fileExports, filePath, extendsFilePaths } = configFile;
     const fileExportsByConfigName = {};

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/loadFileAtConfigTime.js

@@ -7,22 +7,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPointerImport = loadPointerImport;
 exports.loadValueFile = loadValueFile;
 exports.loadConfigFile = loadConfigFile;
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
-const getVikeConfig_js_1 = require("../getVikeConfig.js");
-const assertPlusFileExport_js_1 = require("../../../../../../shared/page-configs/assertPlusFileExport.js");
+const resolveVikeConfigInternal_js_1 = require("../resolveVikeConfigInternal.js");
+const assertPlusFileExport_js_1 = require("../../../../shared/page-configs/assertPlusFileExport.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const pointerImports_js_1 = require("./pointerImports.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 const resolvePointerImport_js_1 = require("./resolvePointerImport.js");
-const getConfigDefinedAt_js_1 = require("../../../../../../shared/page-configs/getConfigDefinedAt.js");
+const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 // Load pointer import
 async function loadPointerImport(pointerImport, userRootDir, configName, configDefinitions, esbuildCache) {
     // The value of `extends` was already loaded and already used: we don't need the value of `extends` anymore
     if (configName === 'extends')
         return;
-    const configDef = (0, getVikeConfig_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
+    const configDef = (0, resolveVikeConfigInternal_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
     // Only load pointer import if `env.config===true`
     if (!configDef || !shouldBeLoadableAtBuildTime(configDef))
         return;
@@ -37,7 +37,7 @@ async function loadPointerImport(pointerImport, userRootDir, configName, configD
 // Load +{configName}.js
 async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir, esbuildCache) {
     const { configName } = interfaceValueFile;
-    const configDef = (0, getVikeConfig_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
+    const configDef = (0, resolveVikeConfigInternal_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
     // Only load value files with `env.config===true`
     if (!configDef || !shouldBeLoadableAtBuildTime(configDef))
         return;

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/pointerImports.js

@@ -23,7 +23,7 @@ exports.assertPointerImportPath = assertPointerImportPath;
 //   - Esbuild removes comments: https://github.com/evanw/esbuild/issues/1439#issuecomment-877656182
 //   - Using source maps to track these magic comments is brittle (source maps can easily break)
 const acorn_1 = require("acorn");
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function transformPointerImports(code, filePathToShowToUser2, pointerImports, 
 // For ./transformPointerImports.spec.ts

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/resolvePointerImport.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePointerImport = resolvePointerImport;
 exports.resolvePointerImportData = resolvePointerImportData;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const pointerImports_js_1 = require("./pointerImports.js");
-const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
+const getFilePath_js_1 = require("../getFilePath.js");
 function resolvePointerImport(configValue, importerFilePath, userRootDir, configName) {
     if (typeof configValue !== 'string')
         return null;

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/transpileAndExecuteFile.js

@@ -12,10 +12,10 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const import_1 = require("@brillout/import");
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const pointerImports_js_1 = require("./pointerImports.js");
 const source_map_support_1 = __importDefault(require("source-map-support"));
-const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
+const getFilePath_js_1 = require("../getFilePath.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 installSourceMapSupport();
 const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');