vike 0.4.142 → 0.4.143-commit-dc6fea0

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

@@ -54,7 +54,7 @@ function plugin(vikeConfig) {
 }
 exports.plugin = plugin;
 exports.ssr = plugin;
-// Enable `const ssr = require('vike/plugin')`.
+// Enable `const vike = require('vike/plugin')`.
 //  - This lives at the end of the file to ensure it happens after all assignments to `exports`.
 //  - This is only used for the CJS build; we wrap it in a try-catch for the ESM build.
 try {
@@ -65,6 +65,6 @@ catch { }
 Object.defineProperty(plugin, 'apply', {
     enumerable: true,
     get: () => {
-        (0, utils_js_1.assertUsage)(false, `Add ${picocolors_1.default.cyan('ssr()')} instead of ${picocolors_1.default.cyan('ssr')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
+        (0, utils_js_1.assertUsage)(false, `Add ${picocolors_1.default.cyan('vike()')} instead of ${picocolors_1.default.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
     }
 });

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

@@ -53,8 +53,10 @@ function buildConfig() {
         },
         async writeBundle(options, bundle) {
             const manifestEntry = bundle[manifestTempFile];
-            if (generateManifest) {
-                (0, utils_js_1.assert)(manifestEntry);
+            /* Fails with @vitejs/plugin-legacy because writeBundle() is called twice during the client build (once for normal client assets and a second time for legacy assets), see reproduction at https://github.com/vikejs/vike/issues/1154
+            assert(generateManifest === !!manifestEntry)
+            */
+            if (manifestEntry) {
                 const { dir } = options;
                 (0, utils_js_1.assert)(dir);
                 const manifestFilePathOld = path_1.default.join(dir, manifestEntry.fileName);
@@ -64,9 +66,6 @@ function buildConfig() {
                 const manifestFilePathNew = path_1.default.join(dir, '..', 'assets.json');
                 await promises_1.default.rename(manifestFilePathOld, manifestFilePathNew);
             }
-            else {
-                (0, utils_js_1.assert)(!manifestEntry);
-            }
         }
     };
 }

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

@@ -19,12 +19,7 @@ function commonConfig() {
         {
             name: 'vike-commonConfig-1',
             config: () => ({
-                appType: 'custom',
-                ssr: {
-                    // Needed as long as Vike is published as CJS.
-                    // TODO: can we remove this once Vike is published as ESM?
-                    external: ['vike', 'vike/server']
-                }
+                appType: 'custom'
             }),
             configResolved(config) {
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
@@ -76,5 +71,5 @@ function assertEsm(userViteRoot) {
     }
     (0, utils_js_1.assert)(dir.endsWith('/'));
     dir = picocolors_1.default.dim(dir);
-    (0, utils_js_1.assertWarning)(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module" (and therefore writing ESM code instead of CJS code), see https://vike.dev/CJS`, { onlyOnce: true });
+    (0, utils_js_1.assertWarning)(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
 }

package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -4,7 +4,7 @@ exports.determineOptimizeDeps = void 0;
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
 const utils_js_1 = require("../../utils.js");
 const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
-const getConfigValueSource_js_1 = require("../../shared/getConfigValueSource.js");
+const getConfigValueSourcesRelevant_js_1 = require("../../shared/getConfigValueSourcesRelevant.js");
 const buildConfig_js_1 = require("../buildConfig.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
 async function determineOptimizeDeps(config, configVike, isDev) {
@@ -33,7 +33,7 @@ async function getPageDeps(config, pageConfigs, isDev) {
     // V1 design
     {
         pageConfigs.forEach((pageConfig) => {
-            const configValueSourcesRelevant = (0, getConfigValueSource_js_1.getConfigValueSourcesRelevant)(pageConfig);
+            const configValueSourcesRelevant = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourcesRelevant)(pageConfig);
             configValueSourcesRelevant.forEach((configValueSource) => {
                 const { valueIsImportedAtRuntime, configEnv, definedAtInfo } = configValueSource;
                 if (!valueIsImportedAtRuntime)

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

@@ -43,11 +43,9 @@ function envVarsPlugin() {
                 if (isPrivate && isClientSide) {
                     if (!code.includes(varName))
                         return;
-                    const filePathVite = (0, utils_js_1.getFilePathVite)(id, config.root);
-                    const errMsgAddendum = isBuild
-                        ? ''
-                        : ' (vike will prevent your app from building for production)';
-                    const errMsg = `${varName} used in ${filePathVite} and therefore included in client-side bundle which can be be a security leak${errMsgAddendum}, remove ${varName} or rename ${key} to ${keyPublic}, see https://vike.dev/env`;
+                    const filePathToShowToUser = (0, utils_js_1.getFilePathRelativeToUserRootDir)(id, config.root);
+                    const errMsgAddendum = isBuild ? '' : ' (vike will prevent your app from building for production)';
+                    const errMsg = `${varName} used in ${filePathToShowToUser} and therefore included in client-side bundle which can be be a security leak${errMsgAddendum}, remove ${varName} or rename ${key} to ${keyPublic}, see https://vike.dev/env`;
                     if (isBuild) {
                         (0, utils_js_1.assertUsage)(false, errMsg);
                     }

package/dist/cjs/node/plugin/plugins/importUserCode/generateEagerImport.js

@@ -2,20 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateEagerImport = void 0;
 let varCounterGlobal = 0;
-function generateEagerImport(importPath, varCounter, importName) {
+/**
+ * Naming:
+ *   `import { someExport as someImport } from './some-file'`
+ * <=>
+ *   `{`
+ *      `importPath: './some-file',`
+ *      `exportName: 'someExport',`
+ *      `importName: 'someImport',`
+ *    `}`
+ * We discard the information that the import variable is called `someImport` because we don't need it.
+ */
+function generateEagerImport(importPath, varCounter, exportName) {
     if (varCounter === undefined)
         varCounter = varCounterGlobal++;
-    const importVar = `import_${varCounter}`;
+    const importName = `import_${varCounter}`;
     const importLiteral = (() => {
-        if (!importName || importName === '*') {
-            return `* as ${importVar}`;
+        if (!exportName || exportName === '*') {
+            return `* as ${importName}`;
         }
-        if (importName === 'default') {
-            return importVar;
+        if (exportName === 'default') {
+            return importName;
         }
-        return `{ ${importName} as ${importVar} }`;
+        return `{ ${exportName} as ${importName} }`;
     })();
     const importStatement = `import ${importLiteral} from '${importPath}';`;
-    return { importVar, importStatement };
+    return { importName, importStatement };
 }
 exports.generateEagerImport = generateEagerImport;

package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -127,9 +127,9 @@ function addImport(importPath, fileType, exportNames, isBuild) {
             return `() => import('${importPath}${query}')`;
         }
         else {
-            const { importVar, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(`${importPath}${query}`);
+            const { importName, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(`${importPath}${query}`);
             fileContent += importStatement + '\n';
-            return importVar;
+            return importName;
         }
     })();
     fileContent += `${mapVar}['${importPath}'] = ${value};\n`;

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

@@ -122,7 +122,7 @@ function isVikeConfigModule(filePathAbsolute) {
 }
 function reloadConfig(filePath, config, configVike, op) {
     {
-        const filePathToShowToUser = picocolors_1.default.dim((0, utils_js_1.getFilePathVite)(filePath, config.root, true));
+        const filePathToShowToUser = picocolors_1.default.dim((0, utils_js_1.getFilePathRelativeToUserRootDir)(filePath, config.root, true));
         const msg = `${op} ${filePathToShowToUser}`;
         (0, loggerNotProd_js_1.logConfigInfo)(msg, 'info');
     }

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getFilePathToShowToUser.js

@@ -2,6 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFilePathToShowToUser = void 0;
 const utils_js_1 = require("../../../utils.js");
+/*
+const f: FilePath = 1 as any
+if (f.filePathRelativeToUserRootDir === null) {
+  f.importPathAbsolute
+}
+//*/
 function getFilePathToShowToUser(filePath) {
     const filePathToShowToUser = filePath.filePathRelativeToUserRootDir ?? filePath.filePathAbsolute;
     (0, utils_js_1.assert)(filePathToShowToUser);