eddev 0.1.33-beta-7 → 0.1.37

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/clean.d.ts

@@ -0,0 +1 @@
+export declare function cleanOutput(): Promise<void>;

package/build/clean.js

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanOutput = void 0;
+var rimraf_1 = __importDefault(require("rimraf"));
+var path_1 = require("path");
+function cleanOutput() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, new Promise(function (resolve) { return (0, rimraf_1.default)((0, path_1.join)(process.cwd(), "dist/frontend"), resolve); })];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, new Promise(function (resolve) { return (0, rimraf_1.default)((0, path_1.join)(process.cwd(), "dist/admin"), resolve); })];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.cleanOutput = cleanOutput;

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/get-webpack-config.js

@@ -302,7 +302,7 @@ function getWebpackConfig(opts) {
                             var componentName = (0, change_case_1.pascalCase)(name);
                             return { relative: relative, name: name, module: module, componentName: componentName };
                         });
-                        var useLoadableBlocks = opts.isAdmin && !isDev;
+                        var useLoadableBlocks = false;
                         if (useLoadableBlocks) {
                             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) {

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/codegen-worker-script.js

@@ -140,7 +140,7 @@ function beginWork(opts) {
                                     var httpsAgent = new https_1.Agent({
                                         rejectUnauthorized: false,
                                     });
-                                    return (0, cross_fetch_1.default)(url, __assign(__assign({}, opts), { agent: httpsAgent }));
+                                    return (0, cross_fetch_1.default)(url, __assign(__assign({}, opts), { agent: url.includes("https") ? httpsAgent : undefined }));
                                 },
                             })];
                         case 1:

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

@@ -53,6 +53,7 @@ var webpack_1 = __importDefault(require("webpack"));
 var webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 var worker_threads_1 = require("worker_threads");
 var get_webpack_config_1 = __importDefault(require("../get-webpack-config"));
+var clean_1 = require("../clean");
 var sendSignal = function (sig) {
     if (worker_threads_1.parentPort) {
         worker_threads_1.parentPort.postMessage(sig);
@@ -82,9 +83,12 @@ function beginWork(opts) {
                     sendSignal({
                         code: "compiling",
                     });
+                    return [4 /*yield*/, (0, clean_1.cleanOutput)()];
+                case 1:
+                    _b.sent();
                     _a = webpack_1.default;
                     return [4 /*yield*/, (0, get_webpack_config_1.default)(opts)];
-                case 1:
+                case 2:
                     compiler = _a.apply(void 0, [_b.sent()]);
                     if (opts.hotPort) {
                         server = new webpack_dev_server_1.default(compiler, {
@@ -103,6 +107,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,52 @@ 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";
+                    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/build.prod.js

@@ -44,6 +44,7 @@ var get_webpack_config_1 = __importDefault(require("../build/get-webpack-config"
 var webpack_1 = require("webpack");
 var promptIfRepoNameIncorrect_1 = require("../utils/promptIfRepoNameIncorrect");
 var path_1 = __importDefault(require("path"));
+var clean_1 = require("../build/clean");
 function prodCommand(opts) {
     return __awaiter(this, void 0, void 0, function () {
         var contentBase, themeName, compiler, _a, _b;
@@ -55,6 +56,9 @@ function prodCommand(opts) {
                 case 1:
                     _c.sent();
                     themeName = path_1.default.basename(process.cwd());
+                    return [4 /*yield*/, (0, clean_1.cleanOutput)()];
+                case 2:
+                    _c.sent();
                     _a = webpack_1.webpack;
                     return [4 /*yield*/, (0, get_webpack_config_1.default)({
                             title: "Frontend Client",
@@ -65,7 +69,7 @@ function prodCommand(opts) {
                             themeName: themeName,
                             isAdmin: false,
                         })];
-                case 2:
+                case 3:
                     _b = [
                         _c.sent()
                     ];
@@ -78,7 +82,7 @@ function prodCommand(opts) {
                             themeName: themeName,
                             isAdmin: true,
                         })];
-                case 3:
+                case 4:
                     compiler = _a.apply(void 0, [_b.concat([
                             _c.sent()
                         ])]);

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/cli/display/components/BundleDisplay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CompilerState } from "../../../build/state/compiler-state";
 import { Observable } from "../../../utils/Observable";
 export declare function BundleDisplay(props: {

package/cli/display/components/CodegenDisplay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CodegenState } from "../../../build/state/codegen-state";
 import { Observable } from "../../../utils/Observable";
 export declare function CodegenDisplay(props: {

package/cli/display/components/DevCLIDisplay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CodegenState } from "../../../build/state/codegen-state";
 import { CompilerState } from "../../../build/state/compiler-state";
 import { Observable } from "../../../utils/Observable";

package/cli/display/components/StatusIcon.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type Props = {
     icon: "loading" | "tick" | "error" | "none";
 };

package/components/AdminBar.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare function AdminBar(): JSX.Element;

package/entry/Root.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function Root(): JSX.Element;

package/package.json

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

package/style/createStitches.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DefaultThemeMap } from "@stitches/react";
 import { ConfigType } from "@stitches/core/types/config";
 import { Properties as CSS } from "csstype";