@vercel/redwood 2.0.9 → 2.1.0

package/dist/index.js

@@ -26,6 +26,8 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_path = require("path");
+var import_ts_morph = require("ts-morph");
+var import_static_config = require("@vercel/static-config");
 var import_fs = require("fs");
 var import_semver = require("semver");
 var import_build_utils = require("@vercel/build-utils");
@@ -60,12 +62,14 @@ var build = async ({
   if (!spawnOpts.env) {
     spawnOpts.env = {};
   }
-  const { cliType, lockfileVersion } = await (0, import_build_utils.scanParentDirs)(
-    entrypointFsDirname
+  const { cliType, lockfileVersion, packageJson } = await (0, import_build_utils.scanParentDirs)(
+    entrypointFsDirname,
+    true
   );
   spawnOpts.env = (0, import_build_utils.getEnvForPackageManager)({
     cliType,
     lockfileVersion,
+    packageJsonPackageManager: packageJson?.packageManager,
     nodeVersion,
     env: spawnOpts.env || {}
   });
@@ -140,20 +144,21 @@ var build = async ({
       staticOutputs[(0, import_path.relative)(webDistPath, pathWithoutHtmlExtension)] = fileFsRef;
     }
   }
-  const functionFiles = {
-    ...await (0, import_build_utils.glob)("*.js", apiDistPath),
-    // top-level
-    ...await (0, import_build_utils.glob)("*/*.js", apiDistPath)
-    // one-level deep
-  };
+  const functionFiles = await (0, import_build_utils.glob)("**/*.{js,ts}", apiDistPath);
   const sourceCache = /* @__PURE__ */ new Map();
   const fsCache = /* @__PURE__ */ new Map();
+  const project = new import_ts_morph.Project();
   for (const [funcName, fileFsRef] of Object.entries(functionFiles)) {
     const outputName = (0, import_path.join)(apiDir, (0, import_path.parse)(funcName).name);
     const absEntrypoint = fileFsRef.fsPath;
     const relativeEntrypoint = (0, import_path.relative)(workPath, absEntrypoint);
     const awsLambdaHandler = getAWSLambdaHandler(relativeEntrypoint, "handler");
-    const sourceFile = relativeEntrypoint.replace("/dist/", "/src/");
+    let sourceFile = relativeEntrypoint.replace("/dist/", "/src/");
+    const sourceFileBase = (0, import_path.basename)(sourceFile, ".js");
+    const sourceFileDir = (0, import_path.dirname)(sourceFile);
+    if ((0, import_fs.existsSync)((0, import_path.join)(sourceFileDir, `${sourceFileBase}.ts`))) {
+      sourceFile = (0, import_path.join)(sourceFileDir, `${sourceFileBase}.ts`);
+    }
     const { fileList, esmFileList, warnings } = await (0, import_nft.nodeFileTrace)(
       [absEntrypoint],
       {
@@ -202,18 +207,20 @@ var build = async ({
       });
     }
     lambdaFiles[(0, import_path.relative)(workPath, fileFsRef.fsPath)] = fileFsRef;
-    const lambdaOptions = await (0, import_build_utils.getLambdaOptionsFromFunction)({
-      sourceFile,
-      config
-    });
+    const staticConfig = (0, import_static_config.getConfig)(project, sourceFile);
+    const regions = staticConfig?.regions;
+    if (regions && !Array.isArray(regions)) {
+      throw new Error('"regions" configuration must be an array');
+    }
     const lambda = new import_build_utils.NodejsLambda({
+      ...staticConfig,
+      regions,
       files: lambdaFiles,
       handler: relativeEntrypoint,
       runtime: nodeVersion.runtime,
       shouldAddHelpers: false,
       shouldAddSourcemapSupport: false,
-      awsLambdaHandler,
-      ...lambdaOptions
+      awsLambdaHandler
     });
     lambdaOutputs[outputName] = lambda;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/redwood",
-  "version": "2.0.9",
+  "version": "2.1.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs",
@@ -13,24 +13,23 @@
     "directory": "packages/redwood"
   },
   "dependencies": {
-    "@vercel/nft": "0.27.0",
+    "@vercel/nft": "0.27.2",
     "@vercel/routing-utils": "3.1.0",
-    "semver": "6.3.1"
+    "@vercel/static-config": "3.0.0",
+    "semver": "6.3.1",
+    "ts-morph": "12.0.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.19",
     "@types/node": "14.18.33",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "8.1.0",
+    "@vercel/build-utils": "8.3.0",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",
-    "test-e2e": "pnpm test test/test.js",
-    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",
-    "test-unit": "pnpm test test/prepare-cache.test.js",
     "type-check": "tsc --noEmit"
   }
 }