@vercel/build-utils 13.6.3 → 13.7.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @vercel/build-utils
 
+## 13.7.0
+
+### Minor Changes
+
+- [python] add support for module-based entrypoints for cron jobs ([#15393](https://github.com/vercel/vercel/pull/15393))
+
+- For the django frontend, dynamically load settings.py instead of parsing it ([#15367](https://github.com/vercel/vercel/pull/15367))
+
+### Patch Changes
+
+- Updated dependencies [[`83e804013528fc54de31082960ae31f58339bd71`](https://github.com/vercel/vercel/commit/83e804013528fc54de31082960ae31f58339bd71), [`921314f958c4ec85adb09e020310a5becb7f866c`](https://github.com/vercel/vercel/commit/921314f958c4ec85adb09e020310a5becb7f866c)]:
+  - @vercel/python-analysis@0.9.0
+
 ## 13.6.3
 
 ### Patch Changes

package/dist/clone-env.js

@@ -21,14 +21,14 @@ __export(clone_env_exports, {
   cloneEnv: () => cloneEnv
 });
 module.exports = __toCommonJS(clone_env_exports);
-const { hasOwnProperty } = Object.prototype;
+const hasProp = Object.prototype.hasOwnProperty;
 function cloneEnv(...envs) {
   return envs.reduce((obj, env) => {
     if (env === void 0 || env === null) {
       return obj;
     }
     obj = Object.assign(obj, env);
-    if (hasOwnProperty.call(env, "Path")) {
+    if (hasProp.call(env, "Path")) {
       if (obj.Path !== void 0) {
         obj.PATH = obj.Path;
       }

package/dist/index.js

@@ -318,7 +318,7 @@ var require_BufferList = __commonJS({
         this.head = this.tail = null;
         this.length = 0;
       };
-      BufferList.prototype.join = function join6(s) {
+      BufferList.prototype.join = function join5(s) {
         if (this.length === 0)
           return "";
         var p = this.head;
@@ -21849,8 +21849,6 @@ __export(src_exports, {
   functionsSchema: () => functionsSchema,
   generateNodeBuilderFunctions: () => generateNodeBuilderFunctions,
   getDiscontinuedNodeVersions: () => getDiscontinuedNodeVersions,
-  getDjangoEntrypoint: () => getDjangoEntrypoint,
-  getDjangoSettingsModule: () => getDjangoSettingsModule,
   getEnvForPackageManager: () => getEnvForPackageManager,
   getIgnoreFilter: () => get_ignore_filter_default,
   getInstalledPackageVersion: () => getInstalledPackageVersion,
@@ -23279,14 +23277,14 @@ async function getPackageJson(dir) {
 }
 
 // src/clone-env.ts
-var { hasOwnProperty: hasOwnProperty2 } = Object.prototype;
+var hasProp = Object.prototype.hasOwnProperty;
 function cloneEnv(...envs) {
   return envs.reduce((obj, env) => {
     if (env === void 0 || env === null) {
       return obj;
     }
     obj = Object.assign(obj, env);
-    if (hasOwnProperty2.call(env, "Path")) {
+    if (hasProp.call(env, "Path")) {
       if (obj.Path !== void 0) {
         obj.PATH = obj.Path;
       }
@@ -24647,16 +24645,16 @@ var shouldServe = ({
 }) => {
   requestPath = requestPath.replace(/\/$/, "");
   entrypoint = entrypoint.replace(/\\/, "/");
-  if (entrypoint === requestPath && hasProp(files, entrypoint)) {
+  if (entrypoint === requestPath && hasProp2(files, entrypoint)) {
     return true;
   }
   const { dir, name } = (0, import_path10.parse)(entrypoint);
-  if (name === "index" && dir === requestPath && hasProp(files, entrypoint)) {
+  if (name === "index" && dir === requestPath && hasProp2(files, entrypoint)) {
     return true;
   }
   return false;
 };
-function hasProp(obj, key) {
+function hasProp2(obj, key) {
   return Object.hasOwnProperty.call(obj, key);
 }
 
@@ -25123,7 +25121,6 @@ function shouldUseExperimentalBackends(framework) {
 
 // src/python.ts
 var import_fs3 = __toESM(require("fs"));
-var import_path11 = require("path");
 var import_python_analysis = require("@vercel/python-analysis");
 async function isPythonEntrypoint(file) {
   try {
@@ -25137,55 +25134,6 @@ async function isPythonEntrypoint(file) {
     return false;
   }
 }
-async function getDjangoSettingsModule(workPath) {
-  const managePath = (0, import_path11.join)(workPath, "manage.py");
-  try {
-    const content = await import_fs3.default.promises.readFile(managePath, "utf-8");
-    const value = await (0, import_python_analysis.parseDjangoSettingsModule)(content);
-    if (value) {
-      debug(`Django DJANGO_SETTINGS_MODULE from manage.py: ${value}`);
-      return value;
-    }
-  } catch {
-    debug("manage.py not found or unreadable, skipping Django settings module");
-  }
-  return null;
-}
-async function getDjangoEntrypoint(workPath) {
-  const settingsModule = await getDjangoSettingsModule(workPath);
-  if (!settingsModule)
-    return null;
-  const settingsPath = (0, import_path11.join)(
-    workPath,
-    `${settingsModule.replace(/\./g, "/")}.py`
-  );
-  try {
-    const settingsContent = await import_fs3.default.promises.readFile(settingsPath, "utf-8");
-    const asgiApplication = await (0, import_python_analysis.getStringConstant)(
-      settingsContent,
-      "ASGI_APPLICATION"
-    );
-    if (asgiApplication) {
-      const modulePath = asgiApplication.split(".").slice(0, -1).join("/");
-      const asgiPath = `${modulePath}.py`;
-      debug(`Django ASGI entrypoint from ${settingsModule}: ${asgiPath}`);
-      return asgiPath;
-    }
-    const wsgiApplication = await (0, import_python_analysis.getStringConstant)(
-      settingsContent,
-      "WSGI_APPLICATION"
-    );
-    if (wsgiApplication) {
-      const modulePath = wsgiApplication.split(".").slice(0, -1).join("/");
-      const wsgiPath = `${modulePath}.py`;
-      debug(`Django WSGI entrypoint from ${settingsModule}: ${wsgiPath}`);
-      return wsgiPath;
-    }
-  } catch {
-    debug(`Failed to read or parse settings file: ${settingsPath}`);
-  }
-  return null;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BACKEND_BUILDERS,
@@ -25220,8 +25168,6 @@ async function getDjangoEntrypoint(workPath) {
   functionsSchema,
   generateNodeBuilderFunctions,
   getDiscontinuedNodeVersions,
-  getDjangoEntrypoint,
-  getDjangoSettingsModule,
   getEnvForPackageManager,
   getIgnoreFilter,
   getInstalledPackageVersion,

package/dist/python.d.ts

@@ -8,16 +8,3 @@ import FileFsRef from './file-fs-ref';
 export declare function isPythonEntrypoint(file: FileFsRef | {
     fsPath?: string;
 }): Promise<boolean>;
-/**
- * For Django projects: read manage.py if present and return the value set for
- * DJANGO_SETTINGS_MODULE (e.g. from os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings')).
- * Returns null if manage.py is missing or the pattern is not found.
- */
-export declare function getDjangoSettingsModule(workPath: string): Promise<string | null>;
-/**
- * For Django projects: resolve the ASGI or WSGI application entrypoint by reading
- * DJANGO_SETTINGS_MODULE from manage.py, loading that settings file, and
- * returning the file path for ASGI_APPLICATION or WSGI_APPLICATION (e.g.
- * 'myapp.asgi.application' -> 'myapp/asgi.py'). Returns null if any step fails.
- */
-export declare function getDjangoEntrypoint(workPath: string): Promise<string | null>;

package/dist/python.js

@@ -28,13 +28,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var python_exports = {};
 __export(python_exports, {
-  getDjangoEntrypoint: () => getDjangoEntrypoint,
-  getDjangoSettingsModule: () => getDjangoSettingsModule,
   isPythonEntrypoint: () => isPythonEntrypoint
 });
 module.exports = __toCommonJS(python_exports);
 var import_fs = __toESM(require("fs"));
-var import_path = require("path");
 var import_python_analysis = require("@vercel/python-analysis");
 var import_debug = __toESM(require("./debug"));
 async function isPythonEntrypoint(file) {
@@ -49,58 +46,7 @@ async function isPythonEntrypoint(file) {
     return false;
   }
 }
-async function getDjangoSettingsModule(workPath) {
-  const managePath = (0, import_path.join)(workPath, "manage.py");
-  try {
-    const content = await import_fs.default.promises.readFile(managePath, "utf-8");
-    const value = await (0, import_python_analysis.parseDjangoSettingsModule)(content);
-    if (value) {
-      (0, import_debug.default)(`Django DJANGO_SETTINGS_MODULE from manage.py: ${value}`);
-      return value;
-    }
-  } catch {
-    (0, import_debug.default)("manage.py not found or unreadable, skipping Django settings module");
-  }
-  return null;
-}
-async function getDjangoEntrypoint(workPath) {
-  const settingsModule = await getDjangoSettingsModule(workPath);
-  if (!settingsModule)
-    return null;
-  const settingsPath = (0, import_path.join)(
-    workPath,
-    `${settingsModule.replace(/\./g, "/")}.py`
-  );
-  try {
-    const settingsContent = await import_fs.default.promises.readFile(settingsPath, "utf-8");
-    const asgiApplication = await (0, import_python_analysis.getStringConstant)(
-      settingsContent,
-      "ASGI_APPLICATION"
-    );
-    if (asgiApplication) {
-      const modulePath = asgiApplication.split(".").slice(0, -1).join("/");
-      const asgiPath = `${modulePath}.py`;
-      (0, import_debug.default)(`Django ASGI entrypoint from ${settingsModule}: ${asgiPath}`);
-      return asgiPath;
-    }
-    const wsgiApplication = await (0, import_python_analysis.getStringConstant)(
-      settingsContent,
-      "WSGI_APPLICATION"
-    );
-    if (wsgiApplication) {
-      const modulePath = wsgiApplication.split(".").slice(0, -1).join("/");
-      const wsgiPath = `${modulePath}.py`;
-      (0, import_debug.default)(`Django WSGI entrypoint from ${settingsModule}: ${wsgiPath}`);
-      return wsgiPath;
-    }
-  } catch {
-    (0, import_debug.default)(`Failed to read or parse settings file: ${settingsPath}`);
-  }
-  return null;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getDjangoEntrypoint,
-  getDjangoSettingsModule,
   isPythonEntrypoint
 });

package/dist/types.d.ts

@@ -484,6 +484,7 @@ export interface Service {
     routePrefix?: string;
     routePrefixSource?: 'configured' | 'generated';
     schedule?: string;
+    handlerFunction?: string;
     topic?: string;
     consumer?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "13.6.3",
+  "version": "13.7.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -11,7 +11,7 @@
     "directory": "packages/now-build-utils"
   },
   "dependencies": {
-    "@vercel/python-analysis": "0.8.2"
+    "@vercel/python-analysis": "0.9.0"
   },
   "devDependencies": {
     "@iarna/toml": "2.2.3",