npm - @meetploy/cli - Versions diffs - 1.18.0 → 1.19.0 - Mend

@meetploy/cli 1.18.0 → 1.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/dashboard-dist/assets/{main-BFhQn9QT.js → main-CZRtZPnP.js} +32 -32
package/dist/dashboard-dist/index.html +1 -1
package/dist/index.d.ts +1 -1
package/dist/index.js +106 -39
package/package.json +1 -1

package/dist/dashboard-dist/index.html CHANGED Viewed

@@ -4,7 +4,7 @@
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>Ploy Dev Dashboard</title>
-		<script type="module" crossorigin src="/assets/main-BFhQn9QT.js"></script>
+		<script type="module" crossorigin src="/assets/main-CZRtZPnP.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/main-5Kt9I_hM.css">
 	</head>
 	<body>

package/dist/index.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --disable-warning=ExperimentalWarning
 import '@meetploy/emulator';

package/dist/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --disable-warning=ExperimentalWarning
 import { createRequire } from 'module';
 import { mkdir, writeFile, readFile, chmod, access } from 'fs/promises';
 import { join, dirname, relative, basename } from 'path';
@@ -1462,7 +1462,12 @@ function generateWrapperCode(config, mockServiceUrl, envVars) {
     injectedEnv.vars = {
 ${envVarsEntries}
     };` : "";
-  return `${imports.join("\n")}
+  const envInjectImport = envVarsEntries ? 'import "__ploy_env_inject__";' : "";
+  const runtimeImports = imports.filter((i) => !i.includes("__ploy_user_worker__"));
+  const userImport = 'import userWorker from "__ploy_user_worker__";';
+  return `${runtimeImports.join("\n")}
+${envInjectImport}
+${userImport}
 const ployBindings = {
 ${bindings.join("\n")}
@@ -1492,10 +1497,15 @@ export default {
 };
 `;
 }
