eddev 2.0.0-beta.111 → 2.0.0-beta.112

package/dist/app/entry/boot-admin.js

@@ -2,8 +2,9 @@ import { installFieldTypes } from "../lib/admin/installFieldTypes.js";
 import { runWidgets } from "../lib/admin/runWidgets.js";
 import { installEDGutenbergHooks } from "../lib/blocks/editor/installGutenbergHooks.js";
 export default function bootAdmin() {
-    // console.log("Booting admin")
+    console.log("Booting admin");
     if (window.name === "editor-canvas") {
+        console.log("Running in the editor canvas");
     }
     else {
         installEDGutenbergHooks();

package/dist/app/lib/blocks/editor/editor-config.d.ts

@@ -46,9 +46,24 @@ export declare const editorConfigStore: {
 export declare function configureEditorBlocks(config: EditorConfigItem): void;
 export declare function transformTemplateToBlocks(template: BlockTemplate, locked?: boolean, isFromTemplate?: boolean): any;
 type PostInfo = {
-    template: TemplateName | "default";
     type: PostTypeName;
+    isPattern: false;
+    isTemplatePart: false;
+    template: TemplateName | "default";
+    slug: string;
+} | {
+    type: "wp_block";
+    isPattern: true;
+    isTemplatePart: false;
+    title: string;
+} | {
+    type: "wp_template_part";
+    isPattern: false;
+    isTemplatePart: true;
+    area: string;
+    title: string;
     slug: string;
+    wp_pattern_category?: number[];
 };
 type MatcherFunction = (post: PostInfo) => boolean | void;
 type Matcher = {

package/dist/app/lib/blocks/editor/editor-config.js

@@ -107,10 +107,18 @@ export function getEditingPostInfo() {
     const postInfo = {
         ...post,
         ...edits,
+        isTemplatePart: false,
+        isPattern: false,
     };
     if (!postInfo.template)
         postInfo.template = "default";
     postInfo.template = postInfo.template.replace(/(^views\/|\.tsx?$)/g, "");
+    if (postInfo.type === "wp_template_part") {
+        postInfo.isTemplatePart = true;
+    }
+    if (postInfo.type === "wp_block") {
+        postInfo.isPattern = true;
+    }
     return postInfo;
 }
 export function updateTemplateConfig() {

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

@@ -111,9 +111,13 @@ export function installEDGutenbergHooks() {
         return {
             ...item,
             get parent() {
+                if (name === "core/block")
+                    return undefined;
                 return blocksByTag.expand([...(item.parent ?? []), ...(isRootBlock ? ["core/post-content"] : [])]);
             },
             get ancestor() {
+                if (name === "core/block")
+                    return undefined;
                 return item.ancestor ? blocksByTag.expand(item.ancestor) : undefined;
             },
             get allowedBlocks() {

package/dist/app/server/proxy-wp-admin.js

@@ -84,11 +84,11 @@ export async function proxyWpAdmin(event) {
                 },
                 children: "",
             });
-            const encodeForJSON = (str) => JSON.stringify(str).slice(1, -1).replace(/\"/g, "'");
-            body = body.replace(/<!---VITE_HEADER--->/g, getViteHeader);
-            body = body.replace(/<!---VITE_FOOTER--->/g, getViteFooter);
-            body = body.replace(/<!---VITE_HEADER_ENCODED--->/g, encodeForJSON(getViteHeader()));
-            body = body.replace(/<!---VITE_FOOTER_ENCODED--->/g, encodeForJSON(getViteFooter()));
+            const encodeForJSON = (str) => JSON.stringify(str).slice(1, -1).replaceAll("/", "\\/");
+            body = body.replaceAll("<!---VITE_HEADER--->", getViteHeader());
+            body = body.replaceAll("<!---VITE_FOOTER--->", getViteFooter());
+            body = body.replaceAll("<script id='vite-iframe-header'><\\/script>", encodeForJSON(getViteHeader()));
+            body = body.replaceAll("<script id='vite-iframe-footer'><\\/script>", encodeForJSON(getViteFooter()));
         }
     }
     else {

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.111";
+export declare const VERSION = "2.0.0-beta.112";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.111";
+export const VERSION = "2.0.0-beta.112";

package/dist/node/compiler/get-vite-config.js

@@ -182,9 +182,15 @@ export function getViteConfig(args) {
             minify: args.mode === "production",
             modulePreload: false,
             outDir: args.outDir,
-            // watch: {},
+            lib: {
+                entry: [
+                    `./.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`,
+                ],
+                fileName: (format, entryName) => `${entryName}.${format}.js`,
+                name: "eddev",
+                formats: args.target === "cms" ? ["iife"] : ["es"],
+            },
             rollupOptions: {
-                input: `./.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`,
                 external: args.target === "cms" ? ["react", "react-dom"] : [],
                 onwarn(warning, warn) {
                     if (!cliMode.verbose &&
@@ -199,8 +205,8 @@ export function getViteConfig(args) {
                 },
                 output: args.target === "cms"
                     ? {
-                        entryFileNames: "main.admin.js",
-                        format: "iife",
+                        // entryFileNames: "main.admin.js",
+                        // format: "iife",
                         globals: {
                             react: "window.React",
                             "react-dom": "window.ReactDOM",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.111",
+  "version": "2.0.0-beta.112",
   "description": "",
   "main": "index.js",
   "type": "module",