eddev 0.1.33-beta-4 → 0.1.35

package/blocks/inlineEditing.js

@@ -30,6 +30,8 @@ var ContentBlocks_1 = require("./ContentBlocks");
 var react_1 = require("react");
 var blockAttributes_1 = require("./blockAttributes");
 var react_2 = require("@stitches/react");
+var remoteProps_1 = require("../routing/remoteProps");
+var __1 = require("..");
 function EditableText(_a) {
     var id = _a.id, as = _a.as, props = __rest(_a, ["id", "as"]);
     if (process.admin) {
@@ -52,7 +54,15 @@ function EditableText(_a) {
                 return null;
             }
         }
-        return (0, react_1.createElement)(as || "div", __assign({ dangerouslySetInnerHTML: { __html: value } }, otherProps));
+        var router_1 = (0, __1.useRouter)();
+        return (0, react_1.createElement)(as || "div", __assign({ dangerouslySetInnerHTML: { __html: value }, onClick: function (e) {
+                if (e.target && e.target instanceof HTMLAnchorElement) {
+                    if ((0, remoteProps_1.isSameOrigin)(e.target.href) && router_1) {
+                        e.preventDefault();
+                        router_1.onNavigate(e.target.href);
+                    }
+                }
+            } }, otherProps));
     }
 }
 exports.EditableText = EditableText;

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/babel/plugin-name-defined-components.js

@@ -11,6 +11,7 @@ function default_1(_a) {
                 var args = path.node.arguments;
                 if (callee.type === "Identifier" && (callee.name === "defineBlock" || callee.name === "defineView")) {
                     // First argument a string literal?
+                    var type = callee.name === "defineBlock" ? "block" : "view";
                     var name_1 = "";
                     if (args.length > 0 && args[0].type === "StringLiteral") {
                         name_1 = args[0].value;
@@ -34,7 +35,7 @@ function default_1(_a) {
                             }
                             path.replaceWith(t.callExpression(t.identifier(callee.name), [
                                 t.stringLiteral(name_1),
-                                t.functionExpression(t.identifier((0, pascal_case_1.pascalCase)(name_1)), args[1].params, body, args[1].generator, args[1].async),
+                                t.functionExpression(t.identifier((0, pascal_case_1.pascalCase)(type + "-" + name_1)), args[1].params, body, args[1].generator, args[1].async),
                             ]));
                         }
                     }

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

@@ -40,35 +40,32 @@ function createCodegenWorker(opts) {
         log: "",
     });
     worker.on("error", function (err) {
+        console.log(err);
         subject.update(function (state) { return (__assign(__assign({}, state), { status: "error" })); });
     });
     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", () => {
-    //   subject.update((state) => ({
-    //     ...state,
-    //     status: "success",
-    //     log: "",
-    //   }))
-    // })
+    worker.on("exit", function () {
+        subject.update(function (state) { return (__assign(__assign({}, state), { status: "success", log: opts.retainLog ? state.log : "" })); });
+    });
     return subject;
 }
 exports.createCodegenWorker = createCodegenWorker;

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

@@ -90,12 +90,14 @@ var url_loader_1 = require("@graphql-tools/url-loader");
 var core_1 = require("@graphql-codegen/core");
 var glob_promise_1 = __importDefault(require("glob-promise"));
 var promises_1 = require("fs/promises");
