eddev 0.2.0-beta.9 → 0.2.2-beta.2

package/blocks/ContentBlocks.js

@@ -32,6 +32,9 @@ var react_1 = require("react");
 var ErrorBoundaryFrontend_1 = require("./ErrorBoundaryFrontend");
 exports.BlocksContext = (0, react_1.createContext)(undefined);
 function ContentBlocks(props) {
+    if (process.admin) {
+        throw new Error("ContentBlocks cannot be used in the admin");
+    }
     if (!Array.isArray(props.blocks))
         return null;
     var parentContext = (0, react_1.useContext)(exports.BlocksContext);

package/blocks/installGutenbergHooks.js

@@ -27,6 +27,8 @@ exports.setBlockManifest = exports.installEDGutenbergHooks = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 // @ts-ignore
 var hooks_1 = require("@wordpress/hooks");
+// @ts-ignore
+var data_1 = require("@wordpress/data");
 var react_1 = require("react");
 // @ts-ignore
 var blockAttributes_1 = require("./blockAttributes");
@@ -82,7 +84,16 @@ function installEDGutenbergHooks() {
                     // @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) {
+                // console.log(useBlockProps(), useBlockEditContext(), useInnerBlocksProps())
+                var children = (0, data_1.useSelect)(function (select) {
+                    var _a = select('core/block-editor'), getBlock = _a.getBlock, getBlockOrder = _a.getBlockOrder;
+                    var innerBlockIDs = getBlockOrder(props.clientId);
+                    var children = innerBlockIDs.map(function (id) {
+                        return getBlock(id);
+                    });
+                    return children;
+                }, []);
+                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: children, onChange: function (attrs) {
                             props.setAttributes(__assign(__assign({}, props.attributes), { inline: attrs }));
                         } }, { children: edit_1.call(self, props) }), void 0) }), void 0));
             };
@@ -154,7 +165,13 @@ function installEDGutenbergHooks() {
     var parseJSX = acf.parseJSX;
     // @ts-ignore
     acf.parseJSX = function (html) {
-        var payload = JSON.parse(html.replace(/(^[^>]+>|<[^>]+>$)/g, ""));
+        var payload;
+        try {
+            payload = JSON.parse(html.replace(/(^[^>]+>|<[^>]+>$)/g, ""));
+        }
+        catch (err) {
+            throw new Error("eddev: Error parsing block data from: \n" + html);
+        }
         return (0, jsx_runtime_1.jsx)(BlockRenderer, { payload: payload }, void 0);
     };
 }

package/build/build-favicon.d.ts

@@ -0,0 +1 @@
+export declare function buildFavicon(output?: string): Promise<void>;

package/build/build-favicon.js

