eddev 0.1.25-beta-02 → 0.1.28

package/blocks/inlineEditing.js

@@ -43,6 +43,7 @@ function EditableText(_a) {
         delete otherProps.disableLineBreaks;
         delete otherProps.id;
         delete otherProps.as;
+        delete otherProps.placeholder;
         if (value === "" || typeof value !== "string") {
             if (props.defaultValue) {
                 value = props.defaultValue;

package/blocks/installGutenbergHooks.js

@@ -25,6 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installEDGutenbergHooks = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
+// @ts-ignore
 var hooks_1 = require("@wordpress/hooks");
 var react_1 = require("react");
 // @ts-ignore

package/build/codegen-worker-script.js

@@ -95,6 +95,7 @@ var typescriptPlugin = __importStar(require("@graphql-codegen/typescript"));
 var typescriptOperationsPlugin = __importStar(require("@graphql-codegen/typescript-operations"));
 var CodegenNoDuplicates = __importStar(require("./graphql-codegen/graphql-codegen-no-duplicates"));
 var CodegenFiles = __importStar(require("./graphql-codegen/graphql-codegen-files"));
+var CodegenQueries = __importStar(require("./graphql-codegen/graphql-codegen-queries"));
 var sendSignal = function (sig) {
     if (worker_threads_1.parentPort) {
         worker_threads_1.parentPort.postMessage(sig);
@@ -229,7 +230,7 @@ function beginWork(opts) {
                                                                 return [3 /*break*/, 3];
                                                             case 2:
                                                                 err_3 = _a.sent();
-                                                                parseErrors.push("Error parsing \"" + file.replace(opts.baseDirectory, "") + ":\n" + err_3);
+                                                                parseErrors.push("Error parsing \"".concat(file.replace(opts.baseDirectory, ""), ":\n").concat(err_3));
                                                                 return [3 /*break*/, 3];
                                                             case 3: return [2 /*return*/];
                                                         }
@@ -331,15 +332,15 @@ function beginWork(opts) {
                                                 var item = _d[_i];
                                                 if (item.name.value === "block") {
                                                     var blockField = (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.selectionSet) === null || _a === void 0 ? void 0 : _a.selections[0]) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.value;
-                                                    blockSelection = "Exclude<" + importedName + "[\"block\"][" + JSON.stringify(blockField) + "], null>";
+                                                    blockSelection = "Exclude<".concat(importedName, "[\"block\"][").concat(JSON.stringify(blockField), "], null>");
                                                 }
                                                 else {
-                                                    queryKeyVals.push([JSON.stringify(item.name.value), importedName + "[" + JSON.stringify(item.name.value) + "]"].join(": "));
+                                                    queryKeyVals.push([JSON.stringify(item.name.value), "".concat(importedName, "[").concat(JSON.stringify(item.name.value), "]")].join(": "));
                                                 }
                                             }
                                             var type = [];
                                             if (queryKeyVals.length)
-                                                type.push("{" + queryKeyVals.join(",\n") + "}");
+                                                type.push("{".concat(queryKeyVals.join(",\n"), "}"));
                                             if (blockSelection)
                                                 type.push(blockSelection);
                                             if (type.length === 0)
@@ -348,41 +349,20 @@ function beginWork(opts) {
                                         },
                                     },
                                 },
-                                // "hooks/queries.ts": {
-                                //   documents: [...documentSets.queries],
-                                //   plugins: [
-                                //     {
-                                //       files: {},
-                                //     },
-                                //   ],
-                                //   pluginMap: {
-                                //     files: CodegenFiles,
-                                //   },
-                                //   config: {
-                                //     rootDir: opts.baseDirectory,
-                                //     globalName: "BlockProps",
-                                //     folderName: "blocks",
-                                //     getType: (importedName: string, def: any) => {
-                                //       const queryKeyVals: any[] = []
-                                //       let blockSelection = ""
-                                //       for (const item of def.selectionSet.selections) {
-                                //         if (item.name.value === "block") {
-                                //           const blockField = item?.selectionSet?.selections[0]?.name?.value
-                                //           blockSelection = `Exclude<${importedName}["block"][${JSON.stringify(blockField)}], null>`
-                                //         } else {
-                                //           queryKeyVals.push(
-                                //             [JSON.stringify(item.name.value), `${importedName}[${JSON.stringify(item.name.value)}]`].join(": ")
-                                //           )
-                                //         }
-                                //       }
-                                //       const type: string[] = []
-                                //       if (queryKeyVals.length) type.push(`{${queryKeyVals.join(",\n")}}`)
-                                //       if (blockSelection) type.push(blockSelection)
-                                //       if (type.length === 0) return {}
-                                //       return type.join(" & ")
-                                //     },
-                                //   },
-                                // },
+                                "hooks/queries.ts": {
+                                    documents: __spreadArray([], documentSets.queries, true),
+                                    plugins: [
+                                        {
+                                            queries: {},
+                                        },
+                                    ],
+                                    pluginMap: {
+                                        queries: CodegenQueries,
+                                    },
+                                    config: {
+                                        rootDir: opts.baseDirectory,
+                                    },
+                                },
                             };
                             // Notify of generation start
                             sendSignal({

package/build/create-codegen-worker.d.ts

@@ -1,4 +1,4 @@
 import { Observable } from "../cli/display/lib/Observable";
-import { CodegenOptions } from "./codegen-worker-script";
+import { CodegenOptions } from "./workers/codegen-worker-script";
 import { CodegenState } from "./state/codegen-state";
 export declare function createCodegenWorker(opts: CodegenOptions): Observable<CodegenState>;

package/build/create-codegen-worker.js

@@ -16,7 +16,7 @@ var worker_threads_1 = require("worker_threads");
 var path_1 = require("path");
 var Observable_1 = require("../cli/display/lib/Observable");
 function createCodegenWorker(opts) {
-    var worker = new worker_threads_1.Worker((0, path_1.join)(__dirname, "codegen-worker-script.js"), {
+    var worker = new worker_threads_1.Worker((0, path_1.join)(__dirname, "workers/codegen-worker-script.js"), {
         workerData: opts,
         stderr: true,
         stdin: false,

package/build/create-webpack-worker.js

@@ -16,7 +16,7 @@ var worker_threads_1 = require("worker_threads");
 var path_1 = require("path");
 var Observable_1 = require("../cli/display/lib/Observable");
 function createWebpackWorker(opts) {
-    var worker = new worker_threads_1.Worker((0, path_1.join)(__dirname, "webpack-worker-script.js"), {
+    var worker = new worker_threads_1.Worker((0, path_1.join)(__dirname, "workers/webpack-worker-script.js"), {
         workerData: opts,
         stderr: true,
         stdin: false,
@@ -48,7 +48,7 @@ function createWebpackWorker(opts) {
         }
         else if (data.code === "invalidated") {
             subject.update(function (state) { return (__assign(__assign({}, state), { status: "compiling", statusLabel: data.changedFile
-                    ? "Rebuilding (" + data.changedFile.replace(opts.baseDirectory, "") + ")"
+                    ? "Rebuilding (".concat(data.changedFile.replace(opts.baseDirectory, ""), ")")
                     : "Rebuilding (changes detected)", log: "", duration: 0, errors: [] })); });
         }
     });

package/build/get-webpack-config.js

@@ -95,32 +95,24 @@ function getWebpackConfig(opts) {
                     entryDir = path_1.default.resolve(path_1.default.dirname(__dirname), "./entry");
                     if (isDev) {
                         if (opts.isAdmin) {
-                            ENTRY["main"] = [
-                                // "webpack-plugin-serve/client",
-                                entryDir + "/entry.publicPath.js",
-                                entryDir + "/entry.admin.dev.js",
-                            ];
+                            ENTRY["main"] = ["".concat(entryDir, "/entry.publicPath.js"), "".concat(entryDir, "/entry.admin.dev.js")];
                         }
                         else if (isServerless) {
-                            ENTRY["main"] = [entryDir + "/entry.serverless.dev.js"];
+                            ENTRY["main"] = ["".concat(entryDir, "/entry.serverless.dev.js")];
                         }
                         else {
-                            ENTRY["main"] = [
-                                // "webpack-plugin-serve/client",
-                                entryDir + "/entry.publicPath.js",
-                                entryDir + "/entry.monolith.dev.js",
-                            ];
+                            ENTRY["main"] = ["".concat(entryDir, "/entry.publicPath.js"), "".concat(entryDir, "/entry.monolith.dev.js")];
                         }
                     }
                     else {
                         if (opts.isAdmin) {
-                            ENTRY["main"] = [entryDir + "/entry.publicPath.js", entryDir + "/entry.admin.prod.js"];
+                            ENTRY["main"] = ["".concat(entryDir, "/entry.publicPath.js"), "".concat(entryDir, "/entry.admin.prod.js")];
                         }
                         else if (isServerless) {
-                            ENTRY["main"] = [entryDir + "/entry.serverless.prod.js"];
+                            ENTRY["main"] = ["".concat(entryDir, "/entry.serverless.prod.js")];
                         }
                         else {
-                            ENTRY["main"] = [entryDir + "/entry.publicPath.js", entryDir + "/entry.monolith.prod.js"];
+                            ENTRY["main"] = ["".concat(entryDir, "/entry.publicPath.js"), "".concat(entryDir, "/entry.monolith.prod.js")];
                         }
                     }
                     distSuffix = opts.isAdmin ? "admin" : "frontend";
@@ -131,6 +123,7 @@ function getWebpackConfig(opts) {
                     ALIAS["@components"] = path_1.default.join(opts.baseDirectory, "components");
                     ALIAS["@views"] = path_1.default.join(opts.baseDirectory, "views");
                     ALIAS["@hooks"] = path_1.default.join(opts.baseDirectory, "hooks");
+                    ALIAS["@queries"] = path_1.default.join(opts.baseDirectory, "hooks/queries");
                     RULES.push({
                         test: /\.[jt]sx?$/,
                         exclude: /node_modules/,
@@ -152,13 +145,11 @@ function getWebpackConfig(opts) {
                                             require.resolve("@babel/preset-react"),
                                             {
                                                 runtime: "automatic",
-                                                // importSource: Path.resolve(__dirname, "../utils/jsx"),
                                             },
                                         ],
                                         require.resolve("@babel/preset-typescript"),
                                     ],
                                     plugins: [
-                                        // Path.resolve(__dirname, "../utils/cxBabelPlugin.js"),
                                         isBrowser && isDev && [require.resolve("react-refresh/babel"), { skipEnvCheck: true }],
                                         require.resolve("@loadable/babel-plugin"),
                                     ].filter(Boolean),
@@ -176,7 +167,7 @@ function getWebpackConfig(opts) {
                             {
                                 loader: mini_css_extract_plugin_1.default.loader,
                                 options: {
-                                    publicPath: "/wp-content/themes/" + opts.themeName + "/dist/" + distSuffix,
+                                    publicPath: "/wp-content/themes/".concat(opts.themeName, "/dist/").concat(distSuffix),
                                 },
                             },
                             {
@@ -198,21 +189,6 @@ function getWebpackConfig(opts) {
                                     },
                                 },
                             },
-                            // {
-                            //   loader: require.resolve("sass-loader"),
-                            //   options: {
-                            //     sourceMap: true,
-                            //     implementation: require("sass"),
-                            //     // prependData: (loaderContext: any) => {
-                            //     //   const entryName = path
-                            //     //     .basename(loaderContext.resourcePath)
-                            //     //     .replace(/\.scss$/i, "")
-                            //     //   return `
-                            //     //   $bundle: ${JSON.stringify(entryName || "")};
-                            //     //   $env: "${process.env.NODE_ENV}";
-                            //     // `
-                            //   },
-                            // },
                         ],
                     });
                     // Define some values
@@ -221,9 +197,10 @@ function getWebpackConfig(opts) {
                     DEFINES["process.LOADABLE_STATS_FILE"] = JSON.stringify(loadableManifestFile);
                     DEFINES["process.dev"] = isDev ? "true" : "false";
                     DEFINES["process.admin"] = opts.isAdmin ? "true" : "false";
-                    DEFINES["process.env.themePath"] = JSON.stringify("/wp-content/themes/" + opts.themeName);
+                    DEFINES["process.env.themePath"] = JSON.stringify("/wp-content/themes/".concat(opts.themeName));
+                    DEFINES["process.themePath"] = JSON.stringify("/wp-content/themes/".concat(opts.themeName));
                     if (isBrowser) {
-                        DEFINES["process.env.themePath"] = "window.THEME_PATH || " + DEFINES["process.env.themePath"];
+                        DEFINES["process.env.themePath"] = "window.THEME_PATH || ".concat(DEFINES["process.env.themePath"]);
                     }
                     // Bundle analyser
                     if (!opts.isAdmin && !isDev) {
@@ -283,25 +260,25 @@ function getWebpackConfig(opts) {
                             var componentName = (0, change_case_1.pascalCase)(name);
                             return { relative: relative, name: name, module: module, componentName: componentName };
                         });
-                        writeVirtualModule(ALIAS["@manifest/views"], "\n          " + (!isServerless && "import loadable from '" + require.resolve("@loadable/component") + "';") + "\n          import App from " + JSON.stringify("./views/_app.tsx") + "\n\n          " + (isServerless
+                        writeVirtualModule(ALIAS["@manifest/views"], "\n          ".concat(!isServerless && "import loadable from '".concat(require.resolve("@loadable/component"), "';"), "\n          import App from ").concat(JSON.stringify("./views/_app.tsx"), "\n\n          ").concat(isServerless
                             ? files.map(function (_a) {
                                 var componentName = _a.componentName, module = _a.module;
-                                return "import " + componentName + " from " + module;
+                                return "import ".concat(componentName, " from ").concat(module);
                             }).join("\n")
-                            : "") + "\n\n          export { App }\n\n          export default {\n            " + files
+                            : "", "\n\n          export { App }\n\n          export default {\n            ").concat(files
                             .map(function (_a) {
                             var relative = _a.relative, componentName = _a.componentName, module = _a.module;
                             if (!isServerless) {
                                 // In serverless mode, export @loadable components. Script tags will be
                                 // auto-included in output HTML
-                                return "\"" + relative + "\": loadable(() => import(" + module + "))";
+                                return "\"".concat(relative, "\": loadable(() => import(").concat(module, "))");
                             }
                             else {
                                 // On non-serverless, the templates are bundled straight into the main app.
-                                return "\"" + relative + "\": " + componentName;
+                                return "\"".concat(relative, "\": ").concat(componentName);
                             }
                         })
-                            .join(",\n") + "\n          }\n        ");
+                            .join(",\n"), "\n          }\n        "));
                     };
                     templateLookupPattern = path_1.default.resolve(opts.baseDirectory, "views/**/*.tsx");
                     if (!opts.isAdmin) return [3 /*break*/, 1];
@@ -332,31 +309,31 @@ function getWebpackConfig(opts) {
                             return { relative: relative, name: name, module: module, componentName: componentName };
                         });
                         if (opts.isAdmin) {
-                            writeVirtualModule(ALIAS["@manifest/blocks"], "\n        import coreBlocks from './blocks/_core.tsx'\n        " + (!isServerless && "import loadable from '" + require.resolve("@loadable/component") + "';") + "\n\n        export default {\n          ...coreBlocks,\n          " + files
+                            writeVirtualModule(ALIAS["@manifest/blocks"], "\n        import coreBlocks from './blocks/_core.tsx'\n        ".concat(!isServerless && "import loadable from '".concat(require.resolve("@loadable/component"), "';"), "\n\n        export default {\n          ...coreBlocks,\n          ").concat(files
                                 .map(function (_a) {
                                 var relative = _a.relative, componentName = _a.componentName, module = _a.module;
                                 var parts = relative.replace(/\.tsx$/, "").split("/");
                                 var blockName = "acf/" + parts.slice(1).join("-");
-                                return "\"" + blockName + "\": loadable(() => import(" + module + "))";
+                                return "\"".concat(blockName, "\": loadable(() => import(").concat(module, "))");
                             })
-                                .join(",\n") + "\n        }\n      ");
+                                .join(",\n"), "\n        }\n      "));
                         }
                         else {
-                            writeVirtualModule(ALIAS["@manifest/blocks"], "\n        import coreBlocks from './blocks/_core.tsx'\n\n        " + files
+                            writeVirtualModule(ALIAS["@manifest/blocks"], "\n        import coreBlocks from './blocks/_core.tsx'\n\n        ".concat(files
                                 .map(function (_a) {
                                 var relative = _a.relative, componentName = _a.componentName, module = _a.module;
                                 var parts = relative.replace(/\.tsx$/, "").split("/");
                                 var blockName = "acf/" + parts.slice(1).join("-");
-                                return "import " + componentName + " from " + module;
+                                return "import ".concat(componentName, " from ").concat(module);
                             })
-                                .join("\n") + "\n\n        export default {\n          ...coreBlocks,\n          " + files
+                                .join("\n"), "\n\n        export default {\n          ...coreBlocks,\n          ").concat(files
                                 .map(function (_a) {
                                 var relative = _a.relative, componentName = _a.componentName, module = _a.module;
                                 var parts = relative.replace(/\.tsx$/, "").split("/");
                                 var blockName = "acf/" + parts.slice(1).join("-");
-                                return "\"" + blockName + "\": " + componentName;
+                                return "\"".concat(blockName, "\": ").concat(componentName);
                             })
-                                .join(",\n") + "\n        }\n      ");
+                                .join(",\n"), "\n        }\n      "));
                         }
                     };
                     blockLookupManifest = path_1.default.resolve(opts.baseDirectory, "blocks/**/*.tsx");
@@ -395,10 +372,11 @@ function getWebpackConfig(opts) {
                                 // chunkIds: "named",
                             },
                             output: {
-                                filename: "[name]." + (opts.isAdmin ? "admin" : "frontend") + ".js",
-                                publicPath: isDev ? "//127.0.0.1:" + opts.hotPort + "/" : "/wp-content/themes/" + opts.themeName + "/dist/" + distSuffix,
+                                filename: "[name].".concat(opts.isAdmin ? "admin" : "frontend", ".js"),
+                                publicPath: isDev ? "//127.0.0.1:".concat(opts.hotPort, "/") : "/wp-content/themes/".concat(opts.themeName, "/dist/").concat(distSuffix, "/"),
                                 path: outputFolder,
                                 globalObject: isSSR ? "this" : "self",
+                                clean: true,
                             },
                             externals: __assign({ worker_threads: true }, EXTERNALS),
                             resolve: {

package/build/graphql-codegen/graphql-codegen-files.js

@@ -45,20 +45,20 @@ module.exports = {
                 var typeName = ((_a = config.getType) === null || _a === void 0 ? void 0 : _a.call(config, importedName, doc.document.definitions[0])) || importedName;
                 imports.push(importedName);
                 var key = relative.replace(/\.graphql/, "");
-                items.push(JSON.stringify(key) + ": " + typeForFile(key, typeName));
+                items.push("".concat(JSON.stringify(key), ": ").concat(typeForFile(key, typeName)));
             }
         });
         for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
             var file = files_1[_i];
             if (!filesFound[file.replace(/\.tsx/, "")]) {
                 var key = getRelative(file).replace(/\.tsx$/, "");
-                items.push(JSON.stringify(key) + ": " + typeForFile(key, ""));
+                items.push("".concat(JSON.stringify(key), ": ").concat(typeForFile(key, "")));
             }
         }
         if (imports.length === 0) {
             process.exit();
             return "export { };";
         }
-        return "import { " + imports.sort().join(", ") + " } from \"./types.graphql\"\nexport { };\n\ndeclare global {\n  type " + config.globalName + " = {\n" + items.sort().join(",\n") + "\n  }\n}\n      ";
+        return "import { ".concat(imports.sort().join(", "), " } from \"./types.graphql\"\nexport { };\n\ndeclare global {\n  type ").concat(config.globalName, " = {\n").concat(items.sort().join(",\n"), "\n  }\n}\n      ");
     },
 };

package/build/graphql-codegen/graphql-codegen-no-duplicates.js

@@ -5,7 +5,7 @@ module.exports = {
     validate: function (schema, documents, config, info) {
         documents.forEach(function (doc) {
             if (doc.document.definitions.length === 0) {
-                throw new Error("GraphQL file '" + doc.location + "' does not contain any uniquely named operations.");
+                throw new Error("GraphQL file '".concat(doc.location, "' does not contain any uniquely named operations."));
                 process.exit();
             }
         });