Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions apps/cli/src/next/commands/functions/new/new.handler.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { dirname } from "node:path";
import {
edgeFunctionDenoConfigFileName,
edgeFunctionEntrypointFileName,
edgeFunctionPackageManifestFileName,
edgeFunctionsDirectoryName,
findProjectPaths,
} from "@supabase/config";
Expand All @@ -16,20 +16,24 @@ import {

const functionSlugPattern = /^[A-Za-z0-9_-]+$/;

const denoJson = `${JSON.stringify(
const packageJson = `${JSON.stringify(
{
imports: {
"@supabase/functions-js": "jsr:@supabase/functions-js@^2",
},
private: true,
type: "module",
dependencies: {},
},
Comment on lines 20 to 24

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Upload the function-local package manifest for API deploys

When a user adds a bare-specifier dependency to this generated manifest and runs the default supabase functions deploy, the API deployment path cannot resolve it: writeSourceDeployForm in apps/cli/src/shared/functions/deploy.ts only uploads the entrypoint and reachable local/import-map files, and its import walker skips bare specifiers, so this package.json is never included in the multipart upload. The deployed runtime therefore has neither the manifest nor the dependency declaration; either include the manifest in source uploads or route package-based functions through the bundler.

Useful? React with 👍 / 👎.

null,
2,
)}\n`;

const entrypointSource = `Deno.serve(async (req) => {
const { name } = await req.json();
return Response.json({ message: \`Hello \${name}!\` });
});
const entrypointSource = `export default {
async fetch(request: Request): Promise<Response> {
const name = new URL(request.url).searchParams.get("name") ?? "World";
return new Response(\`Hello \${name}!\`, {
headers: { "content-type": "text/plain" },
});
},
};
`;

function validateSlugMessage(slug: string): string | undefined {
Expand Down Expand Up @@ -91,7 +95,7 @@ export const functionsNew = Effect.fnUntraced(function* (slugInput: Option.Optio
projectPaths === null ? runtimeInfo.cwd : projectRootForConfigPath(projectPaths.configPath);
const functionDir = path.join(projectRoot, "supabase", edgeFunctionsDirectoryName, slug);
const entrypointPath = path.join(functionDir, edgeFunctionEntrypointFileName);
const denoConfigPath = path.join(functionDir, edgeFunctionDenoConfigFileName);
const packageManifestPath = path.join(functionDir, edgeFunctionPackageManifestFileName);

if (yield* fs.exists(entrypointPath)) {
return yield* Effect.fail(
Expand All @@ -104,15 +108,15 @@ export const functionsNew = Effect.fnUntraced(function* (slugInput: Option.Optio

yield* fs.makeDirectory(functionDir, { recursive: true });
yield* fs.writeFileString(entrypointPath, entrypointSource);
if (!(yield* fs.exists(denoConfigPath))) {
yield* fs.writeFileString(denoConfigPath, denoJson);
if (!(yield* fs.exists(packageManifestPath))) {
yield* fs.writeFileString(packageManifestPath, packageJson);
}

yield* output.success("Created Edge Function.", {
function_slug: slug,
function_dir: functionDir,
entrypoint_path: entrypointPath,
deno_config_path: denoConfigPath,
package_manifest_path: packageManifestPath,
});
yield* output.outro(`Created ${path.join("supabase", edgeFunctionsDirectoryName, slug)}.`);
});
29 changes: 18 additions & 11 deletions apps/cli/src/next/commands/functions/new/new.integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,29 @@ describe("functions new", () => {
yield* Effect.tryPromise(() =>
readFile(join(tempDir, "supabase", "functions", "hello-world", "index.ts"), "utf8"),
),
).toBe(`Deno.serve(async (req) => {
const { name } = await req.json();
return Response.json({ message: \`Hello \${name}!\` });
});
).toBe(`export default {
async fetch(request: Request): Promise<Response> {
const name = new URL(request.url).searchParams.get("name") ?? "World";
return new Response(\`Hello \${name}!\`, {
headers: { "content-type": "text/plain" },
});
},
};
`);
expect(
JSON.parse(
yield* Effect.tryPromise(() =>
readFile(join(tempDir, "supabase", "functions", "hello-world", "deno.json"), "utf8"),
readFile(join(tempDir, "supabase", "functions", "hello-world", "package.json"), "utf8"),
),
),
).toEqual({
imports: {
"@supabase/functions-js": "jsr:@supabase/functions-js@^2",
},
private: true,
type: "module",
dependencies: {},
});
expect(existsSync(join(tempDir, "supabase", "functions", "hello-world", "deno.json"))).toBe(
false,
);
expect(out.messages).toContainEqual(
expect.objectContaining({ type: "success", message: "Created Edge Function." }),
);
Expand Down Expand Up @@ -151,7 +158,7 @@ describe("functions new", () => {
yield* Effect.tryPromise(() =>
readFile(join(tempDir, "supabase", "functions", "hello-world", "index.ts"), "utf8"),
),
).toContain("Deno.serve");
).toContain("export default");
}).pipe(
Effect.ensuring(Effect.tryPromise(() => rm(tempDir, { recursive: true, force: true }))),
);
Expand All @@ -175,7 +182,7 @@ describe("functions new", () => {
yield* Effect.tryPromise(() =>
readFile(join(tempDir, "supabase", "functions", "hello-world", "index.ts"), "utf8"),
),
).toContain("Deno.serve");
).toContain("export default");
}).pipe(
Effect.ensuring(Effect.tryPromise(() => rm(tempDir, { recursive: true, force: true }))),
);
Expand Down Expand Up @@ -239,7 +246,7 @@ describe("functions new", () => {
yield* Effect.tryPromise(() =>
readFile(join(tempDir, "supabase", "functions", "hello-world", "index.ts"), "utf8"),
),
).toContain("Deno.serve");
).toContain("export default");
}).pipe(
Effect.ensuring(Effect.tryPromise(() => rm(tempDir, { recursive: true, force: true }))),
);
Expand Down
1 change: 1 addition & 0 deletions packages/config/src/functions-manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const emptyConfig = decodeProjectConfig({});
export const edgeFunctionsDirectoryName = "functions";
export const edgeFunctionEntrypointFileName = "index.ts";
export const edgeFunctionDenoConfigFileName = "deno.json";
export const edgeFunctionPackageManifestFileName = "package.json";

export interface ResolvedFunctionConfig {
readonly enabled: boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/config/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export {
export {
edgeFunctionDenoConfigFileName,
edgeFunctionEntrypointFileName,
edgeFunctionPackageManifestFileName,
edgeFunctionsDirectoryName,
type FunctionsManifest,
type ResolvedFunctionConfig,
Expand Down
Loading