@vercel/express 0.0.15 → 0.0.17

package/dist/index.js

@@ -33,6 +33,7 @@ __export(src_exports, {
   build: () => build,
   entrypointCallback: () => entrypointCallback,
   findEntrypoint: () => findEntrypoint,
+  require_: () => require_,
   shouldServe: () => shouldServe,
   startDevServer: () => startDevServer,
   version: () => version
@@ -42,8 +43,10 @@ module.exports = __toCommonJS(src_exports);
 // src/build.ts
 var import_build_utils = require("@vercel/build-utils");
 var import_node = require("@vercel/node");
+var import_module = require("module");
 var import_path = require("path");
 var import_fs = __toESM(require("fs"));
+var frameworkName = "express";
 var REGEX = /(?:from|require|import)\s*(?:\(\s*)?["']express["']\s*(?:\))?/g;
 var validFilenames = [
   "app",
@@ -53,6 +56,7 @@ var validFilenames = [
   "src/index",
   "src/server"
 ];
+var require_ = (0, import_module.createRequire)(__filename);
 var validExtensions = ["js", "cjs", "mjs", "ts", "cts", "mts"];
 var entrypointsForMessage = validFilenames.map((filename) => `- ${filename}.{${validExtensions.join(",")}}`).join("\n");
 var build = async (args) => {
@@ -76,6 +80,21 @@ var build = async (args) => {
       return entrypointCallback(args);
     }
   });
+  let version2 = void 0;
+  try {
+    const resolved = require_.resolve(`${frameworkName}/package.json`, {
+      paths: [args.workPath]
+    });
+    const expressVersion = require_(resolved).version;
+    if (expressVersion) {
+      version2 = expressVersion;
+    }
+  } catch (e) {
+  }
+  res.output.framework = {
+    slug: frameworkName,
+    version: version2
+  };
   return res;
 };
 var entrypointCallback = async (args) => {
@@ -86,19 +105,22 @@ var entrypointCallback = async (args) => {
     ""
   );
   if (dir) {
-    const entrypointFromOutputDir = findEntrypoint(
-      await (0, import_build_utils.glob)(entrypointGlob, (0, import_path.join)(args.workPath, dir))
-    );
+    const { entrypoint: entrypointFromOutputDir, entrypointsNotMatchingRegex: entrypointsNotMatchingRegex2 } = findEntrypoint(await (0, import_build_utils.glob)(entrypointGlob, (0, import_path.join)(args.workPath, dir)));
     if (entrypointFromOutputDir) {
       return (0, import_path.join)(dir, entrypointFromOutputDir);
     }
+    if (entrypointsNotMatchingRegex2.length > 0) {
+      throw new Error(
+        `No entrypoint found which imports express. Found possible ${pluralize("entrypoint", entrypointsNotMatchingRegex2.length)}: ${entrypointsNotMatchingRegex2.join(", ")}`
+      );
+    }
     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);
+  const { entrypoint: entrypointFromRoot, entrypointsNotMatchingRegex } = findEntrypoint(files);
   if (entrypointFromRoot) {
     return entrypointFromRoot;
   }
@@ -113,30 +135,48 @@ ${entrypointsForMessage}`
       }
     }
   }
+  if (entrypointsNotMatchingRegex.length > 0) {
+    throw new Error(
+      `No entrypoint found which imports express. Found possible ${pluralize("entrypoint", entrypointsNotMatchingRegex.length)}: ${entrypointsNotMatchingRegex.join(", ")}`
+    );
+  }
   throw new Error(
-    `No entrypoint found. Searched for: 
+    `No entrypoint found. Searched for:
 ${entrypointsForMessage}`
   );
 };
+function pluralize(word, count) {
+  return count === 1 ? word : `${word}s`;
+}
 var findEntrypoint = (files) => {
-  const validEntrypoints = validFilenames.flatMap(
+  const allEntrypoints = validFilenames.flatMap(
     (filename) => validExtensions.map((extension) => `${filename}.${extension}`)
   );
-  const entrypoints = validEntrypoints.filter((entrypoint2) => {
-    const matches = files[entrypoint2] !== void 0;
-    if (matches) {
+  const possibleEntrypointsInFiles = allEntrypoints.filter((entrypoint2) => {
+    return files[entrypoint2] !== void 0;
+  });
+  const entrypointsMatchingRegex = possibleEntrypointsInFiles.filter(
+    (entrypoint2) => {
       const file = files[entrypoint2];
       return checkMatchesRegex(file);
     }
-    return false;
-  });
-  const entrypoint = entrypoints[0];
-  if (entrypoints.length > 1) {
+  );
+  const entrypointsNotMatchingRegex = possibleEntrypointsInFiles.filter(
+    (entrypoint2) => {
+      const file = files[entrypoint2];
+      return !checkMatchesRegex(file);
+    }
+  );
+  const entrypoint = entrypointsMatchingRegex[0];
+  if (entrypointsMatchingRegex.length > 1) {
     console.warn(
-      `Multiple entrypoints found: ${entrypoints.join(", ")}. Using ${entrypoint}.`
+      `Multiple entrypoints found: ${entrypointsMatchingRegex.join(", ")}. Using ${entrypoint}.`
     );
   }
-  return entrypoint;
+  return {
+    entrypoint,
+    entrypointsNotMatchingRegex
+  };
 };
 var checkMatchesRegex = (file) => {
   const content = import_fs.default.readFileSync(file.fsPath, "utf-8");
@@ -186,6 +226,7 @@ var startDevServer = async (opts) => {
   build,
   entrypointCallback,
   findEntrypoint,
+  require_,
   shouldServe,
   startDevServer,
   version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/express",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -18,7 +18,7 @@
   ],
   "dependencies": {
     "@vercel/static-config": "3.1.2",
-    "@vercel/node": "5.3.22",
+    "@vercel/node": "5.3.23",
     "ts-morph": "12.0.0"
   },
   "devDependencies": {