@vercel/python 3.1.58 → 3.1.60

package/dist/index.js

@@ -3526,8 +3526,8 @@ const path_1 = __webpack_require__(622);
 const execa_1 = __importDefault(__webpack_require__(389));
 const fs_1 = __importDefault(__webpack_require__(747));
 const util_1 = __webpack_require__(669);
-const readFile = util_1.promisify(fs_1.default.readFile);
-const writeFile = util_1.promisify(fs_1.default.writeFile);
+const readFile = (0, util_1.promisify)(fs_1.default.readFile);
+const writeFile = (0, util_1.promisify)(fs_1.default.writeFile);
 const build_utils_1 = __webpack_require__(445);
 Object.defineProperty(exports, "shouldServe", ({ enumerable: true, get: function () { return build_utils_1.shouldServe; } }));
 const install_1 = __webpack_require__(526);
@@ -3535,13 +3535,13 @@ Object.defineProperty(exports, "installRequirement", ({ enumerable: true, get: f
 Object.defineProperty(exports, "installRequirementsFile", ({ enumerable: true, get: function () { return install_1.installRequirementsFile; } }));
 const version_1 = __webpack_require__(127);
 async function pipenvConvert(cmd, srcDir) {
-    build_utils_1.debug('Running pipfile2req...');
+    (0, build_utils_1.debug)('Running pipfile2req...');
     try {
         const out = await execa_1.default.stdout(cmd, [], {
             cwd: srcDir,
         });
-        build_utils_1.debug('Contents of requirements.txt is: ' + out);
-        fs_1.default.writeFileSync(path_1.join(srcDir, 'requirements.txt'), out);
+        (0, build_utils_1.debug)('Contents of requirements.txt is: ' + out);
+        fs_1.default.writeFileSync((0, path_1.join)(srcDir, 'requirements.txt'), out);
     }
     catch (err) {
         console.log('Failed to run "pipfile2req"');
@@ -3550,21 +3550,21 @@ async function pipenvConvert(cmd, srcDir) {
 }
 exports.version = 3;
 async function downloadFilesInWorkPath({ entrypoint, workPath, files, meta = {}, }) {
-    build_utils_1.debug('Downloading user files...');
-    let downloadedFiles = await build_utils_1.download(files, workPath, meta);
+    (0, build_utils_1.debug)('Downloading user files...');
+    let downloadedFiles = await (0, build_utils_1.download)(files, workPath, meta);
     if (meta.isDev) {
         // Old versions of the CLI don't assign this property
-        const { devCacheDir = path_1.join(workPath, '.now', 'cache') } = meta;
-        const destCache = path_1.join(devCacheDir, path_1.basename(entrypoint, '.py'));
-        await build_utils_1.download(downloadedFiles, destCache);
-        downloadedFiles = await build_utils_1.glob('**', destCache);
+        const { devCacheDir = (0, path_1.join)(workPath, '.now', 'cache') } = meta;
+        const destCache = (0, path_1.join)(devCacheDir, (0, path_1.basename)(entrypoint, '.py'));
+        await (0, build_utils_1.download)(downloadedFiles, destCache);
+        downloadedFiles = await (0, build_utils_1.glob)('**', destCache);
         workPath = destCache;
     }
     return workPath;
 }
 exports.downloadFilesInWorkPath = downloadFilesInWorkPath;
 const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, config, }) => {
-    let pythonVersion = version_1.getLatestPythonVersion(meta);
+    let pythonVersion = (0, version_1.getLatestPythonVersion)(meta);
     workPath = await downloadFilesInWorkPath({
         workPath,
         files: originalFiles,
@@ -3580,7 +3580,7 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         // distutils.errors.DistutilsOptionError: must supply either home
         // or prefix/exec-prefix -- not both
         if (meta.isDev) {
-            const setupCfg = path_1.join(workPath, 'setup.cfg');
+            const setupCfg = (0, path_1.join)(workPath, 'setup.cfg');
             await writeFile(setupCfg, '[install]\nprefix=\n');
         }
     }
@@ -3589,7 +3589,7 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         throw err;
     }
     console.log('Installing required dependencies...');
-    await install_1.installRequirement({
+    await (0, install_1.installRequirement)({
         pythonPath: pythonVersion.pythonPath,
         pipPath: pythonVersion.pipPath,
         dependency: 'werkzeug',
@@ -3597,18 +3597,18 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         workPath,
         meta,
     });
-    let fsFiles = await build_utils_1.glob('**', workPath);
-    const entryDirectory = path_1.dirname(entrypoint);
-    const pipfileLockDir = fsFiles[path_1.join(entryDirectory, 'Pipfile.lock')]
-        ? path_1.join(workPath, entryDirectory)
+    let fsFiles = await (0, build_utils_1.glob)('**', workPath);
+    const entryDirectory = (0, path_1.dirname)(entrypoint);
+    const pipfileLockDir = fsFiles[(0, path_1.join)(entryDirectory, 'Pipfile.lock')]
+        ? (0, path_1.join)(workPath, entryDirectory)
         : fsFiles['Pipfile.lock']
             ? workPath
             : null;
     if (pipfileLockDir) {
-        build_utils_1.debug('Found "Pipfile.lock"');
+        (0, build_utils_1.debug)('Found "Pipfile.lock"');
         let lock = {};
         try {
-            const json = await readFile(path_1.join(pipfileLockDir, 'Pipfile.lock'), 'utf8');
+            const json = await readFile((0, path_1.join)(pipfileLockDir, 'Pipfile.lock'), 'utf8');
             lock = JSON.parse(json);
         }
         catch (err) {
@@ -3617,7 +3617,7 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
                 message: 'Unable to parse Pipfile.lock',
             });
         }
-        pythonVersion = version_1.getSupportedPythonVersion({
+        pythonVersion = (0, version_1.getSupportedPythonVersion)({
             isDev: meta.isDev,
             pipLockPythonVersion: lock?._meta?.requires?.python_version,
         });
@@ -3625,8 +3625,8 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         // We use a different`workPath` here because we want `pipfile-requirements` and it's dependencies
         // to not be part of the lambda environment. By using pip's `--target` directive we can isolate
         // it into a separate folder.
-        const tempDir = await build_utils_1.getWriteableDirectory();
-        await install_1.installRequirement({
+        const tempDir = await (0, build_utils_1.getWriteableDirectory)();
+        await (0, install_1.installRequirement)({
             pythonPath: pythonVersion.pythonPath,
             pipPath: pythonVersion.pipPath,
             dependency: 'pipfile-requirements',
@@ -3638,15 +3638,15 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         // Python needs to know where to look up all the packages we just installed.
         // We tell it to use the same location as used with `--target`
         process.env.PYTHONPATH = tempDir;
-        const convertCmd = path_1.join(tempDir, 'bin', 'pipfile2req');
+        const convertCmd = (0, path_1.join)(tempDir, 'bin', 'pipfile2req');
         await pipenvConvert(convertCmd, pipfileLockDir);
     }
-    fsFiles = await build_utils_1.glob('**', workPath);
-    const requirementsTxt = path_1.join(entryDirectory, 'requirements.txt');
+    fsFiles = await (0, build_utils_1.glob)('**', workPath);
+    const requirementsTxt = (0, path_1.join)(entryDirectory, 'requirements.txt');
     if (fsFiles[requirementsTxt]) {
-        build_utils_1.debug('Found local "requirements.txt"');
+        (0, build_utils_1.debug)('Found local "requirements.txt"');
         const requirementsTxtPath = fsFiles[requirementsTxt].fsPath;
-        await install_1.installRequirementsFile({
+        await (0, install_1.installRequirementsFile)({
             pythonPath: pythonVersion.pythonPath,
             pipPath: pythonVersion.pipPath,
             filePath: requirementsTxtPath,
@@ -3655,9 +3655,9 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         });
     }
     else if (fsFiles['requirements.txt']) {
-        build_utils_1.debug('Found global "requirements.txt"');
+        (0, build_utils_1.debug)('Found global "requirements.txt"');
         const requirementsTxtPath = fsFiles['requirements.txt'].fsPath;
-        await install_1.installRequirementsFile({
+        await (0, install_1.installRequirementsFile)({
             pythonPath: pythonVersion.pythonPath,
             pipPath: pythonVersion.pipPath,
             filePath: requirementsTxtPath,
@@ -3665,29 +3665,29 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
             meta,
         });
     }
-    const originalPyPath = path_1.join(__dirname, '..', 'vc_init.py');
+    const originalPyPath = (0, path_1.join)(__dirname, '..', 'vc_init.py');
     const originalHandlerPyContents = await readFile(originalPyPath, 'utf8');
-    build_utils_1.debug('Entrypoint is', entrypoint);
+    (0, build_utils_1.debug)('Entrypoint is', entrypoint);
     const moduleName = entrypoint.replace(/\//g, '.').replace(/\.py$/, '');
     // Since `vercel dev` renames source files, we must reference the original
     const suffix = meta.isDev && !entrypoint.endsWith('.py') ? '.py' : '';
     const entrypointWithSuffix = `${entrypoint}${suffix}`;
-    build_utils_1.debug('Entrypoint with suffix is', entrypointWithSuffix);
+    (0, build_utils_1.debug)('Entrypoint with suffix is', entrypointWithSuffix);
     const handlerPyContents = originalHandlerPyContents
         .replace(/__VC_HANDLER_MODULE_NAME/g, moduleName)
         .replace(/__VC_HANDLER_ENTRYPOINT/g, entrypointWithSuffix);
     // in order to allow the user to have `server.py`, we need our `server.py` to be called
     // somethig else
     const handlerPyFilename = 'vc__handler__python';
-    await writeFile(path_1.join(workPath, `${handlerPyFilename}.py`), handlerPyContents);
+    await writeFile((0, path_1.join)(workPath, `${handlerPyFilename}.py`), handlerPyContents);
     const globOptions = {
         cwd: workPath,
         ignore: config && typeof config.excludeFiles === 'string'
             ? config.excludeFiles
             : 'node_modules/**',
     };
-    const lambda = await build_utils_1.createLambda({
-        files: await build_utils_1.glob('**', globOptions),
+    const lambda = await (0, build_utils_1.createLambda)({
+        files: await (0, build_utils_1.glob)('**', globOptions),
         handler: `${handlerPyFilename}.vc_handler`,
         runtime: pythonVersion.runtime,
         environment: {},
@@ -3719,7 +3719,7 @@ print(spec.origin)
 `;
 async function isInstalled(pythonPath, dependency, cwd) {
     try {
-        const { stdout } = await execa_1.default(pythonPath, ['-c', makeDependencyCheckCode(dependency)], {
+        const { stdout } = await (0, execa_1.default)(pythonPath, ['-c', makeDependencyCheckCode(dependency)], {
             stdio: 'pipe',
             cwd,
         });
@@ -3738,7 +3738,7 @@ pkg_resources.require(dependencies)
 `;
 async function areRequirementsInstalled(pythonPath, requirementsPath, cwd) {
     try {
-        await execa_1.default(pythonPath, ['-c', makeRequirementsCheckCode(requirementsPath)], {
+        await (0, execa_1.default)(pythonPath, ['-c', makeRequirementsCheckCode(requirementsPath)], {
             stdio: 'pipe',
             cwd,
         });
@@ -3766,9 +3766,9 @@ async function pipInstall(pipPath, workPath, args) {
         ...args,
     ];
     const pretty = `${pipPath} ${cmdArgs.join(' ')}`;
-    build_utils_1.debug(`Running "${pretty}"...`);
+    (0, build_utils_1.debug)(`Running "${pretty}"...`);
     try {
-        await execa_1.default(pipPath, cmdArgs, {
+        await (0, execa_1.default)(pipPath, cmdArgs, {
             cwd: workPath,
         });
     }
@@ -3783,7 +3783,7 @@ async function pipInstall(pipPath, workPath, args) {
 // version of its dependencies
 async function installRequirement({ pythonPath, pipPath, dependency, version, workPath, meta, args = [], }) {
     if (meta.isDev && (await isInstalled(pythonPath, dependency, workPath))) {
-        build_utils_1.debug(`Skipping ${dependency} dependency installation, already installed in ${workPath}`);
+        (0, build_utils_1.debug)(`Skipping ${dependency} dependency installation, already installed in ${workPath}`);
         return;
     }
     const exact = `${dependency}==${version}`;
@@ -3797,7 +3797,7 @@ async function installRequirementsFile({ pythonPath, pipPath, filePath, workPath
     // locally, so we'll run a separate installation.
     if (meta.isDev &&
         (await areRequirementsInstalled(pythonPath, filePath, workPath))) {
-        build_utils_1.debug(`Skipping requirements file installation, already installed`);
+        (0, build_utils_1.debug)(`Skipping requirements file installation, already installed`);
         return;
     }
     await pipInstall(pipPath, workPath, ['--upgrade', '-r', filePath, ...args]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "3.1.58",
+  "version": "3.1.60",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -17,16 +17,15 @@
     "build": "node build",
     "test": "jest --env node --verbose --runInBand --bail",
     "test-unit": "pnpm test test/unit.test.ts",
-    "test-e2e": "pnpm test test/integration.test.ts"
+    "test-e2e": "pnpm test test/integration-*"
   },
   "devDependencies": {
     "@types/execa": "^0.9.0",
     "@types/jest": "27.4.1",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "6.7.1",
+    "@vercel/build-utils": "6.7.2",
     "@vercel/ncc": "0.24.0",
-    "execa": "^1.0.0",
-    "typescript": "4.3.4"
+    "execa": "^1.0.0"
   },
-  "gitHead": "925c8ba18ceec80174d9440cd2cad0e725ed4f56"
+  "gitHead": "2de365f9cfea3ce283d2bf855507c71209f1e3d8"
 }