eddev 0.2.0-beta.9 → 0.2.1

package/build/serverless/create-next-app.js

@@ -65,15 +65,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -85,8 +76,9 @@ var glob_promise_1 = __importDefault(require("glob-promise"));
 var child_process_1 = require("child_process");
 var fs_1 = require("fs");
 var manifest_blocks_1 = require("../manifests/manifest-blocks");
-var promises_1 = require("fs/promises");
 var manifest_views_1 = require("../manifests/manifest-views");
+var getRepoName_1 = require("../../utils/getRepoName");
+var updateEnvFile_1 = require("../../utils/updateEnvFile");
 function requireConfig(dir) {
     var configPath = (0, path_1.resolve)(dir, "ed.config.json");
     return require(configPath);
@@ -94,12 +86,15 @@ function requireConfig(dir) {
 function createNextApp(opts) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var isVercel, serverlessDirectory;
+        var isVercel, serverlessDirectory, sendSignal, repoName, assetPaths, port;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     isVercel = process.env.VERCEL;
                     serverlessDirectory = isVercel ? opts.baseDirectory : (0, path_1.resolve)(opts.baseDirectory, ".serverless");
+                    sendSignal = opts.sendSignal || (function () { });
+                    sendSignal({ code: "preparing" });
+                    repoName = (0, getRepoName_1.getRepoName)(opts.baseDirectory);
                     if (!!isVercel) return [3 /*break*/, 2];
                     return [4 /*yield*/, clean(serverlessDirectory)];
                 case 1:
@@ -113,21 +108,20 @@ function createNextApp(opts) {
                 case 3:
                     // Copy the template folder
                     _b.sent();
-                    if (!!isVercel) return [3 /*break*/, 5];
-                    return [4 /*yield*/, updatePackagesFile(opts.baseDirectory, serverlessDirectory)];
+                    if (!isVercel) return [3 /*break*/, 5];
+                    return [4 /*yield*/, updatePackagesFile((0, path_1.resolve)(__dirname, "../../serverless-template"), opts.baseDirectory, opts.baseDirectory)];
                 case 4:
                     _b.sent();
-                    _b.label = 5;
-                case 5:
-                    if (!!isVercel) return [3 /*break*/, 7];
-                    return [4 /*yield*/, updatePackages(serverlessDirectory)];
+                    return [3 /*break*/, 7];
+                case 5: return [4 /*yield*/, updatePackagesFile((0, path_1.resolve)(__dirname, "../../serverless-template"), opts.baseDirectory, serverlessDirectory)];
                 case 6:
                     _b.sent();
                     _b.label = 7;
                 case 7:
-                    if (!!isVercel) return [3 /*break*/, 10];
+                    assetPaths = ((_a = requireConfig(opts.baseDirectory).serverless) === null || _a === void 0 ? void 0 : _a.themeAssets) || [];
+                    if (!!isVercel) return [3 /*break*/, 14];
                     // Sync important files during development, as they change
-                    return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory, __spreadArray([
+                    return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory, [
                             "blocks/**/*",
                             "components/**/*",
                             "hooks/**/*",
@@ -138,35 +132,108 @@ function createNextApp(opts) {
                             "types.graphql.ts",
                             "types.views.ts",
                             "types.blocks.ts",
+                            "types.api.ts",
                             "utils/**/*",
-                            "ed.config.json"
-                        ], (((_a = requireConfig(opts.baseDirectory).serverless) === null || _a === void 0 ? void 0 : _a.devAssets) || []), true))
+                            "ed.config.json",
+                        ])
                         // Also sync APIs into the APIs folder
                     ];
                 case 8:
                     // Sync important files during development, as they change
                     _b.sent();
                     // Also sync APIs into the APIs folder
-                    return [4 /*yield*/, syncFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "pages/"), ["api/**/*"])];
+                    return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "apis"), ["**/*.{tsx,ts,js,jsx}"])];
                 case 9:
                     // Also sync APIs into the APIs folder
                     _b.sent();