-function createRuntimePlugin(_config) {
+function createRuntimePlugin(_config, envVars) {
   return {
     name: "ploy-runtime",
     setup(build2) {
+      build2.onResolve({ filter: /^__ploy_env_inject__$/ }, () => ({
+        path: "__ploy_env_inject__",
+        namespace: "ploy-runtime",
+        sideEffects: true
+      }));
       build2.onResolve({ filter: /^__ploy_db_runtime__$/ }, () => ({
         path: "__ploy_db_runtime__",
         namespace: "ploy-runtime"
@@ -1552,6 +1562,16 @@ function createRuntimePlugin(_config) {
         contents: TIMER_RUNTIME_CODE,
         loader: "ts"
       }));
+      build2.onLoad({ filter: /^__ploy_env_inject__$/, namespace: "ploy-runtime" }, () => {
+        const entries = Object.entries(envVars ?? {});
+        if (entries.length === 0) {
+          return { contents: "", loader: "js" };
+        }
+        const code = `if (typeof process !== "undefined" && process.env) {
+${entries.map(([key, value]) => `  process.env[${JSON.stringify(key)}] = ${JSON.stringify(value)};`).join("\n")}
+}`;
+        return { contents: code, loader: "js" };
+      });
     }
   };
 }
@@ -1578,7 +1598,7 @@ async function bundleWorker(options) {
     alias: {
       __ploy_user_worker__: entryPoint
     },
-    plugins: [createRuntimePlugin()],
+    plugins: [createRuntimePlugin(config, envVars)],
     absWorkingDir: projectDir,
     logLevel: "warning"
   };
@@ -6283,7 +6303,6 @@ async function updateTsConfigInclude(cwd, outputPath) {
   }
 }
 function generateEnvType(config) {
-  const imports = [];
   const properties = [];
   if (config.env && Object.keys(config.env).length > 0) {
     const varProps = Object.keys(config.env).map((key) => `		${key}: string;`).join("\n");
@@ -6296,61 +6315,47 @@ ${varProps}
     properties.push("	AI_TOKEN: string;");
   }
   if (config.db) {
-    imports.push("D1Database");
     for (const bindingName of Object.keys(config.db)) {
       properties.push(`	${bindingName}: D1Database;`);
     }
   }
   if (config.queue) {
-    imports.push("QueueBinding");
     for (const bindingName of Object.keys(config.queue)) {
       properties.push(`	${bindingName}: QueueBinding;`);
     }
   }
   if (config.cache) {
-    imports.push("CacheBinding");
     for (const bindingName of Object.keys(config.cache)) {
       properties.push(`	${bindingName}: CacheBinding;`);
     }
   }
   if (config.state) {
-    imports.push("StateBinding");
     for (const bindingName of Object.keys(config.state)) {
       properties.push(`	${bindingName}: StateBinding;`);
     }
   }
   if (config.workflow) {
-    imports.push("WorkflowBinding");
     for (const bindingName of Object.keys(config.workflow)) {
       properties.push(`	${bindingName}: WorkflowBinding;`);
     }
   }
   if (config.fs) {
-    const fsKeys = Object.keys(config.fs);
-    if (fsKeys.length > 0) {
-      imports.push("FileStorageBinding");
-      for (const bindingName of fsKeys) {
-        properties.push(`	${bindingName}: FileStorageBinding;`);
-      }
+    for (const bindingName of Object.keys(config.fs)) {
+      properties.push(`	${bindingName}: FileStorageBinding;`);
     }
   }
   if (config.timer) {
-    const timerKeys = Object.keys(config.timer);
-    if (timerKeys.length > 0) {
-      imports.push("TimerBinding");
-      for (const bindingName of timerKeys) {
-        properties.push(`	${bindingName}: TimerBinding;`);
-      }
+    for (const bindingName of Object.keys(config.timer)) {
+      properties.push(`	${bindingName}: TimerBinding;`);
     }
   }
+  if (config.auth) {
+    properties.push(`	PLOY_AUTH: PloyAuth;`);
+  }
   const lines = [
     "// This file is auto-generated by `ploy types`. Do not edit manually.",
     ""
   ];
-  if (imports.length > 0) {
-    lines.push(`import type { ${imports.join(", ")} } from "@meetploy/types";`);
-    lines.push("");
-  }
   lines.push('declare module "@meetploy/nextjs" {');
   lines.push("	interface PloyEnv {");
   for (const prop of properties) {
@@ -6359,7 +6364,69 @@ ${varProps}
   lines.push("	}");
   lines.push("}");
   lines.push("");
+  const p = "@meetploy/types";
   lines.push("declare global {");
+  lines.push(
+    `	type PloyHandler<TEnv = unknown> = import("${p}").PloyHandler<TEnv>;`
+  );
+  lines.push(`	type Ploy = PloyHandler<PloyEnv>;`);
+  lines.push(`	interface PloyRequest {`);
+  lines.push(`		readonly method: string;`);
+  lines.push(`		readonly url: string;`);
+  lines.push(`		readonly headers: Headers;`);
+  lines.push(`		readonly redirect: string;`);
+  lines.push(`		readonly signal: AbortSignal;`);
+  lines.push(`		readonly integrity: string;`);
+  lines.push(`		readonly keepalive: boolean;`);
+  lines.push(`		readonly body: ReadableStream | null;`);
+  lines.push(`		readonly bodyUsed: boolean;`);
+  lines.push(`		clone(): PloyRequest;`);
+  lines.push(`		arrayBuffer(): Promise<ArrayBuffer>;`);
+  lines.push(`		bytes(): Promise<Uint8Array>;`);
+  lines.push(`		text(): Promise<string>;`);
+  lines.push(`		json<T>(): Promise<T>;`);
+  lines.push(`		formData(): Promise<FormData>;`);
+  lines.push(`		blob(): Promise<Blob>;`);
+  lines.push(`	}`);
+  lines.push("");
+  lines.push(`	interface PloyResponse {`);
+  lines.push(`		readonly status: number;`);
+  lines.push(`		readonly statusText: string;`);
+  lines.push(`		readonly headers: Headers;`);
+  lines.push(`		readonly ok: boolean;`);
+  lines.push(`		readonly redirected: boolean;`);
+  lines.push(`		readonly url: string;`);
+  lines.push(`		readonly body: ReadableStream | null;`);
+  lines.push(`		readonly bodyUsed: boolean;`);
+  lines.push(`		clone(): PloyResponse;`);
+  lines.push(`		arrayBuffer(): Promise<ArrayBuffer>;`);
+  lines.push(`		bytes(): Promise<Uint8Array>;`);
+  lines.push(`		text(): Promise<string>;`);
+  lines.push(`		json<T>(): Promise<T>;`);
+  lines.push(`		formData(): Promise<FormData>;`);
+  lines.push(`		blob(): Promise<Blob>;`);
+  lines.push(`	}`);
+  lines.push("");
+  lines.push(`	// Binding types`);
+  lines.push(`	type D1Database = import("${p}").D1Database;`);
+  lines.push(`	type CacheBinding = import("${p}").CacheBinding;`);
+  lines.push(`	type QueueBinding = import("${p}").QueueBinding;`);
+  lines.push(`	type StateBinding = import("${p}").StateBinding;`);
+  lines.push(`	type WorkflowBinding = import("${p}").WorkflowBinding;`);
+  lines.push(`	type FileStorageBinding = import("${p}").FileStorageBinding;`);
+  lines.push(`	type TimerBinding = import("${p}").TimerBinding;`);
+  lines.push(`	type PloyAuth = import("${p}").PloyAuth;`);
+  lines.push(`	type PloyUser = import("${p}").PloyUser;`);
+  lines.push("");
+  lines.push(`	// Handler and context types`);
+  lines.push(
+    `	type WorkflowContext<TEnv = unknown, TInput = unknown> = import("${p}").WorkflowContext<TEnv, TInput>;`
+  );
+  lines.push(`	type QueueMessageEvent = import("${p}").QueueMessageEvent;`);
+  lines.push(`	type ScheduledEvent = import("${p}").ScheduledEvent;`);
+  lines.push(`	type TimerEvent = import("${p}").TimerEvent;`);
+  lines.push(`	type ExecutionContext = import("${p}").ExecutionContext;`);
+  lines.push("");
   lines.push("	interface PloyEnv {");
   for (const prop of properties) {
     lines.push(`	${prop}`);
@@ -6384,7 +6451,7 @@ async function typesCommand(options = {}) {
     console.error("Error: ploy.yaml not found in current directory");
     process.exit(1);
   }
-  const hasBindings2 = config.env || config.ai || config.db || config.queue || config.cache || config.state || config.workflow || config.fs || config.timer || config.cron;
+  const hasBindings2 = config.env || config.ai || config.db || config.queue || config.cache || config.state || config.workflow || config.fs || config.timer || config.cron || config.auth;
   if (!hasBindings2) {
     console.log("No bindings found in ploy.yaml. Generating empty Env.");
   }
@@ -6536,30 +6603,30 @@ async function startNextJsDev(options) {
     nextArgs.push("-H", options.host);
   }
   console.log(`  Starting Next.js dev server...`);
+  const suppressWarning = "--disable-warning=ExperimentalWarning";
+  const nodeOptions = process.env.NODE_OPTIONS ? `${process.env.NODE_OPTIONS} ${suppressWarning}` : suppressWarning;
+  const childEnv = {
+    ...process.env,
+    NODE_OPTIONS: nodeOptions,
+    // Set environment variable so initPloyForDev knows the mock server URL
+    PLOY_MOCK_SERVER_URL: `http://localhost:${dashboard.port}`,
+    // Set PORT so initPloyForDev can construct the correct handler URL
+    PORT: String(nextPort)
+  };
   let nextProcess;
   if (nextBin.includes("npx")) {
     nextProcess = spawn("npx", ["next", ...nextArgs], {
       cwd: projectDir,
       stdio: "inherit",
       shell: true,
-      env: {
-        ...process.env,
-        // Set environment variable so initPloyForDev knows the mock server URL
-        PLOY_MOCK_SERVER_URL: `http://localhost:${dashboard.port}`,
-        // Set PORT so initPloyForDev can construct the correct handler URL
-        PORT: String(nextPort)
-      }
+      env: childEnv
     });
   } else {
     nextProcess = spawn(nextBin, nextArgs, {
       cwd: projectDir,
       stdio: "inherit",
       shell: true,
-      env: {
-        ...process.env,
-        PLOY_MOCK_SERVER_URL: `http://localhost:${dashboard.port}`,
-        PORT: String(nextPort)
-      }
+      env: childEnv
     });
   }
   const cleanup = async () => {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@meetploy/cli",
-	"version": "1.18.0",
+	"version": "1.19.0",
 	"private": false,
 	"repository": {
 		"type": "git",