@uniformdev/cli 20.32.1-alpha.3 → 20.32.1-alpha.4

package/dist/index.mjs

@@ -8324,6 +8324,39 @@ import yargs25 from "yargs";
 // src/commands/integration/commands/definition/edgehancer/deploy.ts
 import { readFileSync } from "fs";
 
+// src/commands/integration/commands/definition/bundleWorkerCode.ts
+import esbuild from "esbuild";
+import path from "path";
+async function bundleWorkerCode(entryFile) {
+  const result = await esbuild.build({
+    entryPoints: [entryFile],
+    bundle: true,
+    // Don't write to disk, build to memory
+    write: false,
+    format: "esm",
+    target: "es2021",
+    platform: "browser",
+    minify: true,
+    // Force inlining of all dependencies
+    external: [],
+    // Ensure single file output
+    splitting: false,
+    sourcemap: false
+  });
+  const outputFiles = result.outputFiles;
+  if (!outputFiles || outputFiles.length === 0) {
+    throw new Error(`No output generated for ${entryFile}`);
+  }
+  const outputFile = outputFiles[0];
+  const builtCode = outputFile.text;
+  console.log(
+    `\u2139\uFE0F ${path.basename(entryFile)} was prepared with esbuild. Size: ${Math.round(
+      builtCode.length / 1024
+    )}kb (use --skipBundle to disable)`
+  );
+  return builtCode;
+}
+
 // src/commands/integration/commands/definition/edgehancer/EdgehancerClient.ts
 import { createLimitPolicy as createLimitPolicy2 } from "@uniformdev/canvas";
 import { ApiClient } from "@uniformdev/context/api";
@@ -8388,6 +8421,10 @@ var IntegrationEdgehancerDeployModule = {
           }).option("compatibilityDate", {
             type: "string",
             describe: "Date indicating targeted support in the custom edgehancer runtime. Backwards incompatible fixes to the runtime following this date will not affect this custom edgehancer. Format: YYYY-MM-DD. You can check here for more information: https://developers.cloudflare.com/workers/configuration/compatibility-dates/#setting-compatibility-date"
+          }).option("skipBundle", {
+            type: "boolean",
+            default: false,
+            describe: "Skip bundling and transpilation of the input file"
           })
         )
       )
@@ -8402,11 +8439,17 @@ var IntegrationEdgehancerDeployModule = {
     archetype,
     connectorType,
     hook,
-    compatibilityDate
+    compatibilityDate,
+    skipBundle = false
   }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
-    const code = readFileSync(filename, "utf8");
+    let code;
+    if (skipBundle) {
+      code = readFileSync(filename, "utf8");
+    } else {
+      code = await bundleWorkerCode(filename);
+    }
     await client.deploy({ archetype, code, connectorType, hook, compatibilityDate });
   }
 };
@@ -8468,6 +8511,10 @@ var IntegrationPropertyEditorDeployModule = {
           }).option("compatibilityDate", {
             type: "string",
             describe: "Date indicating targeted support in the custom property editor runtime. Backwards incompatible fixes to the runtime following this date will not affect this custom property editor. Format: YYYY-MM-DD. You can check here for more information: https://developers.cloudflare.com/workers/configuration/compatibility-dates/#setting-compatibility-date"
+          }).option("skipBundle", {
+            type: "boolean",
+            default: false,
+            describe: "Skip bundling and transpilation of the input file"
           })
         )
       )
@@ -8481,11 +8528,17 @@ var IntegrationPropertyEditorDeployModule = {
     team: teamId,
     propertyType,
     hook,
-    compatibilityDate
+    compatibilityDate,
+    skipBundle = false
   }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new IntegrationPropertyEditorsClient({ apiKey, apiHost, fetch: fetch2, teamId });
-    const code = readFileSync2(filename, "utf8");
+    let code;
+    if (skipBundle) {
+      code = readFileSync2(filename, "utf8");
+    } else {
+      code = await bundleWorkerCode(filename);
+    }
     await client.deploy({ propertyType, code, hook, compatibilityDate });
   }
 };