-                    _b.label = 10;
+                    return [4 /*yield*/, syncAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
+                        // Sync the public folder
+                    ];
                 case 10:
-                    // Create manifests
-                    initManifests(serverlessDirectory, opts.dev);
-                    if (!opts.dev) return [3 /*break*/, 12];
-                    return [4 /*yield*/, runScript(serverlessDirectory, "dev")];
+                    _b.sent();
+                    if (!assetPaths.length) return [3 /*break*/, 12];
+                    return [4 /*yield*/, syncFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
                 case 11:
                     _b.sent();
-                    return [3 /*break*/, 14];
-                case 12:
-                    if (!opts.build) return [3 /*break*/, 14];
-                    return [4 /*yield*/, runScript(serverlessDirectory, "build")];
+                    _b.label = 12;
+                case 12: 
+                // Sync favicon
+                return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory), (0, path_1.join)(serverlessDirectory, "public/"), ["favicon.ico"])];
                 case 13:
+                    // Sync favicon
+                    _b.sent();
+                    return [3 /*break*/, 19];
+                case 14:
+                    if (!assetPaths.length) return [3 /*break*/, 16];
+                    return [4 /*yield*/, copyFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
+                case 15:
+                    _b.sent();
+                    _b.label = 16;
+                case 16: 
+                // Sync favicon
+                return [4 /*yield*/, copyFiles((0, path_1.join)(opts.baseDirectory), (0, path_1.join)(serverlessDirectory, "public/"), ["favicon.ico"])
+                    // Write APIs proxy code
+                ];
+                case 17:
+                    // Sync favicon
+                    _b.sent();
+                    // Write APIs proxy code
+                    return [4 /*yield*/, writeAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
+                        // Remove pages/api/trpc directory if no _rpc is found
+                    ];
+                case 18:
+                    // Write APIs proxy code
+                    _b.sent();
+                    // Remove pages/api/trpc directory if no _rpc is found
+                    console.log({
+                        index: (0, path_1.join)(opts.baseDirectory, "apis/_rpc/index.ts"),
+                        rpc: (0, path_1.join)(opts.baseDirectory, "apis/_rpc.ts"),
+                    });
+                    if (!(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "apis/_rpc/index.ts")) &&
+                        !(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "apis/_rpc.ts"))) {
+                        // removeSync(join(serverlessDirectory, "pages/api/trpc"))
+                    }
+                    _b.label = 19;
+                case 19: 
+                // Create manifests
+                return [4 /*yield*/, initManifests(serverlessDirectory, opts.dev)
+                    // Update packages
+                ];
+                case 20:
+                    // Create manifests
                     _b.sent();
-                    _b.label = 14;
-                case 14: return [2 /*return*/];
+                    if (!!isVercel) return [3 /*break*/, 22];
+                    sendSignal({ code: "packaging" });
+                    return [4 /*yield*/, updatePackages(serverlessDirectory)];
+                case 21:
+                    _b.sent();
+                    _b.label = 22;
+                case 22:
+                    sendSignal({ code: "compiling" });
+                    if (!opts.dev) return [3 /*break*/, 25];
+                    return [4 /*yield*/, getPort(3000)
+                        // Write the endpoint URL to .env
+                    ];
+                case 23:
+                    port = _b.sent();
+                    // Write the endpoint URL to .env
+                    (0, updateEnvFile_1.updateEnvFile)({
+                        DEBUG_SERVERLESS_ENDPOINT: "http://localhost:".concat(port),
+                    }, opts.baseDirectory);
+                    sendSignal({ code: "url", url: "http://127.0.0.1:".concat(port) });
+                    // await devNext(serverlessDirectory, port)
+                    return [4 /*yield*/, runScript(serverlessDirectory, ["dev", "--port", String(port)])];
+                case 24:
+                    // await devNext(serverlessDirectory, port)
+                    _b.sent();
+                    return [3 /*break*/, 27];
+                case 25:
+                    if (!opts.build) return [3 /*break*/, 27];
+                    return [4 /*yield*/, runScript(serverlessDirectory, ["build"])];
+                case 26:
+                    _b.sent();
+                    _b.label = 27;
+                case 27: return [2 /*return*/];
             }
         });
     });
