@vercel/python 6.47.2 → 6.48.0

package/dist/index.js

@@ -4380,7 +4380,7 @@ var import_fs15 = __toESM(require("fs"));
 var import_path15 = require("path");
 
 // src/package-versions.ts
-var VERCEL_RUNTIME_VERSION = "0.15.0";
+var VERCEL_RUNTIME_VERSION = "0.16.0";
 var VERCEL_WORKERS_VERSION = "0.0.25";
 
 // src/index.ts
@@ -7781,12 +7781,12 @@ var startDevServer = async (opts) => {
     } : void 0,
     service
   );
+  let hookResult;
   if (detected?.entrypoint) {
     resolved = detected.entrypoint;
   } else {
-    const hookResult = await runFrameworkHook(framework, {
+    hookResult = await runFrameworkHook(framework, {
       pythonEnv: env,
-      projectDir: (0, import_path10.join)(workPath, detected?.baseDir ?? ""),
       workPath,
       entrypoint,
       detected: detected ?? void 0
@@ -7945,6 +7945,9 @@ If you are using a virtual environment, activate it before running "vercel dev",
       if (devShim.extraPythonPath) {
         pathParts.push(devShim.extraPythonPath);
       }
+      if (hookResult?.extraPythonPath) {
+        pathParts.push(hookResult.extraPythonPath);
+      }
       const existingPythonPath = env.PYTHONPATH || "";
       if (existingPythonPath) {
         pathParts.push(existingPythonPath);
@@ -8493,7 +8496,7 @@ async function getDjangoSettings(projectDir, env) {
     djangoVersion: parsed.django_version ?? null
   };
 }
-async function runDjangoCollectStatic(venvPath, workPath, env, outputStaticDir, settingsModule, djangoSettings, djangoVersion) {
+async function runDjangoCollectStatic(venvPath, workPath, djangoPath, env, outputStaticDir, settingsModule, djangoSettings, djangoVersion) {
   const pythonPath = getVenvPythonBin(venvPath);
   const storages = djangoSettings["STORAGES"];
   const useLegacySetting = !djangoVersion || djangoVersion[0] < 5 || djangoVersion[0] === 5 && djangoVersion[1] < 1;
@@ -8505,7 +8508,7 @@ async function runDjangoCollectStatic(venvPath, workPath, env, outputStaticDir,
   const installedApps = djangoSettings["INSTALLED_APPS"] ?? [];
   const staticfilesDirs = djangoSettings["STATICFILES_DIRS"] ?? [];
   const staticSourceDirs = [
-    ...installedApps.map((app) => (0, import_path13.join)(workPath, ...app.split("."), "static")),
+    ...installedApps.map((app) => (0, import_path13.join)(djangoPath, ...app.split("."), "static")),
     // TODO: Deal with optional prefixes in STATICFILES_DIRS.
     ...staticfilesDirs.map((d) => Array.isArray(d) ? d[1] : d)
   ].filter((d) => import_fs13.default.existsSync(d));
@@ -8515,11 +8518,11 @@ async function runDjangoCollectStatic(venvPath, workPath, env, outputStaticDir,
     );
     await (0, import_execa7.default)(pythonPath, ["manage.py", "collectstatic", "--noinput"], {
       env: { ...env, DJANGO_SETTINGS_MODULE: settingsModule },
-      cwd: workPath
+      cwd: djangoPath
     });
     return {
       staticSourceDirs,
-      staticRoot: staticRoot ? (0, import_path13.resolve)(workPath, staticRoot) : null,
+      staticRoot: staticRoot ? (0, import_path13.resolve)(djangoPath, staticRoot) : null,
       cdnOutputDir: null,
       manifestRelPath: null
     };
@@ -8533,7 +8536,7 @@ async function runDjangoCollectStatic(venvPath, workPath, env, outputStaticDir,
   const staticUrlPath = staticUrl.replace(/^\/|\/$/g, "") || "static";
   const staticOutputDir = (0, import_path13.join)(outputStaticDir, staticUrlPath);
   await import_fs13.default.promises.mkdir(staticOutputDir, { recursive: true });
-  const shimPath = (0, import_path13.join)(workPath, "_vercel_collectstatic_settings.py");
+  const shimPath = (0, import_path13.join)(djangoPath, "_vercel_collectstatic_settings.py");
   const shimLines = [
     `from ${settingsModule} import *`,
     `STATIC_ROOT = ${JSON.stringify(staticOutputDir)}`
@@ -8549,7 +8552,7 @@ async function runDjangoCollectStatic(venvPath, workPath, env, outputStaticDir,
         ...env,
         DJANGO_SETTINGS_MODULE: "_vercel_collectstatic_settings"
       },
-      cwd: workPath
+      cwd: djangoPath
     });
   } finally {
     await import_fs13.default.promises.unlink(shimPath).catch(() => {
@@ -8562,7 +8565,7 @@ async function runDjangoCollectStatic(venvPath, workPath, env, outputStaticDir,
   let manifestRelPath = null;
   if (MANIFEST_STORAGE_BACKENDS.includes(storageBackend) && staticRoot) {
     const manifestSrc = (0, import_path13.join)(staticOutputDir, "staticfiles.json");
-    const resolvedStaticRoot = (0, import_path13.resolve)(workPath, staticRoot);
+    const resolvedStaticRoot = (0, import_path13.resolve)(djangoPath, staticRoot);
     const manifestDest = (0, import_path13.join)(resolvedStaticRoot, "staticfiles.json");
     await import_fs13.default.promises.mkdir(resolvedStaticRoot, { recursive: true });
     await import_fs13.default.promises.copyFile(manifestSrc, manifestDest);
@@ -8571,7 +8574,7 @@ async function runDjangoCollectStatic(venvPath, workPath, env, outputStaticDir,
   }
   return {
     staticSourceDirs,
-    staticRoot: staticRoot ? (0, import_path13.resolve)(workPath, staticRoot) : null,
+    staticRoot: staticRoot ? (0, import_path13.resolve)(djangoPath, staticRoot) : null,
     cdnOutputDir: outputStaticDir,
     manifestRelPath
   };
@@ -8807,18 +8810,22 @@ async function runFrameworkHook(framework, ctx) {
 var frameworkHooks = {
   django: async ({
     pythonEnv,
-    projectDir,
     workPath,
     venvPath,
     detected
   }) => {
-    if (detected?.baseDir === void 0) {
-      (0, import_build_utils19.debug)("Django hook: no manage.py detected, skipping");
-      return;
+    let baseDir = detected?.baseDir;
+    if (baseDir === void 0) {
+      if (!import_fs15.default.existsSync((0, import_path15.join)(workPath, "manage.py"))) {
+        (0, import_build_utils19.debug)("Django hook: no manage.py detected, skipping");
+        return;
+      }
+      baseDir = "";
     }
+    const djangoPath = (0, import_path15.join)(workPath, baseDir);
     let settingsResult;
     try {
-      settingsResult = await getDjangoSettings(projectDir, pythonEnv);
+      settingsResult = await getDjangoSettings(djangoPath, pythonEnv);
     } catch (err) {
       let detail;
       if (err?.code === "ENOENT") {
@@ -8829,7 +8836,7 @@ Hint: activate a venv or run with \`uv run vercel dev\``;
       }
       throw new import_build_utils19.NowBuildError({
         code: "DJANGO_SETTINGS_FAILED",
-        message: `Failed to read Django application settings from ${projectDir}/manage.py:
+        message: `Failed to read Django application settings from ${djangoPath}/manage.py:
 ${detail}`
       });
     }
@@ -8839,7 +8846,6 @@ ${detail}`
       console.log(`Django ${djangoVersion.join(".")} detected`);
     }
     let resolvedEntrypoint;
-    const baseDir = detected?.baseDir ?? "";
     const asgiApp = djangoSettings["ASGI_APPLICATION"];
     if (typeof asgiApp === "string") {
       const parts = asgiApp.split(".");
@@ -8867,6 +8873,7 @@ ${detail}`
       djangoStatic = await runDjangoCollectStatic(
         venvPath,
         workPath,
+        djangoPath,
         pythonEnv,
         outputStaticDir,
         settingsModule,
@@ -8874,7 +8881,11 @@ ${detail}`
         djangoVersion
       );
     }
-    return { entrypoint: resolvedEntrypoint, djangoStatic };
+    return {
+      entrypoint: resolvedEntrypoint,
+      djangoStatic,
+      extraPythonPath: baseDir ? (0, import_path15.join)(workPath, baseDir) : void 0
+    };
   }
 };
 function createRuntimeTrampoline({
@@ -9262,7 +9273,6 @@ var build = async ({
   }
   const hookResult = await runFrameworkHook(framework, {
     pythonEnv,
-    projectDir: (0, import_path15.join)(workPath, entryDirectory),
     workPath,
     venvPath,
     entrypoint,
@@ -9577,7 +9587,7 @@ var build = async ({
   if (!(0, import_build_utils19.isPythonFramework)(framework) && !service?.name) {
     return { resultVersion: 3, result: { output } };
   }
-  const lambdaPath = service?.name ? `_svc/${service.name}/index` : "index";
+  const lambdaPath = service?.name && service.type ? `_svc/${service.name}/index` : "index";
   const staticFiles = djangoStatic?.cdnOutputDir ? await (0, import_build_utils19.glob)("**", { cwd: djangoStatic.cdnOutputDir }) : {};
   const isNonWebService = service?.name && service.type && service.type !== "web";
   const routes = isNonWebService ? void 0 : [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "6.47.2",
+  "version": "6.48.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -37,8 +37,8 @@
     "vitest": "2.1.4",
     "which": "3.0.0",
     "@vercel/error-utils": "2.2.0",
-    "@vercel/build-utils": "13.32.1",
-    "@vercel/python-runtime": "0.15.0"
+    "@vercel/build-utils": "13.32.2",
+    "@vercel/python-runtime": "0.16.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",