eddev 2.3.3 → 2.3.5

package/dist/app/lib/blocks/editor/installGutenbergHooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installGutenbergHooks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/installGutenbergHooks.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SAoTtC"}
+{"version":3,"file":"installGutenbergHooks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/installGutenbergHooks.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SAsTtC"}

package/dist/app/lib/blocks/editor/installGutenbergHooks.js

@@ -1,7 +1,7 @@
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef, Fragment, useEffect, useMemo } from "react";
-import { ref, subscribe, useSnapshot } from "valtio";
+import { proxy, ref, subscribe, useSnapshot } from "valtio";
 import { proxyMap } from "valtio/utils";
 import { addBlockMetadata, getBlockMetadata } from "../block-utils.js";
 import { registerBuiltinBlocks } from "../builtin-blocks.js";
@@ -187,6 +187,7 @@ export function installEDGutenbergHooks() {
         return result;
     };
     wp.hooks.addFilter("blocks.registerBlockType", "ed", (item, name) => {
+        item.apiVersion = 3;
         // Hook into ACF blocks, customising the edit mode.
         if (name.startsWith("acf/")) {
             const edit = item.edit;
@@ -281,10 +282,10 @@ export function installEDGutenbergHooks() {
     acf.addFilter("blocks/preview/render", (data) => {
         try {
             const key = String(data);
-            const existing = BlockPropsStore.get(data.__clientId);
+            const existing = BlockPropsStore.blocks.get(data.__clientId);
             if (!existing || existing.key !== data.__key) {
                 const payload = JSON.parse(data);
-                BlockPropsStore.set(payload.__clientId, {
+                BlockPropsStore.blocks.set(payload.__clientId, {
                     payload: payload ? ref(payload) : null,
                     key: key,
                 });
@@ -299,9 +300,11 @@ export function installEDGutenbergHooks() {
     if (acf.jsxNameReplacements) {
         acf.jsxNameReplacements["edblock"] = forwardRef(function EDBlock(props, ref) {
             const block = useBlockContext();
-            const payload = useSnapshot(BlockPropsStore).get(block?.clientId)?.payload;
+            const payload = useSnapshot(BlockPropsStore).blocks.get(block?.clientId)?.payload;
             return useMemo(() => _jsx(EditableBlock, { payload: payload }), [payload]);
         });
     }
 }
-const BlockPropsStore = proxyMap();
+const BlockPropsStore = proxy({
+    blocks: proxyMap(),
+});

package/dist/node/cli/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.3.3";
+export declare const VERSION = "2.3.5";
 //# sourceMappingURL=version.d.ts.map

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.3.3";
+export const VERSION = "2.3.5";

package/dist/node/graphql/graphql-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/graphql/graphql-codegen.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAkB/C,eAAO,MAAM,UAAU,kEAAgE,CAAA;AA4CvF,KAAK,uBAAuB,GAAG;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,qBAAa,gBAAgB;IAiBlB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,uBAAuB;IAjBtC,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,WAAW,CAAO;IAC1B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,UAAU,CAAgC;IAElD,OAAO,CAAC,cAAc,CAAW;IAEjC,OAAO,CAAC,SAAS,CAAC,CAAgB;IAElC,OAAO,CAAC,UAAU,CAAC,CAAgB;gBAG1B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,uBAAuB;IA8DhC,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBvE,KAAK;YA8BG,MAAM;IA+CpB,aAAa;IAOP,QAAQ;IAsOd,OAAO,CAAC,mBAAmB;IAuE3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;YA2Ed,UAAU;IAqDlB,iBAAiB;IAyFjB,gBAAgB;IAyCtB;;OAEG;YACW,eAAe;CAQ9B"}
+{"version":3,"file":"graphql-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/graphql/graphql-codegen.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAkB/C,eAAO,MAAM,UAAU,kEAAgE,CAAA;AA4CvF,KAAK,uBAAuB,GAAG;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,qBAAa,gBAAgB;IAiBlB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,uBAAuB;IAjBtC,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,WAAW,CAAO;IAC1B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,UAAU,CAAgC;IAElD,OAAO,CAAC,cAAc,CAAW;IAEjC,OAAO,CAAC,SAAS,CAAC,CAAgB;IAElC,OAAO,CAAC,UAAU,CAAC,CAAgB;gBAG1B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,uBAAuB;IA8DhC,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBvE,KAAK;YA8BG,MAAM;IA+CpB,aAAa;IAOP,QAAQ;IAgPd,OAAO,CAAC,mBAAmB;IAuE3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;YA2Ed,UAAU;IAsDlB,iBAAiB;IAyFjB,gBAAgB;IAyCtB;;OAEG;YACW,eAAe;CAM9B"}

package/dist/node/graphql/graphql-codegen.js

@@ -233,7 +233,17 @@ export class GraphQLGenerator {
         const blockManifest = await this.project.blocks.get();
         const viewManifest = await this.project.views.get();
         // Get WP basics
-        const wp = await this.project.getWordpressInfo(true);
+        const wp = await this.project.getWordpressInfo(true).catch((err) => {
+            return err;
+        });
+        if (wp instanceof Error) {
+            console.warn(`Failed to load WordPress info from ${this.project.wp.infoUrl}`);
+            console.help("This is usually due to a PHP error, or WordPress is not running.");
+            console.error(wp);
+            console.setWorking(false);
+            this.scheduleRetry();
+            return;
+        }
         // Load the schema
         const schemaResult = await this.schemaLoader.get(this.needsReload);
         this.needsReload = false;
@@ -421,7 +431,7 @@ export class GraphQLGenerator {
         console.setWorking(false);
         // If a regeneration request has come through, start again!
         if (this.needsRegenerate) {
-            this.generate();
+            this.generate().catch(() => { });
         }
     }
     getOptimizedQueries(graphQLFiles, rewrite = false) {
@@ -544,6 +554,7 @@ export class GraphQLGenerator {
         return report;
     }
     async generateTS(fileName, schema, args) {
+        // return
         const config = {
             schema,
             documents: args.documents,
@@ -706,10 +717,7 @@ export class GraphQLGenerator {
     async writeSchemaFile(schema) {
         let didWrite = await fs.writeJsonIfUnchanged(resolve(this.project.rootDir, "schema.json"), schema, false);
         if (didWrite) {
-            console.info("Writing schema file for VSCode");
-        }
-        else {
-            console.info("GraphQL schema has not changed");
+            console.info("Writing updated schema file for VSCode");
         }
     }
 }

package/dist/node/project/project.d.ts

@@ -4,6 +4,7 @@ import { FieldManifestGenerator } from "./manifest/field-manifest.js";
 import { RouteManifestGenerator } from "./manifest/routes-manifest.js";
 import { ViewManifestGenerator } from "./manifest/view-manifest.js";
 import { WidgetManifestGenerator } from "./manifest/widget-manifest.js";
+import { WPInfo } from "./wp-info.js";
 export declare const projectLog: import("../utils/stateful-log.js").StatefulLog<Project>;
 type ProjectArgs = {
     rootDir: string;
@@ -27,7 +28,7 @@ export declare class Project {
     fields: FieldManifestGenerator;
     widgets: WidgetManifestGenerator;
     serverRoutes: RouteManifestGenerator;
-    private wp;
+    wp: WPInfo;
     reportPluginCompatibility: boolean;
     private constructor();
     verifyOriginAccess(): Promise<{

package/dist/node/project/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/node/project/project.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEpD,OAAO,EAAE,sBAAsB,EAAqB,MAAM,8BAA8B,CAAA;AACxF,OAAO,EAAE,sBAAsB,EAAqB,MAAM,8BAA8B,CAAA;AACxF,OAAO,EAAE,sBAAsB,EAAqB,MAAM,+BAA+B,CAAA;AACzF,OAAO,EAAE,qBAAqB,EAAoB,MAAM,6BAA6B,CAAA;AACrF,OAAO,EAAE,uBAAuB,EAAsB,MAAM,+BAA+B,CAAA;AAO3F,eAAO,MAAM,UAAU,yDAAU,CAAA;AAEjC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACpC,CAAA;AAED;;;GAGG;AACH,qBAAa,OAAO;IAClB,OAAO,SAAK;IACZ,SAAS,SAAK;IACd,SAAS,SAAK;IACd,OAAO,SAAK;IACZ,UAAU,SAAK;IACf,MAAM,SAAK;IAEX,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB,YAAY,SAAoB;IAChC,MAAM,EAAG,sBAAsB,CAAA;IAC/B,KAAK,EAAG,qBAAqB,CAAA;IAC7B,MAAM,EAAG,sBAAsB,CAAA;IAC/B,OAAO,EAAG,uBAAuB,CAAA;IACjC,YAAY,EAAG,sBAAsB,CAAA;IACrC,OAAO,CAAC,EAAE,CAAS;IAEnB,yBAAyB,UAAQ;IAEjC,OAAO;IAYD,kBAAkB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,GAAG;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;YA4B9E,IAAI;IAmEZ,kBAAkB;IAUxB,iBAAiB;IAkBX,gBAAgB,CAAC,KAAK,GAAE,OAAe;;;;;;;;;;;;;;;;;;;;;;;;;;WAKhC,MAAM,CAAC,IAAI,EAAE,WAAW;CAKtC"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/node/project/project.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEpD,OAAO,EAAE,sBAAsB,EAAqB,MAAM,8BAA8B,CAAA;AACxF,OAAO,EAAE,sBAAsB,EAAqB,MAAM,8BAA8B,CAAA;AACxF,OAAO,EAAE,sBAAsB,EAAqB,MAAM,+BAA+B,CAAA;AACzF,OAAO,EAAE,qBAAqB,EAAoB,MAAM,6BAA6B,CAAA;AACrF,OAAO,EAAE,uBAAuB,EAAsB,MAAM,+BAA+B,CAAA;AAC3F,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAMrC,eAAO,MAAM,UAAU,yDAAU,CAAA;AAEjC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACpC,CAAA;AAED;;;GAGG;AACH,qBAAa,OAAO;IAClB,OAAO,SAAK;IACZ,SAAS,SAAK;IACd,SAAS,SAAK;IACd,OAAO,SAAK;IACZ,UAAU,SAAK;IACf,MAAM,SAAK;IAEX,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB,YAAY,SAAoB;IAChC,MAAM,EAAG,sBAAsB,CAAA;IAC/B,KAAK,EAAG,qBAAqB,CAAA;IAC7B,MAAM,EAAG,sBAAsB,CAAA;IAC/B,OAAO,EAAG,uBAAuB,CAAA;IACjC,YAAY,EAAG,sBAAsB,CAAA;IACrC,EAAE,EAAG,MAAM,CAAA;IAEX,yBAAyB,UAAQ;IAEjC,OAAO;IAYD,kBAAkB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,GAAG;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;YA4B9E,IAAI;IAmEZ,kBAAkB;IAUxB,iBAAiB;IAkBX,gBAAgB,CAAC,KAAK,GAAE,OAAe;;;;;;;;;;;;;;;;;;;;;;;;;;WAKhC,MAAM,CAAC,IAAI,EAAE,WAAW;CAKtC"}

package/dist/node/project/wp-info.d.ts

@@ -27,6 +27,7 @@ type WPInfoData = {
 export declare class WPInfo {
     siteUrl: string;
     private cached?;
+    infoUrl: string;
     constructor(siteUrl: string);
     ping(): Promise<Response>;
     getInfo(force?: boolean): Promise<WPInfoData>;

package/dist/node/project/wp-info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wp-info.d.ts","sourceRoot":"","sources":["../../../src/node/project/wp-info.ts"],"names":[],"mappings":"AAGA,KAAK,UAAU,GAAG;IAChB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,UAAU,EAAE,OAAO,CAAA;QACnB,iBAAiB,EAAE,MAAM,CAAA;QACzB,iBAAiB,EAAE,MAAM,CAAA;QACzB,iBAAiB,EAAE,OAAO,CAAA;KAC3B,EAAE,CAAA;IACH,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,GAAG,EAAE,MAAM,CAAA;KACZ,EAAE,CAAA;IACH,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,aAAa,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACrE,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;CAC7B,CAAA;AAED,qBAAa,MAAM;IAEE,OAAO,EAAE,MAAM;IADlC,OAAO,CAAC,MAAM,CAAC,CAAY;gBACR,OAAO,EAAE,MAAM;IAE5B,IAAI;IASJ,OAAO,CAAC,KAAK,GAAE,OAAe;IAe9B,eAAe;CAkBtB"}
+{"version":3,"file":"wp-info.d.ts","sourceRoot":"","sources":["../../../src/node/project/wp-info.ts"],"names":[],"mappings":"AAGA,KAAK,UAAU,GAAG;IAChB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,UAAU,EAAE,OAAO,CAAA;QACnB,iBAAiB,EAAE,MAAM,CAAA;QACzB,iBAAiB,EAAE,MAAM,CAAA;QACzB,iBAAiB,EAAE,OAAO,CAAA;KAC3B,EAAE,CAAA;IACH,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,GAAG,EAAE,MAAM,CAAA;KACZ,EAAE,CAAA;IACH,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,aAAa,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACrE,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;CAC7B,CAAA;AAED,qBAAa,MAAM;IAIE,OAAO,EAAE,MAAM;IAHlC,OAAO,CAAC,MAAM,CAAC,CAAY;IAC3B,OAAO,EAAE,MAAM,CAAA;gBAEI,OAAO,EAAE,MAAM;IAI5B,IAAI;IASJ,OAAO,CAAC,KAAK,GAAE,OAAe;IAwB9B,eAAe;CAkBtB"}

package/dist/node/project/wp-info.js

@@ -3,8 +3,10 @@ import { fetchWP } from "../utils/fetch-wp.js";
 export class WPInfo {
     siteUrl;
     cached;
+    infoUrl;
     constructor(siteUrl) {
         this.siteUrl = siteUrl;
+        this.infoUrl = resolveURL(this.siteUrl, "/wp-json/ed/v1/dev/site-info");
     }
     async ping() {
         if (!this.siteUrl) {
@@ -20,11 +22,21 @@ export class WPInfo {
         }
         if (this.cached && !force)
             return this.cached;
-        const url = resolveURL(this.siteUrl, "/wp-json/ed/v1/dev/site-info");
-        const response = await fetchWP(url);
-        const result = (await response.json());
-        this.cached = result;
-        return result;
+        try {
+            const response = await fetchWP(this.infoUrl);
+            if (!response.ok) {
+                throw new Error(`${response.status} ${response.statusText}`);
+            }
+            const result = (await response.json());
+            this.cached = result;
+            return result;
+        }
+        catch (err) {
+            if (this.cached) {
+                return this.cached;
+            }
+            throw err;
+        }
     }
     async getPluginIssues() {
         const info = await this.getInfo();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -129,7 +129,7 @@
     "ufo": "^1.3.1",
     "undent": "^0.1.0",
     "undici": "6.21.0",
-    "valtio": "^2.1.2",
+    "valtio": "^2.3.1",
     "vinxi": "^0.5.8",
     "vite-plugin-glsl": "^1.5.5",
     "vite-tsconfig-paths": "4.3.2",