@vercel/express 0.0.12 → 0.0.13

package/dist/index.js

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   build: () => build,
+  entrypointCallback: () => entrypointCallback,
   findEntrypoint: () => findEntrypoint,
   shouldServe: () => shouldServe,
   startDevServer: () => startDevServer,
@@ -39,52 +40,93 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/build.ts
+var import_build_utils = require("@vercel/build-utils");
 var import_node = require("@vercel/node");
 var import_path = require("path");
 var import_fs = __toESM(require("fs"));
 var REGEX = /(?:from|require|import)\s*(?:\(\s*)?["']express["']\s*(?:\))?/g;
+var validFilenames = [
+  "app",
+  "index",
+  "server",
+  "src/app",
+  "src/index",
+  "src/server"
+];
+var validExtensions = ["js", "cjs", "mjs", "ts", "cts", "mts"];
+var entrypointsForMessage = validFilenames.map((filename) => `- ${filename}.{${validExtensions.join(",")}}`).join("\n");
 var build = async (args) => {
-  const entrypoint = findEntrypoint(args.files);
   process.env.EXPERIMENTAL_NODE_TYPESCRIPT_ERRORS = "1";
-  return (0, import_node.build)({
+  const includeFiles = ["views/**/*"];
+  const includeFilesFromConfig = args.config.includeFiles;
+  if (includeFilesFromConfig) {
+    includeFiles.push(...includeFilesFromConfig);
+  }
+  const res = await (0, import_node.build)({
     ...args,
-    entrypoint,
+    config: {
+      ...args.config,
+      includeFiles
+    },
+    // this is package.json, but we'll replace it with the return value of the entrypointCallback
+    // after install and build scripts have had a chance to run
+    entrypoint: "package.json",
     considerBuildCommand: true,
-    entrypointCallback: (preparedFiles) => {
-      return findEntrypoint(preparedFiles);
+    entrypointCallback: async () => {
+      return entrypointCallback(args);
     }
   });
+  return res;
+};
+var entrypointCallback = async (args) => {
+  const mainPackageEntrypoint = findMainPackageEntrypoint(args.files);
+  const entrypointGlob = `{${validFilenames.map((entrypoint) => `${entrypoint}`).join(",")}}.{${validExtensions.join(",")}}`;
+  const dir = args.config.projectSettings?.outputDirectory?.replace(
+    /^\/+|\/+$/g,
+    ""
+  );
+  if (dir) {
+    const entrypointFromOutputDir = findEntrypoint(
+      await (0, import_build_utils.glob)(entrypointGlob, (0, import_path.join)(args.workPath, dir))
+    );
+    if (entrypointFromOutputDir) {
+      return (0, import_path.join)(dir, entrypointFromOutputDir);
+    }
+    throw new Error(
+      `No entrypoint found in output directory: "${dir}". Searched for: 
+${entrypointsForMessage}`
+    );
+  }
+  const files = await (0, import_build_utils.glob)(entrypointGlob, args.workPath);
+  const entrypointFromRoot = findEntrypoint(files);
+  if (entrypointFromRoot) {
+    return entrypointFromRoot;
+  }
+  if (mainPackageEntrypoint) {
+    const entrypointFromPackageJson = await (0, import_build_utils.glob)(
+      mainPackageEntrypoint,
+      args.workPath
+    );
+    if (entrypointFromPackageJson[mainPackageEntrypoint]) {
+      if (checkMatchesRegex(entrypointFromPackageJson[mainPackageEntrypoint])) {
+        return mainPackageEntrypoint;
+      }
+    }
+  }
+  throw new Error(
+    `No entrypoint found. Searched for: 
+${entrypointsForMessage}`
+  );
 };
 var findEntrypoint = (files) => {
-  const validFilenames = [
-    ["app"],
-    ["index"],
-    ["server"],
-    ["src", "app"],
-    ["src", "index"],
-    ["src", "server"]
-  ];
-  const validExtensions = ["js", "cjs", "mjs", "ts", "cts", "mts"];
   const validEntrypoints = validFilenames.flatMap(
-    (filename) => validExtensions.map((extension) => `${filename.join(import_path.sep)}.${extension}`)
+    (filename) => validExtensions.map((extension) => `${filename}.${extension}`)
   );
   const entrypoints = validEntrypoints.filter((entrypoint2) => {
     const matches = files[entrypoint2] !== void 0;
     if (matches) {
       const file = files[entrypoint2];
-      if (file.type === "FileBlob") {
-        const content = file.data.toString();
-        const matchesContent = content.match(REGEX);
-        return matchesContent !== null;
-      }
-      if (file.type === "FileFsRef") {
-        const content = import_fs.default.readFileSync(file.fsPath, "utf-8");
-        const matchesContent = content.match(REGEX);
-        return matchesContent !== null;
-      }
-      if (file.type === "FileRef") {
-        return true;
-      }
+      return checkMatchesRegex(file);
     }
     return false;
   });
@@ -94,15 +136,31 @@ var findEntrypoint = (files) => {
       `Multiple entrypoints found: ${entrypoints.join(", ")}. Using ${entrypoint}.`
     );
   }
-  if (!entrypoint) {
-    const entrypointsForMessage = validFilenames.map((filename) => `- ${filename.join(import_path.sep)}.{${validExtensions.join(",")}}`).join("\n");
-    throw new Error(
-      `No valid entrypoint found. Valid entrypoints are:
-${entrypointsForMessage}`
-    );
-  }
   return entrypoint;
 };
+var checkMatchesRegex = (file) => {
+  const content = import_fs.default.readFileSync(file.fsPath, "utf-8");
+  const matchesContent = content.match(REGEX);
+  return matchesContent !== null;
+};
+var findMainPackageEntrypoint = (files) => {
+  const packageJson = files["package.json"];
+  if (packageJson) {
+    if (packageJson.type === "FileFsRef") {
+      const packageJsonContent = import_fs.default.readFileSync(packageJson.fsPath, "utf-8");
+      let packageJsonJson;
+      try {
+        packageJsonJson = JSON.parse(packageJsonContent);
+      } catch (_e) {
+        packageJsonJson = {};
+      }
+      if ("main" in packageJsonJson && typeof packageJsonJson.main === "string") {
+        return packageJsonJson.main;
+      }
+    }
+  }
+  return null;
+};
 
 // src/index.ts
 var import_node2 = require("@vercel/node");
@@ -115,7 +173,7 @@ var shouldServe = async (opts) => {
   return true;
 };
 var startDevServer = async (opts) => {
-  const entrypoint = findEntrypoint(opts.files);
+  const entrypoint = await entrypointCallback(opts);
   process.env.EXPERIMENTAL_NODE_TYPESCRIPT_ERRORS = "1";
   return (0, import_node2.startDevServer)({
     ...opts,
@@ -125,6 +183,7 @@ var startDevServer = async (opts) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   build,
+  entrypointCallback,
   findEntrypoint,
   shouldServe,
   startDevServer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/express",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -18,13 +18,13 @@
   ],
   "dependencies": {
     "@vercel/static-config": "3.1.2",
-    "@vercel/node": "5.3.19",
+    "@vercel/node": "5.3.20",
     "ts-morph": "12.0.0"
   },
   "devDependencies": {
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "12.0.0",
+    "@vercel/build-utils": "12.1.0",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0",