@@ -206,6 +273,8 @@ function copyTemplate(targetFolder) {
                 case 1:
                     files = _a.sent();
                     return [4 /*yield*/, Promise.all(files.map(function (src) {
+                            if (src.includes("package.json"))
+                                return null;
                             var dest = src.replace(sourceFolder, targetFolder);
                             return (0, fs_extra_1.copy)(src, dest);
                         }))];
@@ -234,23 +303,81 @@ function updatePackages(dir) {
         });
     });
 }
-function updatePackagesFile(sourceFolder, targetFolder) {
+function updatePackagesFile(templateFolder, appFolder, outDirectory) {
     return __awaiter(this, void 0, void 0, function () {
-        var sourcePackageFile, targetPackageFile, sourcePackage, targetPackage, mergedPackage;
+        var sourcePackageFile, targetPackageFile, outPackageFile, sourcePackage, targetPackage, mergedPackage;
         return __generator(this, function (_a) {
-            sourcePackageFile = (0, path_1.resolve)(sourceFolder, "package.json");
-            targetPackageFile = (0, path_1.resolve)(targetFolder, "package.json");
+            sourcePackageFile = (0, path_1.resolve)(templateFolder, "package.json");
+            targetPackageFile = (0, path_1.resolve)(appFolder, "package.json");
+            outPackageFile = (0, path_1.resolve)(outDirectory, "package.json");
             sourcePackage = require(sourcePackageFile);
             targetPackage = require(targetPackageFile);
-            mergedPackage = __assign(__assign({}, targetPackage), { dependencies: __assign(__assign({}, (sourcePackage.dependencies || {})), (targetPackage.dependencies || {})), devDependencies: __assign(__assign({}, (sourcePackage.devDependencies || {})), (targetPackage.devDependencies || {})) });
-            (0, fs_extra_1.writeJSON)(targetPackageFile, mergedPackage, {
+            mergedPackage = __assign(__assign({}, sourcePackage), { dependencies: __assign(__assign({}, (sourcePackage.dependencies || {})), (targetPackage.dependencies || {})), devDependencies: __assign(__assign({}, (sourcePackage.devDependencies || {})), (targetPackage.devDependencies || {})) });
+            (0, fs_extra_1.writeJSON)(outPackageFile, mergedPackage, {
                 spaces: 2,
             });
             return [2 /*return*/];
         });
     });
 }
-function syncFiles(sourceFolder, targetFolder, patterns) {
+function writeAPIProxies(sourceFolder, targetFolder) {
+    return __awaiter(this, void 0, void 0, function () {
+        var files;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, glob_promise_1.default)((0, path_1.join)(sourceFolder, "**/*.{tsx,ts,js}"))];
+                case 1:
+                    files = _a.sent();
+                    return [4 /*yield*/, Promise.all(files.map(function (file) {
+                            var name = file.replace(sourceFolder, "");
+                            var outputPath = (0, path_1.join)(targetFolder, name);
+                            if (name.includes("_rpc"))
+                                return;
+                            (0, fs_extra_1.ensureFileSync)((0, path_1.join)(outputPath));
+                            return (0, fs_extra_1.writeFile)(outputPath, "import handler from \"".concat(file, "\"; export default handler;"));
+                        }))];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function syncAPIProxies(sourceFolder, targetFolder) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, syncFiles(sourceFolder, targetFolder, ["**/*"], function (inputPath) {
+                    if (inputPath.includes("_rpc"))
+                        return null;
+                    return "import handler from \"".concat(inputPath.replace(/\.(ts|js)x?$/, ""), "\"; export default handler;");
+                })];
+        });
+    });
+}
+function copyFiles(sourceFolder, targetFolder, patterns) {
+    return __awaiter(this, void 0, void 0, function () {
+        var files;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, Promise.all(patterns.map(function (pattern) { return (0, glob_promise_1.default)((0, path_1.resolve)(sourceFolder, pattern)); }))];
+                case 1:
+                    files = (_a.sent()).flat();
+                    // Replace sourceFolder in each path, and copy to target folder
+                    return [4 /*yield*/, Promise.all(files.map(function (file) {
+                            var stat = (0, fs_1.statSync)(file);
+                            if (!stat.isDirectory()) {
+                                return (0, fs_extra_1.copy)(file, file.replace(sourceFolder, targetFolder));
+                            }
+                        }))];
+                case 2:
+                    // Replace sourceFolder in each path, and copy to target folder
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function syncFiles(sourceFolder, targetFolder, patterns, proxy) {
     return __awaiter(this, void 0, void 0, function () {
         var _this = this;
         return __generator(this, function (_a) {
@@ -262,15 +389,28 @@ function syncFiles(sourceFolder, targetFolder, patterns) {
                             case 1:
                                 chokidar = (_a.sent()).default;
                                 chokidar
-                                    .watch(patterns)
+                                    .watch(patterns, {
+                                    cwd: sourceFolder,
+                                })
                                     .on("add", function (path) {
-                                    (0, fs_extra_1.copy)(path, (0, path_1.join)(targetFolder, path));
+                                    if (proxy) {
+                                        var output = proxy((0, path_1.relative)(targetFolder, (0, path_1.join)(sourceFolder, path)), (0, path_1.join)(targetFolder, path));
+                                        if (typeof output === "string") {
+                                            (0, fs_extra_1.ensureFileSync)((0, path_1.join)(targetFolder, path));
+                                            (0, fs_extra_1.writeFile)((0, path_1.join)(targetFolder, path), output);
+                                        }
+                                    }
+                                    else {
+                                        (0, fs_extra_1.copy)((0, path_1.join)(sourceFolder, path), (0, path_1.join)(targetFolder, path));
+                                    }
                                 })
                                     .on("unlink", function (path) {
                                     (0, fs_extra_1.remove)((0, path_1.join)(targetFolder, path));
                                 })
                                     .on("change", function (path) {
-                                    (0, fs_extra_1.copy)(path, (0, path_1.join)(targetFolder, path));
+                                    if (!proxy) {
+                                        (0, fs_extra_1.copy)((0, path_1.join)(sourceFolder, path), (0, path_1.join)(targetFolder, path));
+                                    }
                                 })
                                     .on("ready", function () {
                                     ready(undefined);
@@ -282,12 +422,30 @@ function syncFiles(sourceFolder, targetFolder, patterns) {
         });
     });
 }
-function runScript(dir, script) {
+// async function devNext(dir: string, port: number) {
+//   const { createServer } = await import("http")
+//   const { parse } = await import("url")
+//   const { default: next } = await import("next")
+//   const app = next({
+//     dev: true,
+//     dir: dir,
+//     minimalMode: true,
+//     customServer: true,
+//     port: port,
+//   })
+//   const handle = app.getRequestHandler()
+//   app.prepare().then(() => {
+//     createServer((req, res) => {
+//       handle(req, res, parse(req.url || "", true))
+//     }).listen(app.port)
+//   })
+// }
+function runScript(dir, args) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
         var proc;
         return __generator(this, function (_c) {
-            proc = (0, child_process_1.spawn)("yarn", [script], {
+            proc = (0, child_process_1.spawn)("yarn", args, {
                 cwd: dir,
             });
             (_a = proc.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
@@ -313,7 +471,7 @@ function initManifests(dir, dev) {
                             isServerless: true,
                             onGenerate: function (manifest) { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
-                                    (0, promises_1.writeFile)((0, path_1.resolve)(dir, "manifest_blocks.ts"), manifest);
+                                    (0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, "manifest_blocks.ts"), manifest);
                                     return [2 /*return*/];
                                 });
                             }); },
@@ -326,7 +484,7 @@ function initManifests(dir, dev) {
                             isServerless: true,
                             onGenerate: function (manifest) { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
-                                    (0, promises_1.writeFile)((0, path_1.resolve)(dir, "manifest_views.ts"), manifest);
+                                    (0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, "manifest_views.ts"), manifest);
                                     return [2 /*return*/];
                                 });
                             }); },
@@ -340,3 +498,41 @@ function initManifests(dir, dev) {
         });
     });
 }
