@vercel/container 0.0.1 → 0.0.2

package/dist/index.js

@@ -36,7 +36,6 @@ __export(src_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(src_exports);
-var import_build_utils3 = require("@vercel/build-utils");
 var import_node_fs6 = require("fs");
 var import_node_path6 = __toESM(require("path"));
 
@@ -1403,7 +1402,15 @@ function normalizeCommand2(command) {
 }
 function isDockerfileRef2(ref) {
   const base = import_node_path6.default.basename(ref).toLowerCase();
-  return base === "dockerfile" || base === "containerfile" || base.endsWith(".dockerfile");
+  return base === "dockerfile" || base === "containerfile" || base.endsWith(".dockerfile") || // Vercel-specific container opt-in markers, used to deploy a project as a
+  // container even when another framework (e.g. Next.js) is also present.
+  base === "dockerfile.vercel" || base === "containerfile.vercel";
+}
+var DOCKERFILE_CANDIDATES = ["Dockerfile.vercel", "Containerfile.vercel"];
+function findDockerfile(workPath) {
+  return DOCKERFILE_CANDIDATES.find(
+    (name) => (0, import_node_fs6.existsSync)(import_node_path6.default.join(workPath, name))
+  );
 }
 function sanitizeRepository(name) {
   const sanitized = name.toLowerCase().replace(/[^a-z0-9-_./]/g, "-").replace(/-+/g, "-").replace(/(^[-/.]+)|([-/.]+$)/g, "");
@@ -1568,7 +1575,7 @@ async function buildAndPushImage(params) {
 async function resolveImageHandler(options, span) {
   const { config, workPath, entrypoint, meta } = options;
   const entrypointRef = readString(entrypoint);
-  const dockerfileConfigured = entrypointRef && isDockerfileRef2(entrypointRef) ? entrypointRef : void 0;
+  const dockerfileConfigured = entrypointRef && isDockerfileRef2(entrypointRef) ? entrypointRef : findDockerfile(workPath);
   const dockerfileRel = dockerfileConfigured ?? "Dockerfile";
   const dockerfilePath = import_node_path6.default.join(workPath, dockerfileRel);
   const hasDockerfile = dockerfileConfigured !== void 0 || (0, import_node_fs6.existsSync)(dockerfilePath);
@@ -1603,12 +1610,9 @@ async function resolveImageHandler(options, span) {
     );
   }
   const serviceName = options.service?.name;
-  if (!serviceName) {
-    throw new Error(
-      "Container service is missing a name; cannot derive the registry repository."
-    );
-  }
-  const repository = sanitizeRepository(serviceName);
+  const repository = sanitizeRepository(
+    serviceName ?? import_node_path6.default.basename(dockerfileRel).split(".")[0]
+  );
   const tag = resolveImageTag();
   const contextDir = import_node_path6.default.dirname(dockerfilePath);
   const buildArgs = buildArgsFromEnv(meta?.buildEnv);
@@ -1646,10 +1650,14 @@ async function build(options) {
     (span) => resolveImageHandler(options, span)
   );
   const command = normalizeCommand2(options.config.command);
-  const outputPath = options.service?.name ? (0, import_build_utils3.getInternalServiceFunctionPath)(options.service.name).replace(/^\//, "") : "index";
+  const routes = [
+    { handle: "filesystem" },
+    { src: "/(.*)", dest: "/index" }
+  ];
   return {
+    routes,
     output: {
-      [outputPath]: {
+      index: {
         type: "Lambda",
         files: {},
         // For `runtime: 'container'` the OCI image reference is carried in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/container",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -15,7 +15,7 @@
   "devDependencies": {
     "@types/node": "20.11.0",
     "vitest": "2.0.3",
-    "@vercel/build-utils": "13.32.0"
+    "@vercel/build-utils": "13.32.1"
   },
   "publishConfig": {
     "access": "public"