@@ -0,0 +1,71 @@
+"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.buildFavicon = void 0;
+// @ts-ignore
+var to_icon_1 = __importDefault(require("to-icon"));
+var promises_1 = require("fs/promises");
+var glob_promise_1 = __importDefault(require("glob-promise"));
+var path_1 = require("path");
+function buildFavicon(output) {
+    if (output === void 0) { output = (0, path_1.join)(process.cwd(), "favicon.ico"); }
+    return __awaiter(this, void 0, void 0, function () {
+        var files, buffers, buf;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, glob_promise_1.default)((0, path_1.join)(process.cwd(), "assets/favicon/favicon-*.png"))];
+                case 1:
+                    files = _a.sent();
+                    if (!files.length)
+                        return [2 /*return*/];
+                    return [4 /*yield*/, Promise.all(files.map(function (file) { return (0, promises_1.readFile)(file); }))];
+                case 2:
+                    buffers = _a.sent();
+                    return [4 /*yield*/, (0, to_icon_1.default)(buffers)];
+                case 3:
+                    buf = _a.sent();
+                    (0, promises_1.writeFile)(output, buf);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.buildFavicon = buildFavicon;

package/build/create-serverless-dev-worker.d.ts

@@ -0,0 +1,3 @@
+import { Observable } from "../utils/Observable";
+import { ServerlessState } from "./state/serverless-state";
+export declare function createServerlessWorker(): Observable<ServerlessState>;

package/build/create-serverless-dev-worker.js

@@ -0,0 +1,99 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createServerlessWorker = void 0;
+var worker_threads_1 = require("worker_threads");
+var path_1 = require("path");
+var Observable_1 = require("../utils/Observable");
+function createServerlessWorker() {
+    var worker = new worker_threads_1.Worker((0, path_1.join)(__dirname, "workers/serverless-worker-dev-script.js"), {
+        workerData: {},
+        stderr: true,
+        stdin: false,
+        stdout: true,
+        env: __assign(__assign({}, process.env), { FORCE_COLOR: "1" }),
+    });
+    var subject = new Observable_1.Observable({
+        title: "Serverless",
+        status: "starting",
+        log: "",
+    });
+    var parseChunk = function (str) {
+        var escaped = JSON.stringify(str).replace(/(^"|"$)/g, "");
+        var status;
+        var duration = 0;
+        if (str.includes("\u001b[31merror\u001b[39m")) {
+            status = "error";
+        }
+        else if (str.includes("\u001b[35mevent\u001b[39m") && str.includes("successfully")) {
+            status = "success";
+            var secondsMatch = str.match(/[0-9.]+s/);
+            var msMatch = str.match(/[0-9.]+ ms/);
+            if (secondsMatch) {
+                duration = parseFloat(secondsMatch[0].replace("s", "")) * 1000;
+            }
+            if (msMatch) {
+                duration = parseFloat(msMatch[0].replace(" ms", ""));
+            }
+        }
+        else if (str.includes("\u001b[36mwait\u001b[39m")) {
+            status = "compiling";
+        }
+        return {
+            text: str,
+            status: status,
+            duration: duration,
+        };
+    };
+    var handleChunk = function (chunk) {
+        var result = parseChunk(String(chunk));
+        subject.update(function (state) { return (__assign(__assign({}, state), { log: (state.log || "") + result.text, status: result.status ? result.status : state.status, duration: result.status === "success" ? result.duration : state.duration })); });
+    };
+    worker.stderr.on("data", handleChunk);
+    worker.stdout.on("data", handleChunk);
+    worker.on("error", function (err) {
+        console.log(err);
+        subject.update(function (state) { return (__assign(__assign({}, state), { status: "error" })); });
+    });
+    worker.on("exit", function (code) {
+        subject.update(function (state) { return (__assign(__assign({}, state), { status: "error" })); });
+    });
+    worker.on("message", function (data) {
+        if (data.code === "preparing") {
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "preparing" })); });
+        }
+        else if (data.code === "packaging") {
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "packaging" })); });
+        }
+        else if (data.code === "compiling") {
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "compiling" })); });
+        }
+        else if (data.code === "finished") {
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "success", duration: data.duration })); });
+        }
+        else if (data.code === "error") {
+            subject.update(function (state) { return (__assign(__assign({}, state), { status: "error" })); });
+        }
+        else if (data.code === "url") {
+            subject.update(function (state) { return (__assign(__assign({}, state), { url: data.url })); });
+        }
+    });
+    // worker.on("exit", () => {
+    //   subject.update((state) => ({
+    //     ...state,
+    //     status: "success",
+    //   }))
+    // })
+    return subject;
+}
+exports.createServerlessWorker = createServerlessWorker;

package/build/get-webpack-config.js

@@ -74,16 +74,19 @@ var mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin
 var autoprefixer_1 = __importDefault(require("autoprefixer"));
 // Custom Babel plugins
 var plugin_name_defined_components_1 = __importDefault(require("./babel/plugin-name-defined-components"));
+var fs_1 = require("fs");
 var manifest_blocks_1 = require("./manifests/manifest-blocks");
 var manifest_fields_1 = require("./manifests/manifest-fields");
 var manifest_views_1 = require("./manifests/manifest-views");
