eddev 0.1.33-beta-7 → 0.1.34

package/blocks/installGutenbergHooks.js

@@ -74,6 +74,10 @@ function installEDGutenbergHooks() {
             item.supports.customClassName = false;
             item.edit = function (props) {
                 var self = this;
+                (0, react_1.useEffect)(function () {
+                    // @ts-ignore
+                    window.wp.data.dispatch("core/block-editor").setTemplateValidity(true);
+                }, []);
                 return ((0, jsx_runtime_1.jsx)(BlockContext.Provider, __assign({ value: { name: name, props: props } }, { children: (0, jsx_runtime_1.jsx)(blockAttributes_1.InlineEditingContextProvider, __assign({ values: props.attributes.inline || {}, innerBlocks: props.innerBlocks, onChange: function (attrs) {
                             props.setAttributes(__assign(__assign({}, props.attributes), { inline: attrs }));
                         } }, { children: edit_1.call(self, props) }), void 0) }), void 0));

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

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

package/build/create-codegen-worker.js

@@ -45,26 +45,26 @@ function createCodegenWorker(opts) {
     });
     worker.on("message", function (data) {
         if (data.code === "ready") {
-            subject.update(function (state) { return (__assign(__assign({}, state), { status: "ready", log: "", duration: 0, errors: [] })); });
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "ready", log: opts.retainLog ? state.log : "", duration: 0, errors: [] })); });
         }
         else if (data.code === "fetching") {
-            subject.update(function (state) { return (__assign(__assign({}, state), { status: "fetching", log: "", duration: 0, errors: [] })); });
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "fetching", log: opts.retainLog ? state.log : "", duration: 0, errors: [] })); });
         }
         else if (data.code === "generating") {
-            subject.update(function (state) { return (__assign(__assign({}, state), { status: "generating", errors: [], duration: 0, log: "" })); });
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "generating", errors: [], duration: 0, log: opts.retainLog ? state.log : "" })); });
         }
         else if (data.code === "error") {
             subject.update(function (state) { return (__assign(__assign({}, state), { status: "error", statusLabel: "", duration: 0, reason: undefined, errors: data.errors })); });
         }
         else if (data.code === "success") {
-            subject.update(function (state) { return (__assign(__assign({}, state), { status: "success", duration: data.duration, reason: data.reason, errors: [], log: "" })); });
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "success", duration: data.duration, reason: data.reason, errors: [], log: opts.retainLog ? state.log : "" })); });
         }
         else if (data.code === "invalidated") {
             subject.update(function (state) { return (__assign(__assign({}, state), { status: "invalidated", reason: data.reason, duration: 0 })); });
         }
     });
     worker.on("exit", function () {
-        subject.update(function (state) { return (__assign(__assign({}, state), { status: "success", log: "" })); });
+        subject.update(function (state) { return (__assign(__assign({}, state), { status: "success", log: opts.retainLog ? state.log : "" })); });
     });
     return subject;
 }

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

@@ -1,4 +1,3 @@
-import { WebpackWorkerOptions } from "./get-webpack-config";
 import { Observable } from "../utils/Observable";
-import { CompilerState } from "./state/compiler-state";
+import { CompilerState, WebpackWorkerOptions } from "./state/compiler-state";
 export declare function createWebpackWorker(opts: WebpackWorkerOptions): Observable<CompilerState>;

package/build/create-webpack-worker.js

