@anvil-works/anvil-cli 0.7.0-canary.2 → 0.7.0-canary.3

package/dist/cli.js

@@ -51758,6 +51758,8 @@ var __webpack_exports__ = {};
             await pkceFlow.close();
         }
     }
+    const external_module_namespaceObject = require("module");
+    const requireFromHere = (0, external_module_namespaceObject.createRequire)(__filename);
     function getUrlConfigKey(appId) {
         return `anvil.auth.${appId}.url`;
     }
@@ -51773,12 +51775,26 @@ var __webpack_exports__ = {};
     function getDefaultCliPath(options) {
         const servicesDir = options?.servicesDir ?? __dirname;
         const pathExists = options?.pathExists ?? external_fs_default().existsSync;
+        const packageCliPath = getInstalledPackageCliPath(options?.resolvePackageJson);
         const candidates = [
+            external_path_default().resolve(servicesDir, "cli.js"),
+            external_path_default().resolve(servicesDir, "cli.ts"),
             external_path_default().resolve(servicesDir, "..", "cli.js"),
-            external_path_default().resolve(servicesDir, "..", "cli.ts")
-        ];
+            external_path_default().resolve(servicesDir, "..", "cli.ts"),
+            packageCliPath
+        ].filter((candidate)=>void 0 !== candidate);
         return candidates.find((candidate)=>pathExists(candidate));
     }
+    function getInstalledPackageCliPath(resolvePackageJson = resolveAnvilCliPackageJson) {
+        try {
+            return external_path_default().join(external_path_default().dirname(resolvePackageJson()), "dist", "cli.js");
+        } catch  {
+            return;
+        }
+    }
+    function resolveAnvilCliPackageJson() {
+        return requireFromHere.resolve("@anvil-works/anvil-cli/package.json");
+    }
     function getGitCredentialHelperCommand(options) {
         const platform = options?.platform ?? process.platform;
         const execPath = options?.execPath ?? process.execPath;

package/dist/index.js

@@ -46230,6 +46230,8 @@ var __webpack_exports__ = {};
         }
         throw new Error("Device login expired before it was approved.");
     }
+    const external_module_namespaceObject = require("module");
+    const requireFromHere = (0, external_module_namespaceObject.createRequire)(__filename);
     function getUrlConfigKey(appId) {
         return `anvil.auth.${appId}.url`;
     }
@@ -46245,12 +46247,26 @@ var __webpack_exports__ = {};
     function getDefaultCliPath(options) {
         const servicesDir = options?.servicesDir ?? __dirname;
         const pathExists = options?.pathExists ?? external_fs_default().existsSync;
+        const packageCliPath = getInstalledPackageCliPath(options?.resolvePackageJson);
         const candidates = [
+            external_path_default().resolve(servicesDir, "cli.js"),
+            external_path_default().resolve(servicesDir, "cli.ts"),
             external_path_default().resolve(servicesDir, "..", "cli.js"),
-            external_path_default().resolve(servicesDir, "..", "cli.ts")
-        ];
+            external_path_default().resolve(servicesDir, "..", "cli.ts"),
+            packageCliPath
+        ].filter((candidate)=>void 0 !== candidate);
         return candidates.find((candidate)=>pathExists(candidate));
     }
+    function getInstalledPackageCliPath(resolvePackageJson = resolveAnvilCliPackageJson) {
+        try {
+            return external_path_default().join(external_path_default().dirname(resolvePackageJson()), "dist", "cli.js");
+        } catch  {
+            return;
+        }
+    }
+    function resolveAnvilCliPackageJson() {
+        return requireFromHere.resolve("@anvil-works/anvil-cli/package.json");
+    }
     function getGitCredentialHelperCommand(options) {
         const platform = options?.platform ?? process.platform;
         const execPath = options?.execPath ?? process.execPath;

package/dist/services/git-auth.d.ts

@@ -5,6 +5,7 @@ export interface AppAuthBinding {
 export declare function getDefaultCliPath(options?: {
     servicesDir?: string;
     pathExists?: (pathToCheck: string) => boolean;
+    resolvePackageJson?: () => string;
 }): string | undefined;
 export declare function getGitCredentialHelperCommand(options?: {
     execPath?: string;

package/dist/services/git-auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-auth.d.ts","sourceRoot":"","sources":["../../src/services/git-auth.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,cAAc;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAkBD,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;CACjD,GAAG,MAAM,GAAG,SAAS,CASrB;AAED,wBAAgB,6BAA6B,CAAC,OAAO,CAAC,EAAE;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;CAC9B,GAAG,MAAM,CAiBT;AAWD,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAUhG;AAED,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/G;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI5E;AAED,wBAAsB,+BAA+B,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBvG;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,CAiBtC;AAED,wBAAgB,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK5E"}
+{"version":3,"file":"git-auth.d.ts","sourceRoot":"","sources":["../../src/services/git-auth.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,cAAc;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAkBD,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9C,kBAAkB,CAAC,EAAE,MAAM,MAAM,CAAC;CACrC,GAAG,MAAM,GAAG,SAAS,CAarB;AAcD,wBAAgB,6BAA6B,CAAC,OAAO,CAAC,EAAE;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;CAC9B,GAAG,MAAM,CAiBT;AAWD,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAUhG;AAED,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/G;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI5E;AAED,wBAAsB,+BAA+B,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBvG;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,CAiBtC;AAED,wBAAgB,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK5E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.7.0-canary.2",
+  "version": "0.7.0-canary.3",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/api.d.ts",