+var cross_fetch_1 = __importDefault(require("cross-fetch"));
 // Plugins
 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 https_1 = require("https");
 var sendSignal = function (sig) {
     if (worker_threads_1.parentPort) {
         worker_threads_1.parentPort.postMessage(sig);
@@ -134,6 +136,12 @@ function beginWork(opts) {
                     switch (_a.label) {
                         case 0: return [4 /*yield*/, (0, load_1.loadSchema)(endpoint, {
                                 loaders: [new url_loader_1.UrlLoader()],
+                                customFetch: function (url, opts) {
+                                    var httpsAgent = new https_1.Agent({
+                                        rejectUnauthorized: false,
+                                    });
+                                    return (0, cross_fetch_1.default)(url, __assign(__assign({}, opts), { agent: httpsAgent }));
+                                },
                             })];
                         case 1:
                             rawSchema = _a.sent();
@@ -532,6 +540,7 @@ function writeFileIfUnchanged(file, contents) {
     (0, fs_1.writeFileSync)(file, contents);
 }
 function debounce(wait, fn) {
+    var _this = this;
     var timeout;
     var debounced = function () {
         var args = [];
@@ -539,9 +548,24 @@ function debounce(wait, fn) {
             args[_i] = arguments[_i];
         }
         clearTimeout(timeout);
-        timeout = setTimeout(function () {
-            fn.apply(void 0, args);
-        }, wait);
+        timeout = setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+            var err_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, fn.apply(void 0, args)];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        err_4 = _a.sent();
+                        console.error(err_4);
+                        return [3 /*break*/, 3];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        }); }, wait);
     };
     return debounced;
 }

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-4",
+  "version": "0.1.35",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -39,7 +39,7 @@
     "@graphql-codegen/core": "^2.1.0",
     "@graphql-codegen/typescript": "^2.2.1",
     "@graphql-codegen/typescript-operations": "^2.1.3",
-    "@graphql-tools/load": "^7.3.0",
+    "@graphql-tools/load": "^7.4.1",
     "@graphql-tools/url-loader": "^7.1.0",
     "@loadable/babel-plugin": "^5.13.2",
     "@loadable/component": "^5.15.0",
@@ -54,6 +54,7 @@
     "change-case": "^4.1.2",
     "chokidar": "^3.5.2",
     "commander": "^8.1.0",
+    "cross-fetch": "^3.1.4",
     "css-loader": "^6.2.0",
     "dotenv": "^10.0.0",
     "error-overlay-webpack-plugin": "^1.0.0",

package/routing/routing.d.ts

@@ -14,7 +14,36 @@ declare type RouteContextConfig = {
     beforeLeave?(current: RouteItem, next: RouteItem, parentIsLeaving: boolean): AnyPromise | undefined;
     onChange?(route: RouteItem, status: RouteStatus): void;
 };
+declare type ContextSubscriber = (item: RouteItem, status: RouteStatus) => void;
+declare type ForkOptions = {
+    isSwitch?: boolean;
+};
+declare type RouteContextType = {
+    parent?: RouteContextType;
+    status: RouteStatus;
+    loading?: {
+        progress: number;
+    };
+    children: RouteContextType[];
+    isSwitch: boolean;
+    item: RouteItem;
+    config: RouteContextConfig;
+    currentMatch: MatchResult;
+    propagateChange(current: RouteItem, match: MatchResult): void;
+    propagateCandidate(next: RouteItem, prev: RouteItem): AnyPromise;
+    propagateLeaving(current: RouteItem, next: RouteItem, parentLeaving: boolean): AnyPromise;
+    getFirstMatch: (item: RouteItem) => RouteContextType | undefined;
+    onNavigate: (path: string) => void;
+    onPreload: (path: string) => void;
+    dispose: () => void;
+    update: () => void;
+    match: (next: RouteItem) => MatchResult;
+    matchSelf: (next: RouteItem) => MatchResult;
+    subscribe: (handler: ContextSubscriber) => () => void;
+    fork(config: RouteContextConfig, opts?: ForkOptions): RouteContextType;
+};
 export declare function useRoute(): RouteItem;
+export declare function useRouter(): RouteContextType | undefined;
 export declare type RouteProps = RouteContextConfig & {
     children: ReactNode;
 };

package/routing/routing.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteItemContext = exports.Switch = exports.Link = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useRoute = void 0;
+exports.RouteItemContext = exports.Switch = exports.Link = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useRouter = exports.useRoute = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var react_merge_refs_1 = __importDefault(require("react-merge-refs"));
@@ -238,6 +238,10 @@ function useRoute() {
     return route;
 }
 exports.useRoute = useRoute;
+function useRouter() {
+    return (0, react_1.useContext)(RouterContext);
+}
+exports.useRouter = useRouter;
 function Route(props) {
     var ctx = useForkedRouter({
         match: props.match,