@@ -27,7 +27,11 @@ function createWebpackWorker(opts) {
         subject.update(function (state) { return (__assign(__assign({}, state), { log: (state.log || "") + chunk })); });
     });
     worker.stdout.on("data", function (chunk) {
-        subject.update(function (state) { return (__assign(__assign({}, state), { log: (state.log || "") + chunk })); });
+        var str = chunk.toString();
+        if (str.includes("Project is running at") || str.includes("webpack output is served from")) {
+            return;
+        }
+        subject.update(function (state) { return (__assign(__assign({}, state), { log: (state.log || "") + str })); });
     });
     var subject = new Observable_1.Observable({
         title: opts.title,
@@ -38,18 +42,18 @@ function createWebpackWorker(opts) {
     });
     worker.on("message", function (data) {
         if (data.code === "compiling") {
-            subject.update(function (state) { return (__assign(__assign({}, state), { status: "compiling", statusLabel: state.status === "compiling" ? state.statusLabel : "", log: "", duration: 0, errors: [] })); });
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "compiling", statusLabel: state.status === "compiling" ? state.statusLabel : "", log: opts.retainLog ? state.log : "", duration: 0, errors: [] })); });
         }
         else if (data.code === "error") {
             subject.update(function (state) { return (__assign(__assign({}, state), { status: "error", statusLabel: "", duration: 0, errors: data.errors })); });
         }
         else if (data.code === "finished") {
-            subject.update(function (state) { return (__assign(__assign({}, state), { status: data.watching ? "waiting" : "success", statusLabel: "", duration: data.duration, log: "", errors: data.errors })); });
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: data.watching ? "waiting" : "success", statusLabel: "", duration: data.duration, log: opts.retainLog ? state.log : "", errors: data.errors })); });
         }
         else if (data.code === "invalidated") {
             subject.update(function (state) { return (__assign(__assign({}, state), { status: "compiling", statusLabel: data.changedFile
                     ? "Rebuilding (".concat(data.changedFile.replace(opts.baseDirectory, ""), ")")
-                    : "Rebuilding (changes detected)", log: "", duration: 0, errors: [] })); });
+                    : "Rebuilding (changes detected)", log: opts.retainLog ? state.log : "", duration: 0, errors: [] })); });
         }
     });
     worker.on("exit", function () {

package/build/get-webpack-config.d.ts

@@ -1,12 +1,3 @@
 import { Configuration } from "webpack";
-export declare type WebpackWorkerOptions = {
-    title: string;
-    baseDirectory: string;
-    themeName: string;
-    mode: "development" | "production";
-    target: "client" | "ssr";
-    isAdmin: boolean;
-    serverless: boolean;
-    hotPort?: number;
-};
+import { WebpackWorkerOptions } from "./state/compiler-state";
 export default function getWebpackConfig(opts: WebpackWorkerOptions): Promise<Configuration>;

package/build/state/codegen-state.d.ts

@@ -25,3 +25,8 @@ export declare type CodegenSignal = {
     code: "invalidated";
     reason: string;
 };
+export declare type CodegenOptions = {
+    baseDirectory: string;
+    watch: boolean;
+    retainLog?: boolean;
+};

package/build/state/compiler-state.d.ts

@@ -36,3 +36,14 @@ export declare type CompilerSignal = {
     watching?: boolean;
     errors?: CompilerError[];
 };
+export declare type WebpackWorkerOptions = {
+    title: string;
+    baseDirectory: string;
+    themeName: string;
+    mode: "development" | "production";
+    target: "client" | "ssr";
+    isAdmin: boolean;
+    serverless: boolean;
+    hotPort?: number;
+    retainLog?: boolean;
+};

package/build/workers/codegen-worker-script.d.ts

@@ -1,5 +1,2 @@
-export declare type CodegenOptions = {
-    baseDirectory: string;
-    watch: boolean;
-};
+import { CodegenOptions } from "../state/codegen-state";
 export declare function beginWork(opts: CodegenOptions): Promise<void>;

package/build/workers/webpack-worker-script.d.ts

@@ -1,2 +1,2 @@
-import { WebpackWorkerOptions } from "../get-webpack-config";
+import { WebpackWorkerOptions } from "../state/compiler-state";
 export declare function beginWork(opts: WebpackWorkerOptions): Promise<void>;

package/build/workers/webpack-worker-script.js

@@ -103,6 +103,7 @@ function beginWork(opts) {
                             contentBase: false,
                             noInfo: true,
                             https: false,
+                            quiet: true,
                             // quiet: true,
                             // clientLogLevel: "silent",
                             headers: {

package/cli/build.dev.d.ts

@@ -1,5 +1,7 @@
 declare type DevOptions = {
     serverless: boolean;
+    retainLog?: boolean;
+    mode?: "frontend" | "admin" | "codegen";
 };
 export declare function devCommand(opts: DevOptions): Promise<void>;
 export {};

package/cli/build.dev.js

@@ -50,40 +50,53 @@ var create_webpack_worker_1 = require("../build/create-webpack-worker");
 var create_codegen_worker_1 = require("../build/create-codegen-worker");
 function devCommand(opts) {
     return __awaiter(this, void 0, void 0, function () {
-        var themeName, frontendObservable, adminObservable, codegenObservable;
+        var themeName, enableFrontend, enableAdmin, enableCodegen, frontendObservable, adminObservable, codegenObservable;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, (0, promptIfRepoNameIncorrect_1.promptIfRepoThemeMismatch)()];
                 case 1:
                     _a.sent();
                     themeName = path_1.default.basename(process.cwd());
-                    frontendObservable = (0, create_webpack_worker_1.createWebpackWorker)({
-                        title: "Frontend Bundle",
-                        baseDirectory: process.cwd() + "/",
-                        mode: "development",
-                        target: "client",
-                        serverless: opts.serverless,
-                        themeName: themeName,
-                        isAdmin: false,
-                        hotPort: 8991,
-                    });
-                    adminObservable = (0, create_webpack_worker_1.createWebpackWorker)({
-                        title: "Admin Client",
-                        baseDirectory: process.cwd() + "/",
-                        mode: "development",
-                        target: "client",
-                        serverless: false,
-                        themeName: themeName,
-                        isAdmin: true,
-                        hotPort: 8992,
-                    });
-                    codegenObservable = (0, create_codegen_worker_1.createCodegenWorker)({
-                        baseDirectory: process.cwd() + "/",
-                        watch: true,
-                    });
+                    enableFrontend = !opts.mode || opts.mode === "frontend";
+                    enableAdmin = !opts.mode || opts.mode === "admin";
+                    enableCodegen = !opts.mode || opts.mode === "codegen";
+                    console.log(opts);
+                    frontendObservable = enableFrontend
+                        ? (0, create_webpack_worker_1.createWebpackWorker)({
+                            title: "Frontend Bundle",
+                            baseDirectory: process.cwd() + "/",
+                            mode: "development",
+                            target: "client",
+                            serverless: opts.serverless,
+                            themeName: themeName,
+                            isAdmin: false,
+                            hotPort: 8991,
+                            retainLog: opts.retainLog,
+                        })
+                        : undefined;
+                    adminObservable = enableAdmin
+                        ? (0, create_webpack_worker_1.createWebpackWorker)({
+                            title: "Admin Client",
+                            baseDirectory: process.cwd() + "/",
+                            mode: "development",
+                            target: "client",
+                            serverless: false,
+                            themeName: themeName,
+                            isAdmin: true,
+                            hotPort: 8992,
+                            retainLog: opts.retainLog,
+                        })
+                        : undefined;
+                    codegenObservable = enableCodegen
+                        ? (0, create_codegen_worker_1.createCodegenWorker)({
+                            baseDirectory: process.cwd() + "/",
+                            watch: true,
+                            retainLog: opts.retainLog,
+                        })
+                        : undefined;
                     // Set up a process which will regenerate schemas, and watch for changes
                     // Render output to screen
-                    (0, ink_1.render)((0, jsx_runtime_1.jsx)(DevCLIDisplay_1.DevCLIDisplay, { bundles: [frontendObservable, adminObservable], codegen: codegenObservable }, void 0));
+                    (0, ink_1.render)((0, jsx_runtime_1.jsx)(DevCLIDisplay_1.DevCLIDisplay, { bundles: [frontendObservable, adminObservable].filter(Boolean), codegen: codegenObservable }, void 0));
                     return [2 /*return*/];
             }
         });

package/cli/cli.js

@@ -47,9 +47,13 @@ program
     .command("dev")
     .description("Build in dev mode")
     .option("-s, --serverless", 'Build in "serverless" mode', false)
+    .option("-m, --mode <mode>", 'Defaults to all modes, but use "frontend", "admin" or "codegen" to run in just one mode', undefined)
+    .option("--verbose", "Enables log retention", false)
     .action(function (options) {
     (0, build_dev_1.devCommand)({
         serverless: options.serverless,
+        mode: options.mode,
+        retainLog: options.verbose,
     });
 });
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.1.33-beta-7",
+  "version": "0.1.34",
   "main": "./index.js",
   "license": "MIT",
   "bin": {