eddev 0.2.65 → 0.2.67-beta1

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

@@ -1,8 +1,8 @@
 "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) {
+const worker_threads_1 = require("worker_threads");
+const create_next_app_1 = require("../serverless/create-next-app");
+const sendSignal = (sig) => {
     if (worker_threads_1.parentPort) {
         worker_threads_1.parentPort.postMessage(sig);
     }
@@ -15,7 +15,7 @@ function beginWork() {
         baseDirectory: process.cwd(),
         build: false,
         dev: true,
-        sendSignal: sendSignal,
+        sendSignal,
     });
 }
 beginWork();

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

@@ -1,165 +1,104 @@
 "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 __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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.beginWork = void 0;
-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) {
+const webpack_1 = __importDefault(require("webpack"));
+const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
+const worker_threads_1 = require("worker_threads");
+const get_webpack_config_1 = __importDefault(require("../get-webpack-config"));
+const clean_1 = require("../clean");
+const sendSignal = (sig) => {
     if (worker_threads_1.parentPort) {
         worker_threads_1.parentPort.postMessage(sig);
     }
 };
-function beginWork(opts) {
-    return __awaiter(this, void 0, void 0, function () {
-        function extractErrorMessage(str) {
-            return str
-                .replace(/Module build failed[^\n]+\n/, "")
-                .replaceAll(opts.baseDirectory, "./")
-                .replace(/\s+at\s[\s\S]+/, "");
+async function beginWork(opts) {
+    sendSignal({
+        code: "compiling",
+    });
+    await (0, clean_1.cleanOutput)();
+    function extractErrorMessage(str) {
+        return str
+            .replace(/Module build failed[^\n]+\n/, "")
+            .replaceAll(opts.baseDirectory, "./")
+            .replace(/\s+at\s[\s\S]+/, "");
+    }
+    function webpackToCompilerError(err, type) {
+        return {
+            type,
+            details: err.details,
+            message: extractErrorMessage(err.message),
+            file: err.moduleName || "",
+            loc: err.loc,
+        };
+    }
+    const compiler = (0, webpack_1.default)(await (0, get_webpack_config_1.default)(opts));
+    if (opts.hotPort) {
+        const server = new webpack_dev_server_1.default(compiler, {
+            liveReload: false,
+            compress: true,
+            hotOnly: true,
+            disableHostCheck: true,
+            host: "127.0.0.1",
+            port: opts.hotPort,
+            writeToDisk: true,
+            transportMode: "ws",
+            publicPath: "/",
+            public: "http://127.0.0.1:" + opts.hotPort,
+            overlay: true,
+            sockPort: opts.hotPort,
+            contentBase: false,
+            noInfo: true,
+            https: false,
+            quiet: true,
+            // quiet: true,
+            // clientLogLevel: "silent",
+            headers: {
+                "Access-Control-Allow-Origin": "*",
+                "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+                "Access-Control-Allow-Headers": "X-Requested-With, content-type, Authorization",
+            },
+        });
+        server.listen(opts.hotPort);
+    }
+    compiler.hooks.beforeCompile.tap("eddev", () => {
+        sendSignal({
+            code: "compiling",
+        });
+    });
+    compiler.hooks.invalid.tap("eddev", (filename) => {
+        sendSignal({
+            code: "invalidated",
+            changedFile: filename,
+        });
+    });
+    compiler.hooks.done.tap("eddev", ({ compilation }) => {
+        const stats = compilation.getStats().toJson({
+            all: true,
+            errorDetails: true,
+            errors: true,
+            errorStack: true,
+            errorsCount: true,
+            colors: true,
+            timings: true,
+        });
+        const errors = stats.errors?.map((err) => webpackToCompilerError(err, "error")) || [];
+        const warnings = stats.warnings?.map((err) => webpackToCompilerError(err, "warning")) || [];
+        if (errors.length) {
+            sendSignal({
+                code: "error",
+                errors: [...warnings, ...errors],
+            });
         }
-        function webpackToCompilerError(err, type) {
-            return {
-                type: type,
-                details: err.details,
-                message: extractErrorMessage(err.message),
-                file: err.moduleName || "",
-                loc: err.loc,
-            };
+        else {
+            sendSignal({
+                code: "finished",
+                duration: stats.time,
+                errors: [...warnings, ...errors],
+            });
         }
-        var compiler, _a, server;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    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 2:
-                    compiler = _a.apply(void 0, [_b.sent()]);
-                    if (opts.hotPort) {
-                        server = new webpack_dev_server_1.default(compiler, {
-                            liveReload: false,
-                            compress: true,
-                            hotOnly: true,
-                            disableHostCheck: true,
-                            host: "127.0.0.1",
-                            port: opts.hotPort,
-                            writeToDisk: true,
-                            transportMode: "ws",
-                            publicPath: "/",
-                            public: "http://127.0.0.1:" + opts.hotPort,
-                            overlay: true,
-                            sockPort: opts.hotPort,
-                            contentBase: false,
-                            noInfo: true,
-                            https: false,
-                            quiet: true,
-                            // quiet: true,
-                            // clientLogLevel: "silent",
-                            headers: {
-                                "Access-Control-Allow-Origin": "*",
-                                "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
-                                "Access-Control-Allow-Headers": "X-Requested-With, content-type, Authorization",
-                            },
-                        });
-                        server.listen(opts.hotPort);
-                    }
-                    compiler.hooks.beforeCompile.tap("eddev", function () {
-                        sendSignal({
-                            code: "compiling",
-                        });
-                    });
-                    compiler.hooks.invalid.tap("eddev", function (filename) {
-                        sendSignal({
-                            code: "invalidated",
-                            changedFile: filename,
-                        });
-                    });
-                    compiler.hooks.done.tap("eddev", function (_a) {
-                        var _b, _c;
-                        var compilation = _a.compilation;
-                        var stats = compilation.getStats().toJson({
-                            all: true,
-                            errorDetails: true,
-                            errors: true,
-                            errorStack: true,
-                            errorsCount: true,
-                            colors: true,
-                            timings: true,
-                        });
-                        var errors = ((_b = stats.errors) === null || _b === void 0 ? void 0 : _b.map(function (err) { return webpackToCompilerError(err, "error"); })) || [];
-                        var warnings = ((_c = stats.warnings) === null || _c === void 0 ? void 0 : _c.map(function (err) { return webpackToCompilerError(err, "warning"); })) || [];
-                        if (errors.length) {
-                            sendSignal({
-                                code: "error",
-                                errors: __spreadArray(__spreadArray([], warnings, true), errors, true),
-                            });
-                        }
-                        else {
-                            sendSignal({
-                                code: "finished",
-                                duration: stats.time,
-                                errors: __spreadArray(__spreadArray([], warnings, true), errors, true),
-                            });
-                        }
-                    });
-                    return [2 /*return*/];
-            }
-        });
     });
 }
 exports.beginWork = beginWork;

package/cli/build.dev.d.ts

@@ -1,4 +1,4 @@
-declare type DevOptions = {
+type DevOptions = {
     serverless: boolean;
     retainLog?: boolean;
     mode?: "frontend" | "admin" | "codegen";

package/cli/build.dev.js

@@ -1,136 +1,89 @@
 "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.devCommand = void 0;
-var jsx_runtime_1 = require("react/jsx-runtime");
+const jsx_runtime_1 = require("react/jsx-runtime");
 // import inquirer from "inquirer"
-var promptIfRepoNameIncorrect_1 = require("../utils/promptIfRepoNameIncorrect");
-var path_1 = __importDefault(require("path"));
-var ink_1 = require("ink");
-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 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:
-                    _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",
-                            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;
-                    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), serverless: serverlessObservable, codegen: codegenObservable, configChanged: configChanged }, void 0));
-                    return [2 /*return*/];
-            }
-        });
+const promptIfRepoNameIncorrect_1 = require("../utils/promptIfRepoNameIncorrect");
+const path_1 = __importDefault(require("path"));
+const ink_1 = require("ink");
+const DevCLIDisplay_1 = require("./display/components/DevCLIDisplay");
+const create_webpack_worker_1 = require("../build/create-webpack-worker");
+const create_codegen_worker_1 = require("../build/create-codegen-worker");
+const create_schema_file_1 = require("../config/create-schema-file");
+const get_config_1 = require("../config/get-config");
+const print_zod_errors_1 = require("../config/print-zod-errors");
+const Observable_1 = require("../utils/Observable");
+const fs_extra_1 = require("fs-extra");
+const create_serverless_dev_worker_1 = require("../build/create-serverless-dev-worker");
+const build_favicon_1 = require("../build/build-favicon");
+const compare_versions_1 = __importDefault(require("compare-versions"));
+const chalk_1 = __importDefault(require("chalk"));
+async function devCommand(opts) {
+    const version = require(path_1.default.join(__dirname, "../package.json")).version;
+    const 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(`🚨 Incorrect 'eddev' version installed!\n🚨 Your package.json requires ${chalk_1.default.yellow(requiredVersion)}, but you have ${chalk_1.default.yellow(version)}.\n🚨 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(() => { });
+    await (0, promptIfRepoNameIncorrect_1.promptIfRepoThemeMismatch)();
+    const 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;
+    }
+    const config = configResult.data;
+    const themeName = path_1.default.basename(process.cwd());
+    const enableFrontend = !opts.mode || opts.mode === "frontend";
+    const enableAdmin = !opts.mode || opts.mode === "admin";
+    const enableCodegen = !opts.mode || opts.mode === "codegen";
+    const enableServerless = config.serverless?.enabled;
+    // Set up webpack compiler for admin + frontend
+    const 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;
+    const 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;
+    const codegenObservable = enableCodegen
+        ? (0, create_codegen_worker_1.createCodegenWorker)({
+            baseDirectory: process.cwd() + "/",
+            watch: true,
+            retainLog: opts.retainLog,
+        })
+        : undefined;
+    const configChanged = new Observable_1.Observable(false);
+    (0, fs_extra_1.watchFile)((0, get_config_1.getEDConfigFile)(), {}, () => {
+        configChanged.update(true);
     });
+    const 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), serverless: serverlessObservable, codegen: codegenObservable, configChanged: configChanged }));
 }
 exports.devCommand = devCommand;
-var delay = function (time) { return new Promise(function (resolve) { return setTimeout(resolve, time); }); };
+const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));

package/cli/build.prod.d.ts

@@ -1,4 +1,4 @@
-declare type DevOptions = {
+type DevOptions = {
     serverless: boolean;
 };
 export declare function prodCommand(opts: DevOptions): Promise<void>;