+function getPort(port) {
+    if (port === void 0) { port = 3000; }
+    return __awaiter(this, void 0, void 0, function () {
+        var createServer;
+        var _this = this;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("net")); })];
+                case 1:
+                    createServer = (_a.sent()).createServer;
+                    return [4 /*yield*/, new Promise(function (resolve) {
+                            var server = createServer();
+                            server.listen(port, "127.0.0.1");
+                            server.on("listening", function () {
+                                server.once("close", function () {
+                                    resolve(port);
+                                });
+                                server.close();
+                            });
+                            server.on("error", function () { return __awaiter(_this, void 0, void 0, function () {
+                                var _a;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0:
+                                            _a = resolve;
+                                            return [4 /*yield*/, getPort(port + 1)];
+                                        case 1:
+                                            _a.apply(void 0, [_b.sent()]);
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); });
+                        })];
+                case 2: return [2 /*return*/, _a.sent()];
+            }
+        });
+    });
+}

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

@@ -0,0 +1,26 @@
+export declare type ServerlessStatus = "starting" | "packaging" | "preparing" | "compiling" | "success" | "waiting" | "error";
+export declare type ServerlessState = {
+    title: string;
+    status: ServerlessStatus;
+    statusLabel?: string;
+    duration?: number;
+    log?: string;
+    url?: string;
+};
+export declare type ServerlessSignal = {
+    code: "packaging";
+} | {
+    code: "preparing";
+} | {
+    code: "compiling";
+} | {
+    code: "finished";
+    duration: number;
+} | {
+    code: "error";
+} | {
+    code: "log";
+} | {
+    code: "url";
+    url: string;
+};

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

