mirror of
https://github.com/LukeHagar/vercel.git
synced 2025-12-09 21:07:46 +00:00
[python][ruby][cli] Remove deprecated createLambda() usage (#11080)
* Use `Lambda` constructor instead of `createLambda()` * Return `FileBlob` instance for the entrypoint files, so that they do not get written to cwd * In `vc dev`, support `Lambda` instances which do not have `zipBuffer` property
This commit is contained in:
@@ -1,23 +1,27 @@
|
||||
import { join, dirname, basename } from 'path';
|
||||
import execa from 'execa';
|
||||
import fs from 'fs';
|
||||
import execa from 'execa';
|
||||
import { promisify } from 'util';
|
||||
const readFile = promisify(fs.readFile);
|
||||
const writeFile = promisify(fs.writeFile);
|
||||
import { join, dirname, basename } from 'path';
|
||||
import {
|
||||
GlobOptions,
|
||||
BuildOptions,
|
||||
getWriteableDirectory,
|
||||
download,
|
||||
glob,
|
||||
createLambda,
|
||||
Lambda,
|
||||
FileBlob,
|
||||
shouldServe,
|
||||
debug,
|
||||
NowBuildError,
|
||||
type BuildOptions,
|
||||
type GlobOptions,
|
||||
type BuildV3,
|
||||
type Files,
|
||||
} from '@vercel/build-utils';
|
||||
import { installRequirement, installRequirementsFile } from './install';
|
||||
import { getLatestPythonVersion, getSupportedPythonVersion } from './version';
|
||||
|
||||
const readFile = promisify(fs.readFile);
|
||||
const writeFile = promisify(fs.writeFile);
|
||||
|
||||
async function pipenvConvert(cmd: string, srcDir: string) {
|
||||
debug('Running pipfile2req...');
|
||||
try {
|
||||
@@ -53,13 +57,13 @@ export async function downloadFilesInWorkPath({
|
||||
return workPath;
|
||||
}
|
||||
|
||||
export const build = async ({
|
||||
export const build: BuildV3 = async ({
|
||||
workPath,
|
||||
files: originalFiles,
|
||||
entrypoint,
|
||||
meta = {},
|
||||
config,
|
||||
}: BuildOptions) => {
|
||||
}) => {
|
||||
let pythonVersion = getLatestPythonVersion(meta);
|
||||
|
||||
workPath = await downloadFilesInWorkPath({
|
||||
@@ -190,12 +194,6 @@ export const build = async ({
|
||||
.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(join(workPath, `${handlerPyFilename}.py`), handlerPyContents);
|
||||
|
||||
const globOptions: GlobOptions = {
|
||||
cwd: workPath,
|
||||
ignore:
|
||||
@@ -204,14 +202,22 @@ export const build = async ({
|
||||
: 'node_modules/**',
|
||||
};
|
||||
|
||||
const lambda = await createLambda({
|
||||
files: await glob('**', globOptions),
|
||||
const files: Files = await glob('**', globOptions);
|
||||
|
||||
// in order to allow the user to have `server.py`, we
|
||||
// need our `server.py` to be called something else
|
||||
const handlerPyFilename = 'vc__handler__python';
|
||||
|
||||
files[`${handlerPyFilename}.py`] = new FileBlob({ data: handlerPyContents });
|
||||
|
||||
const output = new Lambda({
|
||||
files,
|
||||
handler: `${handlerPyFilename}.vc_handler`,
|
||||
runtime: pythonVersion.runtime,
|
||||
environment: {},
|
||||
});
|
||||
|
||||
return { output: lambda };
|
||||
return { output };
|
||||
};
|
||||
|
||||
export { shouldServe };
|
||||
|
||||
Reference in New Issue
Block a user