+var get_config_1 = require("../config/get-config");
 function getWebpackConfig(opts) {
     return __awaiter(this, void 0, void 0, function () {
-        var compiling, ALIAS, ENTRY, PLUGINS, RULES, DEFINES, VIRTUAL_MODULES, EXTERNALS, virtualModules, isServerless, isBrowser, isSSR, isDev, entryDir, distSuffix, outputFolder, loadableManifestFile, writeVirtualModule, manifestLoaders, buildID;
+        var compiling, config, ALIAS, ENTRY, PLUGINS, RULES, DEFINES, VIRTUAL_MODULES, EXTERNALS, virtualModules, isServerless, isBrowser, isSSR, isDev, entryDir, distSuffix, outputFolder, loadableManifestFile, writeVirtualModule, manifestLoaders, rpcExists, buildID;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     compiling = false;
+                    config = (0, get_config_1.getEDConfigUnwrapped)();
                     ALIAS = {};
                     ENTRY = {};
                     PLUGINS = [];
@@ -127,6 +130,7 @@ function getWebpackConfig(opts) {
                     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");
+                    ALIAS["@utils"] = path_1.default.join(opts.baseDirectory, "utils");
                     RULES.push({
                         test: /\.[jt]sx?$/,
                         exclude: /node_modules/,
@@ -319,6 +323,7 @@ function getWebpackConfig(opts) {
                     }
                     // Define some values
                     DEFINES["process.browser"] = JSON.stringify(isBrowser);
+                    DEFINES["process.client"] = JSON.stringify(isBrowser);
                     DEFINES["process.serverless"] = "false";
                     DEFINES["process.ssr"] = JSON.stringify(isServerless && !isBrowser);
                     DEFINES["process.LOADABLE_STATS_FILE"] = JSON.stringify(loadableManifestFile);
@@ -329,6 +334,11 @@ function getWebpackConfig(opts) {
                     if (isDev && opts.isAdmin) {
                         DEFINES["process.BLOCK_MANIFEST_FILE"] = JSON.stringify(ALIAS["@manifest/blocks"]);
                     }
+                    DEFINES["process.devUI"] = config.devUI === "enabled";
+                    DEFINES["process.serverlessEndpoint"] = "(window.SERVERLESS_ENDPOINT || '')";
+                    rpcExists = (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "apis/_rpc.ts")) ||
+                        (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "apis/_rpc/index.ts"));
+                    DEFINES["process.rpcEnabled"] = rpcExists ? "true" : "false";
                     if (isBrowser) {
                         DEFINES["process.env.themePath"] = "window.THEME_PATH || ".concat(DEFINES["process.env.themePath"]);
                     }

package/build/manifests/manifest-views.js

@@ -23,7 +23,7 @@ function createViewManifestGenerator(opts) {
                 var componentName = "View" + (0, change_case_1.pascalCase)(name);
                 return { relative: relative, name: name, module: module, componentName: componentName };
             });
-            var useDynamicViews = opts.isServerless;
+            var useDynamicViews = false; //opts.isServerless
             return "\n        ".concat(useDynamicViews && "import { dynamic } from 'eddev/dynamic';", "\n        import App from ").concat(JSON.stringify("./views/_app"), "\n\n        ").concat(!useDynamicViews
                 ? files.map(function (_a) {
                     var componentName = _a.componentName, module = _a.module;

package/build/reporter.js

@@ -5,37 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReporterPlugin = void 0;
 var chalk_1 = __importDefault(require("chalk"));
-// type StatusItem = {
-//   statusType: "success" | "waiting" | "error" | "warning"
-//   message: string
-//   issues: string[]
-// }
-// class GlobalReporter {
-//   status: {
-//     [key: string]: StatusItem
-//   } = {}
-//   setStatus(name: string, status: StatusItem) {
-//     this.status[name] = status
-//     this.redraw()
-//   }
-//   redraw() {
-//     console.clear()
-//     for (const [name, status] of Object.entries(this.status)) {
-//       console.log(name, status.statusType, status.message, status.issues)
-//     }
-//   }
-// }
-// export const globalReporter = new GlobalReporter()
-// const log = (item: {
-//   label: string
-//   status: "success" | "waiting" | "error" | "warning"
-//   message: string
-// }) => {
-//   console.log(
-//     chalk.bgCyan(" " + item.status + " / " + item.label + " "),
-//     item.message
-//   )
-// }
 var ReporterPlugin = /** @class */ (function () {
     function ReporterPlugin(opts) {
         this.title = opts.title;
@@ -43,23 +12,6 @@ var ReporterPlugin = /** @class */ (function () {
     ReporterPlugin.prototype.apply = function (compiler) {
         var _this = this;
         var plugin = { name: "EDDevReporterPlugin" };
-        // const log = createLogger({
-        //   name: "boost",
-        //   labels: {
-        //     error: chalk.bgRed.black(" FAIL "),
-        //     info: chalk.bgGreen.black(" DONE "),
-        //   },
-        //   // transports: [
-        //   //   new ConsoleTransport({
-        //   //     format: (item) => `${item.level} ${this.title} ${item.message}`,
-        //   //     // Or a pre-built format
-        //   //     // format: formats.json,
-        //   //   }),
-        //   // ],
-        //   // transports: [
-        //   //   new StreamTransport({ levels: ["error"], stream: process.stderr }),
-        //   // ],
-        // })
         var log = function (type, message, errors) {
             var label = " ".concat(type.toUpperCase(), " (").concat(_this.title, ") ");
             if (type === "done") {
@@ -90,17 +42,6 @@ var ReporterPlugin = /** @class */ (function () {
             // }
             if (!hasErrors && !hasWarnings) {
                 log("done", "Compiled successfully");
-                // log({
-                //   status: "success",
-                //   label: this.title,
-                //   message: "Compiled Successfully",
-                // })
-                // globalReporter.setStatus(this.title, {
-                //   statusType: "success",
-                //   message: "Finished compiling",
-                //   issues: [],
-                // })
-                // this.displaySuccess(stats)
                 return;
             }
             if (hasErrors) {
@@ -108,22 +49,6 @@ var ReporterPlugin = /** @class */ (function () {
                     .map(function (err) { return err.message; })
                     .join("\n");
                 log("error", "Error compiling", errors);
-                // log.error("Error compiling %s", errors)
-                // log({
-                //   status: "error",
-                //   label: this.title,
-                //   message: extractErrorsFromStats(stats, "errors")
-                //     .map((err) => err.message)
-                //     .join("\n"),
-                // })
-                // globalReporter.setStatus(this.title, {
-                //   statusType: "error",
-                //   message: "Error compiling",
-                //   issues: extractErrorsFromStats(stats, "errors").map(
-                //     (err) => err.message
-                //   ),
-                // })
-                // this.displayErrors(extractErrorsFromStats(stats, "errors"), "error")
                 return;
             }
             if (hasWarnings) {
@@ -137,18 +62,6 @@ var ReporterPlugin = /** @class */ (function () {
         });
         compiler.hooks.invalid.tap(plugin, function () {
             log("wait", "Building...");
-            // log.warn("Recompiling...")
-            // log({
-            //   status: "waiting",
-            //   message: "Compiling...",
-            //   label: this.title,
-            // })
-            // globalReporter.setStatus(this.title, {
-            //   statusType: "waiting",
-            //   message: "Compiling...",
-            //   issues: [],
-            // })
-            // console.log(this.title + ": Compiling...")
         });
     };
     ReporterPlugin.prototype.displaySuccess = function (stats) {
@@ -161,16 +74,6 @@ var ReporterPlugin = /** @class */ (function () {
 }());
 exports.ReporterPlugin = ReporterPlugin;
 function extractErrorsFromStats(stats, type) {
-    // if (isMultiStats(stats)) {
-    //   process.exit()
-    //   const errors = stats.stats.reduce(
-    //     (errors, stats) => errors.concat(extractErrorsFromStats(stats, type)),
-    //     []
-    //   )
-    //   // Dedupe to avoid showing the same error many times when multiple
-    //   // compilers depend on the same module.
-    //   return uniqueBy(errors, (error) => error.message)
-    // }
     var findErrorsRecursive = function (compilation) {
         var errors = compilation[type];
         if (errors.length === 0 && compilation.children) {
@@ -183,18 +86,6 @@ function extractErrorsFromStats(stats, type) {
     };
     return findErrorsRecursive(stats.compilation);
 }
-// function isMultiStats(stats: Stats) {
-//   return stats.stats
-// }
-/**
- * Concat and flattens non-null values.
- * Ex: concat(1, undefined, 2, [3, 4]) = [1, 2, 3, 4]
- */
-function concat() {
-    var args = Array.from(arguments).filter(function (e) { return e != null; });
-    var baseArray = Array.isArray(args[0]) ? args[0] : [args[0]];
-    return Array.prototype.concat.apply(baseArray, args.slice(1));
-}
 /**
  * Dedupes array based on criterion returned from iteratee function.
  * Ex: uniqueBy(

package/build/serverless/create-next-app.d.ts

@@ -1,7 +1,9 @@
+import { ServerlessSignal } from "../state/serverless-state";
 declare type Options = {
     baseDirectory: string;
     dev: boolean;
     build: boolean;
+    sendSignal?: (signal: ServerlessSignal) => void;
 };
 export declare function createNextApp(opts: Options): Promise<void>;
 export {};