@@ -150,6 +150,7 @@ function beginWork(opts) {
                                 schemaDescription: false,
                                 specifiedByUrl: true,
                             });
+                            processSchema(schema);
                             hash = JSON.stringify(schema);
                             if (hash !== lastSchemaHash) {
                                 lastSchemaHash = hash;
@@ -162,6 +163,8 @@ function beginWork(opts) {
                     }
                 });
             }); };
+            // Create RPC/API types
+            (0, promises_1.writeFile)(Path.join(opts.baseDirectory, "types.api.ts"), "\n    import type { router, createContext } from \"./apis/_rpc\"\n    import { createReactQueryHooks } from \"@trpc/react\"\n    export {}\n    \n    const createQueryHooks = () => createReactQueryHooks<typeof router>()\n    \n    declare global {\n      type RPCUse = ReturnType<typeof createQueryHooks>\n      type RPCRouter = typeof router\n      type RPCContextType = Awaited<ReturnType<typeof createContext>>\n      type RPCClient = ReturnType<RPCUse[\"createClient\"]>\n      type RPCUseQuery = RPCUse[\"useQuery\"]\n      type RPCUseMutation = RPCUse[\"useMutation\"]\n      type RPCUseInfiniteQuery = RPCUse[\"useInfiniteQuery\"]\n    }\n\n    declare global {\n      namespace NodeJS {\n        interface Process {\n          // @ts-ignore\n          browser: boolean\n          dev: boolean\n          admin: boolean\n          serverless: boolean\n        }\n      }\n    }\n    \n  ");
             regenerate = debounce(100, function () { return __awaiter(_this, void 0, void 0, function () {
                 var startTime, hasChanged, err_1, documentSets, parseErrors, _loop_1, _a, _b, _i, key, generates, errors, _c, _d, _e, file, base, config, output, err_2;
                 var _this = this;
@@ -575,4 +578,34 @@ function debounce(wait, fn) {
     };
     return debounced;
 }
+function processSchema(schema) {
+    var walkFields = function (fields) { };
+    var updateFieldType = function (fieldType) {
+        var _a;
+        if (fieldType.kind === "LIST") {
+            if (((_a = fieldType.ofType) === null || _a === void 0 ? void 0 : _a.kind) !== "NON_NULL") {
+                fieldType.ofType = {
+                    kind: "NON_NULL",
+                    name: null,
+                    ofType: fieldType.ofType,
+                };
+            }
+        }
+    };
+    var updateType = function (type) {
+        if (typeof type.type === "object" && type.type) {
+            updateFieldType(type.type);
+        }
+        if (type.fields) {
+            for (var _i = 0, _a = type.fields; _i < _a.length; _i++) {
+                var field = _a[_i];
+                updateType(field);
+            }
+        }
+    };
+    for (var _i = 0, _a = schema.__schema.types; _i < _a.length; _i++) {
+        var type = _a[_i];
+        updateType(type);
+    }
+}
 beginWork(worker_threads_1.workerData);

package/build/workers/serverless-worker-dev-script.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var worker_threads_1 = require("worker_threads");
+var create_next_app_1 = require("../serverless/create-next-app");
+var sendSignal = function (sig) {
+    if (worker_threads_1.parentPort) {
+        worker_threads_1.parentPort.postMessage(sig);
+    }
+};
+function beginWork() {
+    process.on("uncaughtException", function (err) {
+        sendSignal({ code: "error" });
+    });
+    (0, create_next_app_1.createNextApp)({
+        baseDirectory: process.cwd(),
+        build: false,
+        dev: true,
+        sendSignal: sendSignal,
+    });
+}
+beginWork();

package/cli/build.dev.js

@@ -49,20 +49,44 @@ var DevCLIDisplay_1 = require("./display/components/DevCLIDisplay");
 var create_webpack_worker_1 = require("../build/create-webpack-worker");
 var create_codegen_worker_1 = require("../build/create-codegen-worker");
 var create_schema_file_1 = require("../config/create-schema-file");
+var get_config_1 = require("../config/get-config");
+var print_zod_errors_1 = require("../config/print-zod-errors");
+var Observable_1 = require("../utils/Observable");
+var fs_extra_1 = require("fs-extra");
+var create_serverless_dev_worker_1 = require("../build/create-serverless-dev-worker");
+var build_favicon_1 = require("../build/build-favicon");
+var compare_versions_1 = __importDefault(require("compare-versions"));
+var chalk_1 = __importDefault(require("chalk"));
 function devCommand(opts) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var themeName, enableFrontend, enableAdmin, enableCodegen, frontendObservable, adminObservable, codegenObservable;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var version, requiredVersion, configResult, config, themeName, enableFrontend, enableAdmin, enableCodegen, enableServerless, frontendObservable, adminObservable, codegenObservable, configChanged, serverlessObservable;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
+                    version = require(path_1.default.join(__dirname, "../package.json")).version;
+                    requiredVersion = require(path_1.default.join(process.cwd(), "package.json")).devDependencies.eddev;
+                    if ((0, compare_versions_1.default)(version, requiredVersion) < 0) {
+                        console.log(chalk_1.default.red("\uD83D\uDEA8 Incorrect 'eddev' version installed!\n\uD83D\uDEA8 Your package.json requires ".concat(chalk_1.default.yellow(requiredVersion), ", but you have ").concat(chalk_1.default.yellow(version), ".\n\uD83D\uDEA8 Do you need to run 'yarn'?")));
+                        process.exit(1);
+                    }
                     (0, create_schema_file_1.createConfigSchemaFile)(path_1.default.resolve(process.cwd(), ".ed.config.schema.json"));
+                    (0, build_favicon_1.buildFavicon)().catch(function () { });
                     return [4 /*yield*/, (0, promptIfRepoNameIncorrect_1.promptIfRepoThemeMismatch)()];
                 case 1:
-                    _a.sent();
+                    _b.sent();
+                    configResult = (0, get_config_1.getEDConfig)();
+                    if (configResult.success === false) {
+                        (0, print_zod_errors_1.printZodErrors)(configResult.error);
+                        console.log("\nPlease fix the above config errors, and restart the dev command.");
+                        return [2 /*return*/];
+                    }
+                    config = configResult.data;
                     themeName = path_1.default.basename(process.cwd());
                     enableFrontend = !opts.mode || opts.mode === "frontend";
                     enableAdmin = !opts.mode || opts.mode === "admin";
                     enableCodegen = !opts.mode || opts.mode === "codegen";
+                    enableServerless = (_a = config.serverless) === null || _a === void 0 ? void 0 : _a.enabled;
                     frontendObservable = enableFrontend
                         ? (0, create_webpack_worker_1.createWebpackWorker)({
                             title: "Frontend Bundle",
@@ -96,9 +120,13 @@ function devCommand(opts) {
                             retainLog: opts.retainLog,
                         })
                         : undefined;
-                    // Set up a process which will regenerate schemas, and watch for changes
+                    configChanged = new Observable_1.Observable(false);
+                    (0, fs_extra_1.watchFile)((0, get_config_1.getEDConfigFile)(), {}, function () {
+                        configChanged.update(true);
+                    });
+                    serverlessObservable = enableServerless ? (0, create_serverless_dev_worker_1.createServerlessWorker)() : undefined;
                     // Render output to screen
-                    (0, ink_1.render)((0, jsx_runtime_1.jsx)(DevCLIDisplay_1.DevCLIDisplay, { bundles: [frontendObservable, adminObservable].filter(Boolean), codegen: codegenObservable }, void 0));
+                    (0, ink_1.render)((0, jsx_runtime_1.jsx)(DevCLIDisplay_1.DevCLIDisplay, { bundles: [frontendObservable, adminObservable].filter(Boolean), serverless: serverlessObservable, codegen: codegenObservable, configChanged: configChanged }, void 0));
                     return [2 /*return*/];
             }
         });

package/cli/build.prod.js

@@ -45,6 +45,7 @@ var webpack_1 = require("webpack");
 var promptIfRepoNameIncorrect_1 = require("../utils/promptIfRepoNameIncorrect");
 var path_1 = __importDefault(require("path"));
 var clean_1 = require("../build/clean");
+var build_favicon_1 = require("../build/build-favicon");
 function prodCommand(opts) {
     return __awaiter(this, void 0, void 0, function () {
         var contentBase, themeName, compiler, _a, _b;
@@ -52,6 +53,10 @@ function prodCommand(opts) {
             switch (_c.label) {
                 case 0:
                     contentBase = process.cwd() + "/dist/";
+                    (0, build_favicon_1.buildFavicon)().catch(function (err) {
+                        console.log("Error building favicon:");
+                        console.error(err);
+                    });
                     return [4 /*yield*/, (0, promptIfRepoNameIncorrect_1.promptIfRepoThemeMismatch)()];
                 case 1:
                     _c.sent();
@@ -86,7 +91,14 @@ function prodCommand(opts) {
                     compiler = _a.apply(void 0, [_b.concat([
                             _c.sent()
                         ])]);
-                    compiler.run(function () { });
+                    compiler.run(function (err, stats) {
+                        if (stats === null || stats === void 0 ? void 0 : stats.hasErrors()) {
+                            process.exit(1);
+                        }
+                        if (err) {
+                            process.exit(1);
+                        }
+                    });
                     return [2 /*return*/];
             }
         });