@@ -8750,6 +8803,7 @@ var package_default = {
     "cosmiconfig-typescript-loader": "5.0.0",
     diff: "^5.0.0",
     dotenv: "^16.4.7",
+    esbuild: "0.25.0",
     execa: "5.1.1",
     "file-type": "^20.0.0",
     "fs-jetpack": "5.1.0",
@@ -8849,7 +8903,7 @@ import jwt from "jsonwebtoken";
 import open from "open";
 
 // src/url.ts
-var makeUrl = (baseUrl, path4) => [baseUrl.trim().replace(/\/+$/, ""), path4.trim().replace(/^\/+/, "")].join("/");
+var makeUrl = (baseUrl, path5) => [baseUrl.trim().replace(/\/+$/, ""), path5.trim().replace(/^\/+/, "")].join("/");
 
 // src/auth/getBearerToken.ts
 async function getBearerToken(baseUrl) {
@@ -8953,8 +9007,8 @@ var getLimitsSchema = z.object({
   })
 });
 var createClient = (baseUrl, authToken) => {
-  const request2 = async (path4, opts, allowedNon2xxStatusCodes = []) => {
-    const res = await fetch(makeUrl(baseUrl, path4), {
+  const request2 = async (path5, opts, allowedNon2xxStatusCodes = []) => {
+    const res = await fetch(makeUrl(baseUrl, path5), {
       ...opts,
       headers: { Authorization: `Bearer ${authToken}` }
     });
@@ -8962,18 +9016,18 @@ var createClient = (baseUrl, authToken) => {
       return res;
     } else {
       throw new Error(
-        `Non-2xx API response: ${opts.method} ${path4} responded with ${res.status} ${res.statusText}`
+        `Non-2xx API response: ${opts.method} ${path5} responded with ${res.status} ${res.statusText}`
       );
     }
   };
-  const requestJson = async (path4, opts, schema2, allowedNon2xxStatusCodes = []) => {
-    const res = await request2(path4, opts, allowedNon2xxStatusCodes);
+  const requestJson = async (path5, opts, schema2, allowedNon2xxStatusCodes = []) => {
+    const res = await request2(path5, opts, allowedNon2xxStatusCodes);
     const data = await res.json();
     const parseResult = schema2.safeParse(data);
     if (parseResult.success) {
       return parseResult.data;
     } else {
-      throw new Error(`Invalid ${opts.method} ${path4} response: ${parseResult.error.message}`);
+      throw new Error(`Invalid ${opts.method} ${path5} response: ${parseResult.error.message}`);
     }
   };
   return {
@@ -9107,7 +9161,7 @@ import fsj5 from "fs-jetpack";
 import * as git from "isomorphic-git";
 import * as http from "isomorphic-git/http/node/index.js";
 import os from "os";
-import path from "path";
+import path2 from "path";
 async function cloneStarter({
   spin,
   githubPath,
@@ -9116,7 +9170,7 @@ async function cloneStarter({
   githubBranch
 }) {
   const done = await spin("Fetching starter code...");
-  const cloneDir = path.join(os.tmpdir(), `uniform-new-${crypto2.randomBytes(20).toString("hex")}`);
+  const cloneDir = path2.join(os.tmpdir(), `uniform-new-${crypto2.randomBytes(20).toString("hex")}`);
   const [user, repo, ...pathSegments] = githubPath.split("/");
   try {
     await git.clone({
@@ -9135,10 +9189,10 @@ async function cloneStarter({
   if (fs3.existsSync(targetDir) && fs3.readdirSync(targetDir).length > 0) {
     throw new Error(`"${targetDir}" is not empty`);
   }
-  const starterDir = path.join(cloneDir, ...pathSegments);
+  const starterDir = path2.join(cloneDir, ...pathSegments);
   fsj5.copy(starterDir, targetDir, { overwrite: true });
   if (dotEnvFile) {
-    fs3.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
+    fs3.writeFileSync(path2.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
   }
   console.log(`
 Your project now lives in ${targetDir} \u2728`);
@@ -9156,7 +9210,7 @@ Installing project dependencies...
 // src/projects/getOrCreateProject.ts
 import fs4, { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
 import inquirer2 from "inquirer";
-import path2 from "path";
+import path3 from "path";
 import slugify from "slugify";
 var newProjectId = "$new";
 async function getOrCreateProject({
@@ -9281,7 +9335,7 @@ function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
       mkdirSync2(targetDir, { recursive: true });
     }
     if (fs4.readdirSync(targetDir).length > 0) {
-      targetDir = path2.resolve(targetDir, projectNameSlug);
+      targetDir = path3.resolve(targetDir, projectNameSlug);
       if (fs4.existsSync(targetDir)) {
         throw new Error(`${targetDir} already exists, choose a different name.`);
       }
@@ -9545,7 +9599,7 @@ npm run dev
 // src/commands/new/commands/new-mesh-integration.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync3, writeFileSync } from "fs";
 import inquirer5 from "inquirer";
-import path3 from "path";
+import path4 from "path";
 import slugify2 from "slugify";
 async function newMeshIntegrationHandler({
   spin,
@@ -9591,7 +9645,7 @@ async function newMeshIntegrationHandler({
     githubBranch
   });
   let done = await spin("Registering integration to team...");
-  const pathToManifest = path3.resolve(targetDir, "mesh-manifest.json");
+  const pathToManifest = path4.resolve(targetDir, "mesh-manifest.json");
   if (!existsSync3(pathToManifest)) {
     throw new Error("Invalid integration starter cloned: missing `mesh-manifest.json`");
   }
@@ -9600,7 +9654,7 @@ async function newMeshIntegrationHandler({
   manifestJson.type = typeSlug;
   manifestJson.displayName = name;
   writeFileSync(pathToManifest, JSON.stringify(manifestJson, null, 2), "utf-8");
-  const packageJsonPath = path3.resolve(targetDir, "package.json");
+  const packageJsonPath = path4.resolve(targetDir, "package.json");
   const packageJson = JSON.parse(readFileSync3(packageJsonPath, "utf-8"));
   packageJson.name = typeSlug;
   writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
@@ -9650,7 +9704,7 @@ function validateIntegrationName(integrationName, explicitOutputPath) {
     mkdirSync3(targetDir, { recursive: true });
   }
   if (readdirSync(targetDir).length > 0) {
-    targetDir = path3.resolve(targetDir, typeSlug);
+    targetDir = path4.resolve(targetDir, typeSlug);
     if (existsSync3(targetDir)) {
       throw new Error(`${targetDir} directory already exists, choose a different name.`);
     }
@@ -11672,14 +11726,14 @@ import { join as join8 } from "path";
 
 // src/fs.ts
 import { promises as fs6 } from "fs";
-async function readJSON(path4) {
-  const fileContents = await fs6.readFile(path4, "utf-8");
+async function readJSON(path5) {
+  const fileContents = await fs6.readFile(path5, "utf-8");
   return JSON.parse(fileContents);
 }
-async function tryReadJSON(path4, missingValue = null) {
+async function tryReadJSON(path5, missingValue = null) {
   try {
-    const stat = await fs6.stat(path4);
-    return stat.isFile() ? await readJSON(path4) : missingValue;
+    const stat = await fs6.stat(path5);
+    return stat.isFile() ? await readJSON(path5) : missingValue;
   } catch {
     return missingValue;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.32.1-alpha.3+c30c2f2b0d",
+  "version": "20.32.1-alpha.4+d57d1b5dfa",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,19 +27,20 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.32.1-alpha.3+c30c2f2b0d",
-    "@uniformdev/canvas": "20.32.1-alpha.3+c30c2f2b0d",
-    "@uniformdev/context": "20.32.1-alpha.3+c30c2f2b0d",
-    "@uniformdev/files": "20.32.1-alpha.3+c30c2f2b0d",
-    "@uniformdev/project-map": "20.32.1-alpha.3+c30c2f2b0d",
-    "@uniformdev/redirect": "20.32.1-alpha.3+c30c2f2b0d",
-    "@uniformdev/richtext": "20.32.1-alpha.3+c30c2f2b0d",
+    "@uniformdev/assets": "20.32.1-alpha.4+d57d1b5dfa",
+    "@uniformdev/canvas": "20.32.1-alpha.4+d57d1b5dfa",
+    "@uniformdev/context": "20.32.1-alpha.4+d57d1b5dfa",
+    "@uniformdev/files": "20.32.1-alpha.4+d57d1b5dfa",
+    "@uniformdev/project-map": "20.32.1-alpha.4+d57d1b5dfa",
+    "@uniformdev/redirect": "20.32.1-alpha.4+d57d1b5dfa",
+    "@uniformdev/richtext": "20.32.1-alpha.4+d57d1b5dfa",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
     "cosmiconfig-typescript-loader": "5.0.0",
     "diff": "^5.0.0",
     "dotenv": "^16.4.7",
+    "esbuild": "0.25.0",
     "execa": "5.1.1",
     "file-type": "^20.0.0",
     "fs-jetpack": "5.1.0",
@@ -81,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c30c2f2b0de9d99e7c038dba9b941039f2c18a39"
+  "gitHead": "d57d1b5dfa94641fb683cbc7e2e9333516b4019f"
 }