windmill-cli 1.726.1 → 1.728.0

package/esm/main.js

@@ -16772,7 +16772,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.726.1",
+    VERSION: "1.728.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -25347,7 +25347,7 @@ var init_auth = __esm(async () => {
 });
 
 // src/core/constants.ts
-var WM_FORK_PREFIX = "wm-fork", VERSION = "1.726.1";
+var WM_FORK_PREFIX = "wm-fork", VERSION = "1.728.0";
 
 // src/utils/git.ts
 var exports_git = {};
@@ -25535,7 +25535,7 @@ function gitSyncIncludePattern(pathType, path2) {
     case "emailtrigger":
       return `${path2}.email_trigger.*`;
     default:
-      return `${path2}.*`;
+      return `${path2}.*,${path2}__mod/**`;
   }
 }
 function deriveGitSyncDeployIncludes(items, useIndividualBranch) {
@@ -62696,6 +62696,15 @@ class DoubleLinkedDependencyTree {
     });
     return result;
   }
+  getAllTempScriptRefs() {
+    const result = {};
+    for (const [path6, node] of this.nodes.entries()) {
+      if (node.contentHash) {
+        result[path6] = node.contentHash;
+      }
+    }
+    return result;
+  }
   async persistDepsHashes(depsPaths) {
     for (const path6 of depsPaths) {
       const node = this.nodes.get(path6);
@@ -63318,12 +63327,15 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
     inlineScripts.forEach((s) => {
       writeIfChanged(process.cwd() + SEP4 + folder + SEP4 + s.path, s.content);
     });
+    writeIfChanged(process.cwd() + SEP4 + folder + SEP4 + "flow.yaml", import_yaml6.stringify(flowValue, yamlOptions));
     for (const s of inlineScripts) {
       if (s.is_lock)
         continue;
       const legacyRelPath = legacyLockPathForContent(s.path, s.language);
       if (!legacyRelPath)
         continue;
+      if (inlineScripts.some((other) => other.path === legacyRelPath))
+        continue;
       const legacyAbsPath = process.cwd() + SEP4 + folder + SEP4 + legacyRelPath;
       if (existsSync4(legacyAbsPath)) {
         try {
@@ -63334,7 +63346,6 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
         }
       }
     }
-    writeIfChanged(process.cwd() + SEP4 + folder + SEP4 + "flow.yaml", import_yaml6.stringify(flowValue, yamlOptions));
   }
   const depsForHash = tree ? {} : filteredDeps;
   const finalHashes = await generateFlowHash(depsForHash, folder, opts.defaultTs);
@@ -63473,7 +63484,9 @@ async function buildPreviewTempScriptRefs(workspace, opts, codebases, target) {
       await generateScriptMetadataInternal(e, workspace, opts, true, true, rawWorkspaceDependencies, codebases, false, tree);
     }
     let nodePath;
-    if (target.kind === "script") {
+    if (target.kind === "all") {
+      nodePath = undefined;
+    } else if (target.kind === "script") {
       nodePath = scriptPathToRemotePath(target.path);
     } else if (target.kind === "flow") {
       const folder = target.folder.endsWith(SEP5) ? target.folder.slice(0, -1) : target.folder;
@@ -63486,7 +63499,7 @@ async function buildPreviewTempScriptRefs(workspace, opts, codebases, target) {
     }
     tree.propagateStaleness();
     await uploadScripts(tree, workspace);
-    const refs = tree.getTempScriptRefs(nodePath);
+    const refs = nodePath !== undefined ? tree.getTempScriptRefs(nodePath) : tree.getAllTempScriptRefs();
     return refs && Object.keys(refs).length > 0 ? refs : undefined;
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
@@ -89281,6 +89294,14 @@ async function dev2(opts) {
   const base = await realpath(".");
   const ignore = await ignoreF(opts);
   const codebases = await listSyncCodebases(opts);
+  let tempScriptRefs = undefined;
+  {
+    const { buildPreviewTempScriptRefs: buildPreviewTempScriptRefs2 } = await init_generate_metadata().then(() => exports_generate_metadata);
+    tempScriptRefs = await buildPreviewTempScriptRefs2(workspace, opts, codebases, { kind: "all" });
+    if (tempScriptRefs) {
+      info(`Resolved ${Object.keys(tempScriptRefs).length} locally-edited script(s) for preview relative imports (snapshot — restart wmill dev to refresh)`);
+    }
+  }
   const changesTimeouts = {};
   function watchChanges() {
     return new Promise((_resolve, _reject) => {
@@ -89340,7 +89361,8 @@ async function dev2(opts) {
           type: "flow",
           flow: localFlow,
           uriPath: localPath,
-          path: wmFlowPath
+          path: wmFlowPath,
+          temp_script_refs: tempScriptRefs
         };
         info("Updated " + wmFlowPath);
         broadcastChanges(currentLastEdit);
@@ -89356,7 +89378,8 @@ async function dev2(opts) {
           path: wmPath,
           language: lang,
           tag: typed?.tag,
-          lock: typed?.lock
+          lock: typed?.lock,
+          temp_script_refs: tempScriptRefs
         };
         info("Updated " + wmPath);
         broadcastChanges(currentLastEdit);
@@ -89393,7 +89416,8 @@ async function dev2(opts) {
         type: "flow",
         flow: localFlow,
         uriPath: flowDir,
-        path: wmPath
+        path: wmPath,
+        temp_script_refs: tempScriptRefs
       };
       currentLastEdit = edit;
       return edit;
@@ -89411,7 +89435,8 @@ async function dev2(opts) {
           path: wmPath,
           language: lang,
           tag: typed?.tag,
-          lock: typed?.lock
+          lock: typed?.lock,
+          temp_script_refs: tempScriptRefs
         };
         currentLastEdit = edit;
         return edit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.726.1",
+  "version": "1.728.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",