vike 0.4.220 → 0.4.221-commit-8577456

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

@@ -3,37 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePointerImportOfConfig = resolvePointerImportOfConfig;
 exports.resolvePointerImport = resolvePointerImport;
-exports.clearFilesEnvMap = clearFilesEnvMap;
-exports.resolveConfigEnvWithFileName = resolveConfigEnvWithFileName;
+exports.resolvePointerImportData = resolvePointerImportData;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../../../../utils.js");
 const transformPointerImports_js_1 = require("./transformPointerImports.js");
 const path_1 = __importDefault(require("path"));
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
-const filesEnvMap = new Map();
-function resolvePointerImportOfConfig(configValue, importerFilePath, userRootDir, configEnv, configName) {
+function resolvePointerImport(configValue, importerFilePath, userRootDir, configName) {
     if (typeof configValue !== 'string')
         return null;
     const pointerImportData = (0, transformPointerImports_js_1.parsePointerImportData)(configValue);
     if (!pointerImportData)
         return null;
-    const { importPath, exportName } = pointerImportData;
-    const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
+    const { exportName } = pointerImportData;
+    const filePath = resolvePointerImportData(pointerImportData, importerFilePath, userRootDir);
     const fileExportPathToShowToUser = exportName === 'default' || exportName === configName ? [] : [exportName];
-    let configEnvResolved = configEnv;
-    if (filePath.filePathAbsoluteFilesystem)
-        configEnvResolved = resolveConfigEnvWithFileName(configEnv, filePath);
-    assertUsageFileEnv(filePath, importPath, configEnvResolved, configName);
-    const pointerImport = {
+    const fileExportPath = {
         ...filePath,
         fileExportName: exportName,
         fileExportPathToShowToUser
     };
-    return { pointerImport, configEnvResolved };
+    return { fileExportPath };
 }
-function resolvePointerImport(pointerImportData, importerFilePath, userRootDir) {
+function resolvePointerImportData(pointerImportData, importerFilePath, userRootDir) {
     // `importPath` should be one of the following:
     // - A relative import path
     // - A filesystem absolute path
@@ -44,7 +37,7 @@ function resolvePointerImport(pointerImportData, importerFilePath, userRootDir)
     (0, utils_js_1.assertPosixPath)(importPath);
     if (importPath.startsWith('.') || (0, utils_js_1.isFilePathAbsolute)(importPath)) {
         if (importPath.startsWith('.')) {
-            (0, utils_js_1.assertUsage)(isRelativeImportPath(importPath), `Invalid relative import path ${picocolors_1.default.code(importPath)} defined by ${importerFilePath.filePathToShowToUser} because it should start with ${picocolors_1.default.code('./')} or ${picocolors_1.default.code('../')}, or use an npm package import instead.`);
+            (0, utils_js_1.assertUsage)((0, utils_js_1.pathIsRelative)(importPath), `Invalid relative import path ${picocolors_1.default.code(importPath)} defined by ${importerFilePath.filePathToShowToUser} because it should start with ${picocolors_1.default.code('./')} or ${picocolors_1.default.code('../')}, or use an npm package import instead.`);
         }
         // Pointer imports are included in virtual files, thus relative imports need to be resolved. (Virtual modules cannot contain relative imports.)
         assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportData, importerFilePath);
@@ -100,7 +93,7 @@ function assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportD
             : `The import ${picocolors_1.default.code(importString)} defined by ${filePathToShowToUser}`;
         const errIntro2 = `${errIntro} couldn't be resolved: does ${importPathString}`;
         if (importPath.startsWith('.')) {
-            (0, utils_js_1.assert)(isRelativeImportPath(importPath));
+            (0, utils_js_1.assert)((0, utils_js_1.pathIsRelative)(importPath));
             (0, utils_js_1.assertUsage)(false, `${errIntro2} point to an existing file?`);
         }
         else {
@@ -108,51 +101,3 @@ function assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportD
         }
     }
 }
-function assertUsageFileEnv(filePath, importPath, configEnvResolved, configName) {
-    let key;
-    if (filePath.filePathAbsoluteFilesystem) {
-        key = filePath.filePathAbsoluteFilesystem;
-    }
-    else {
-        // Path alias
-        (0, utils_js_1.assert)(!isRelativeImportPath(importPath));
-        key = importPath;
-    }
-    (0, utils_js_1.assertPosixPath)(key);
-    if (!filesEnvMap.has(key)) {
-        filesEnvMap.set(key, []);
-    }
-    const fileEnv = filesEnvMap.get(key);
-    fileEnv.push({ configEnvResolved, configName });
-    const configDifferentEnv = fileEnv.filter((c) => !(0, utils_js_1.deepEqual)(c.configEnvResolved, configEnvResolved))[0];
-    if (configDifferentEnv) {
-        (0, utils_js_1.assertUsage)(false, [
-            `${key} defines the value of configs living in different environments:`,
-            ...[configDifferentEnv, { configName, configEnvResolved }].map((c) => `  - config ${picocolors_1.default.code(c.configName)} which value lives in environment ${picocolors_1.default.code(JSON.stringify(c.configEnvResolved))}`),
-            'Defining config values in the same file is allowed only if they live in the same environment, see https://vike.dev/config#pointer-imports'
-        ].join('\n'));
-    }
-}
-function clearFilesEnvMap() {
-    filesEnvMap.clear();
-}
-function resolveConfigEnvWithFileName(configEnv, filePath) {
-    const { fileName } = filePath;
-    const configEnvResolved = { ...configEnv };
-    if (fileName.includes('.server.')) {
-        configEnvResolved.server = true;
-        configEnvResolved.client = false;
-    }
-    else if (fileName.includes('.client.')) {
-        configEnvResolved.client = true;
-        configEnvResolved.server = false;
-    }
-    else if (fileName.includes('.shared.')) {
-        configEnvResolved.server = true;
-        configEnvResolved.client = true;
-    }
-    return configEnvResolved;
-}
-function isRelativeImportPath(importPath) {
-    return importPath.startsWith('./') || importPath.startsWith('../');
-}

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

@@ -26,25 +26,31 @@ const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');
 const debugEsbuildResolve = (0, utils_js_1.createDebugger)('vike:esbuild-resolve');
 if (debugEsbuildResolve.isActivated)
     debugEsbuildResolve('esbuild version', esbuild_1.version);
-async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile) {
+async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile, esbuildCache) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
+    if (esbuildCache[filePathAbsoluteFilesystem]) {
+        return await esbuildCache[filePathAbsoluteFilesystem];
+    }
+    const { promise, resolve } = (0, utils_js_1.genPromise)();
+    esbuildCache[filePathAbsoluteFilesystem] = promise;
     (0, utils_js_1.assertUsage)((0, utils_js_1.isPlainJavaScriptFile)(filePathAbsoluteFilesystem), `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
     const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     if (isHeader) {
         (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${picocolors_1.default.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
     }
+    let fileExports;
     if (isConfigFile === 'is-extension-config' && !isHeader && fileExtension.endsWith('js')) {
         // This doesn't track dependencies => we should never use this for user land configs
-        const fileExports = await executeFile(filePathAbsoluteFilesystem, filePath);
-        return { fileExports };
+        fileExports = await executeFile(filePathAbsoluteFilesystem, filePath);
     }
     else {
         const transformImports = isConfigFile && (isHeader ? 'all' : true);
         const code = await transpileFile(filePath, transformImports, userRootDir);
-        const fileExports = await executeTranspiledFile(filePath, code);
-        return { fileExports };
+        fileExports = await executeTranspiledFile(filePath, code);
     }
+    resolve({ fileExports });
+    return { fileExports };
 }
 async function transpileFile(filePath, transformImports, userRootDir) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;