@vercel/node 2.5.10 → 2.5.11

package/dist/index.js

@@ -226990,7 +226990,7 @@ async function analyze(id, code, job) {
                 .filter(name => !excludeAssetExtensions.has(path_1.default.extname(name)) &&
                 !excludeAssetFiles.has(path_1.default.basename(name)) &&
                 !name.endsWith('/'))
-                .forEach(file => assets.add(file));
+                .forEach(file => deps.add(file));
         });
     }
     async function processRequireArg(expression, isImport = false) {
@@ -227023,7 +227023,7 @@ async function analyze(id, code, job) {
     let scope = rollup_pluginutils_1.attachScopes(ast, 'scope');
     if (isAst(ast)) {
         wrappers_1.handleWrappers(ast);
-        await special_cases_1.default({ id, ast, emitAsset: path => assets.add(path), emitAssetDirectory, job });
+        await special_cases_1.default({ id, ast, emitDependency: path => deps.add(path), emitAsset: path => assets.add(path), emitAssetDirectory, job });
     }
     async function backtrack(parent, context) {
         // computing a static expression outward
@@ -227110,6 +227110,18 @@ async function analyze(id, code, job) {
                     await processRequireArg(node.arguments[0]);
                     return;
                 }
+                else if ((!isESM || job.mixedModules) &&
+                    node.callee.type === 'MemberExpression' &&
+                    node.callee.object.type === 'Identifier' &&
+                    node.callee.object.name === 'require' &&
+                    knownBindings.require.shadowDepth === 0 &&
+                    node.callee.property.type === 'Identifier' &&
+                    !node.callee.computed &&
+                    node.callee.property.name === 'resolve' &&
+                    node.arguments.length) {
+                    await processRequireArg(node.arguments[0]);
+                    return;
+                }
                 const calleeValue = job.analysis.evaluatePureExpressions && await computePureStaticValue(node.callee, false);
                 // if we have a direct pure static function,
                 // and that function has a [TRIGGER] symbol -> trigger asset emission from it
@@ -227794,12 +227806,15 @@ class Job {
             return;
         if (path.endsWith('.node'))
             return await sharedlib_emit_1.sharedLibEmit(path, this);
-        // js files require the "type": "module" lookup, so always emit the package.json
-        if (path.endsWith('.js')) {
-            const pjsonBoundary = await this.getPjsonBoundary(path);
-            if (pjsonBoundary)
-                await this.emitFile(pjsonBoundary + path_1.sep + 'package.json', 'resolve', path);
-        }
+        const handlePjsonBoundary = async (item) => {
+            // js files require the "type": "module" lookup, so always emit the package.json
+            if (item.endsWith(".js")) {
+                const pjsonBoundary = await this.getPjsonBoundary(item);
+                if (pjsonBoundary)
+                    await this.emitFile(pjsonBoundary + path_1.sep + "package.json", "resolve", item);
+            }
+        };
+        await handlePjsonBoundary(path);
         let analyzeResult;
         const cachedAnalysis = this.analysisCache.get(path);
         if (cachedAnalysis) {
@@ -227809,6 +227824,9 @@ class Job {
             const source = await this.readFile(path);
             if (source === null)
                 throw new Error('File ' + path + ' does not exist.');
+            // analyze should not have any side-effects e.g. calling `job.emitFile` 
+            // directly as this will not be included in the cachedAnalysis and won't
+            // be emit for successive runs that leverage the cache
             analyzeResult = await analyze_1.default(path, source.toString(), this);
             this.analysisCache.set(path, analyzeResult);
         }
@@ -227817,12 +227835,8 @@ class Job {
             this.esmFileList.add(path_1.relative(this.base, path));
         await Promise.all([
             ...[...assets].map(async (asset) => {
-                const ext = path_1.extname(asset);
-                if (ext === '.js' || ext === '.mjs' || ext === '.node' || ext === '' ||
-                    this.ts && (ext === '.ts' || ext === '.tsx') && asset.startsWith(this.base) && asset.slice(this.base.length).indexOf(path_1.sep + 'node_modules' + path_1.sep) === -1)
-                    await this.emitDependency(asset, path);
-                else
-                    await this.emitFile(asset, 'asset', path);
+                await handlePjsonBoundary(asset);
+                await this.emitFile(asset, 'asset', path);
             }),
             ...[...deps].map(async (dep) => {
                 try {
@@ -228653,18 +228667,18 @@ const specialCases = {
             emitAsset(path_1.resolve(path_1.dirname(id), '../data/geo.dat'));
         }
     },
-    'pixelmatch'({ id, emitAsset }) {
+    'pixelmatch'({ id, emitDependency }) {
         if (id.endsWith('pixelmatch/index.js')) {
-            emitAsset(path_1.resolve(path_1.dirname(id), 'bin/pixelmatch'));
+            emitDependency(path_1.resolve(path_1.dirname(id), 'bin/pixelmatch'));
         }
     }
 };
-async function handleSpecialCases({ id, ast, emitAsset, emitAssetDirectory, job }) {
+async function handleSpecialCases({ id, ast, emitDependency, emitAsset, emitAssetDirectory, job }) {
     const pkgName = get_package_base_1.getPackageName(id);
     const specialCase = specialCases[pkgName || ''];
     id = id.replace(/\\/g, '/');
     if (specialCase)
-        await specialCase({ id, ast, emitAsset, emitAssetDirectory, job });
+        await specialCase({ id, ast, emitDependency, emitAsset, emitAssetDirectory, job });
 }
 exports.default = handleSpecialCases;
 ;
@@ -304763,8 +304777,6 @@ async function compile(workPath, baseDir, entrypointPath, config, nodeVersion, i
             }));
         }
     }
-    build_utils_1.debug('Tracing input files: ' +
-        [...inputFiles].map(p => path_1.relative(workPath, p)).join(', '));
     let tsCompile;
     function compileTypeScript(path, source) {
         const relPath = path_1.relative(baseDir, path);
@@ -304848,9 +304860,7 @@ async function compile(workPath, baseDir, entrypointPath, config, nodeVersion, i
         },
     });
     for (const warning of warnings) {
-        if (warning?.stack) {
-            build_utils_1.debug(warning.stack.replace('Error: ', 'Warning: '));
-        }
+        build_utils_1.debug(`Warning from trace: ${warning.message}`);
     }
     for (const path of fileList) {
         let entry = fsCache.get(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "2.5.10",
+  "version": "2.5.11",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@edge-runtime/vm": "1.1.0-beta.23",
     "@types/node": "*",
-    "@vercel/build-utils": "5.3.2",
+    "@vercel/build-utils": "5.4.0",
     "@vercel/node-bridge": "3.0.0",
     "@vercel/static-config": "2.0.3",
     "edge-runtime": "1.1.0-beta.23",
@@ -53,7 +53,7 @@
     "@types/node-fetch": "^2.6.1",
     "@types/test-listen": "1.1.0",
     "@vercel/ncc": "0.24.0",
-    "@vercel/nft": "0.21.0",
+    "@vercel/nft": "0.22.0",
     "content-type": "1.0.4",
     "cookie": "0.4.0",
     "etag": "1.8.1",
@@ -61,5 +61,5 @@
     "source-map-support": "0.5.12",
     "test-listen": "1.1.0"
   },
-  "gitHead": "6700630feb23bdb4e94ea727911a9e10aa546361"
+  "gitHead": "e7e0a55b72bc73c26661f7b2a3caa0884a5d1764"
 }