@vercel/node 2.5.0 → 2.5.1

package/dist/dev-server.js

@@ -210,10 +210,11 @@ async function createEdgeRuntime(params) {
             initialCode: params.userCode,
             extend: (context) => {
                 Object.assign(context, {
-                    __dirname: '',
-                    module: {
-                        exports: {},
-                    },
+                    // This is required for esbuild wrapping logic to resolve
+                    module: {},
+                    // This is required for environment variable access.
+                    // In production, env var access is provided by static analysis
+                    // so that only the used values are available.
                     process: {
                         env: process.env,
                     },

package/dist/index.js

@@ -304374,7 +304374,7 @@ function renameTStoJS(path) {
     }
     return path;
 }
-async function compile(workPath, baseDir, entrypointPath, config, nodeVersion) {
+async function compile(workPath, baseDir, entrypointPath, config, nodeVersion, isEdgeFunction) {
     const inputFiles = new Set([entrypointPath]);
     const preparedFiles = {};
     const sourceCache = new Map();
@@ -304430,32 +304430,49 @@ async function compile(workPath, baseDir, entrypointPath, config, nodeVersion) {
         ignore: config.excludeFiles,
         async readFile(fsPath) {
             const relPath = path_1.relative(baseDir, fsPath);
+            // If this file has already been read then return from the cache
             const cached = sourceCache.get(relPath);
-            if (cached)
-                return cached.toString();
-            // null represents a not found
-            if (cached === null)
-                return null;
+            if (typeof cached !== 'undefined')
+                return cached;
             try {
+                let entry;
                 let source = fs_1.readFileSync(fsPath);
-                if ((fsPath.endsWith('.ts') && !fsPath.endsWith('.d.ts')) ||
-                    fsPath.endsWith('.tsx')) {
-                    source = compileTypeScript(fsPath, source.toString());
-                }
                 const { mode } = fs_1.lstatSync(fsPath);
-                let entry;
                 if (build_utils_1.isSymbolicLink(mode)) {
                     entry = new build_utils_1.FileFsRef({ fsPath, mode });
                 }
-                else {
+                if (isEdgeFunction && path_1.basename(fsPath) === 'package.json') {
+                    // For Edge Functions, patch "main" field to prefer "browser" or "module"
+                    const pkgJson = JSON.parse(source.toString());
+                    for (const prop of ['browser', 'module']) {
+                        const val = pkgJson[prop];
+                        if (typeof val === 'string') {
+                            build_utils_1.debug(`Using "${prop}" field in ${fsPath}`);
+                            pkgJson.main = val;
+                            // Create the `entry` with the original so that the output is unmodified
+                            if (!entry) {
+                                entry = new build_utils_1.FileBlob({ data: source, mode });
+                            }
+                            // Return the modified `package.json` to nft
+                            source = JSON.stringify(pkgJson);
+                            break;
+                        }
+                    }
+                }
+                if ((fsPath.endsWith('.ts') && !fsPath.endsWith('.d.ts')) ||
+                    fsPath.endsWith('.tsx')) {
+                    source = compileTypeScript(fsPath, source.toString());
+                }
+                if (!entry) {
                     entry = new build_utils_1.FileBlob({ data: source, mode });
                 }
                 fsCache.set(relPath, entry);
                 sourceCache.set(relPath, source);
-                return source.toString();
+                return source;
             }
             catch (e) {
                 if (e.code === 'ENOENT' || e.code === 'EISDIR') {
+                    // `null` represents a not found
                     sourceCache.set(relPath, null);
                     return null;
                 }
@@ -304570,14 +304587,6 @@ const build = async ({ files, entrypoint, workPath, repoRootPath, config = {}, m
     await build_utils_1.runPackageJsonScript(entrypointFsDirname, 
     // Don't consider "build" script since its intended for frontend code
     ['vercel-build', 'now-build'], spawnOpts);
-    build_utils_1.debug('Tracing input files...');
-    const traceTime = Date.now();
-    const { preparedFiles, shouldAddSourcemapSupport } = await compile(workPath, baseDir, entrypointPath, config, nodeVersion);
-    build_utils_1.debug(`Trace complete [${Date.now() - traceTime}ms]`);
-    let routes;
-    let output;
-    const handler = renameTStoJS(path_1.relative(baseDir, entrypointPath));
-    const outputPath = utils_1.entrypointToOutputPath(entrypoint, config.zeroConfig);
     const isMiddleware = config.middleware === true;
     // Will output an `EdgeFunction` for when `config.middleware = true`
     // (i.e. for root-level "middleware" file) or if source code contains:
@@ -304591,6 +304600,14 @@ const build = async ({ files, entrypoint, workPath, repoRootPath, config = {}, m
         }
         isEdgeFunction = staticConfig.runtime === 'experimental-edge';
     }
+    build_utils_1.debug('Tracing input files...');
+    const traceTime = Date.now();
+    const { preparedFiles, shouldAddSourcemapSupport } = await compile(workPath, baseDir, entrypointPath, config, nodeVersion, isEdgeFunction);
+    build_utils_1.debug(`Trace complete [${Date.now() - traceTime}ms]`);
+    let routes;
+    let output;
+    const handler = renameTStoJS(path_1.relative(baseDir, entrypointPath));
+    const outputPath = utils_1.entrypointToOutputPath(entrypoint, config.zeroConfig);
     // Add a `route` for Middleware
     if (isMiddleware) {
         if (!isEdgeFunction) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@types/node": "*",
-    "@vercel/build-utils": "5.0.5",
+    "@vercel/build-utils": "5.0.6",
     "@vercel/node-bridge": "3.0.0",
     "@vercel/static-config": "2.0.1",
     "edge-runtime": "1.0.1",
@@ -61,5 +61,5 @@
     "source-map-support": "0.5.12",
     "test-listen": "1.1.0"
   },
-  "gitHead": "4773ff5efd84a6dbf698c6f1f0a08718110ffa2d"
+  "gitHead": "90c18959498cfa852bc56adffcdd16a8bbcbcce6"
 }