eddev 0.1.36 → 0.1.37

package/build/clean.d.ts

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

package/build/clean.js

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

package/build/get-webpack-config.js

@@ -302,7 +302,7 @@ function getWebpackConfig(opts) {
                             var componentName = (0, change_case_1.pascalCase)(name);
                             return { relative: relative, name: name, module: module, componentName: componentName };
                         });
-                        var useLoadableBlocks = opts.isAdmin && !isDev;
+                        var useLoadableBlocks = false;
                         if (useLoadableBlocks) {
                             writeVirtualModule(ALIAS["@manifest/blocks"], "\n        import coreBlocks from './blocks/_core.tsx'\n        ".concat(!isServerless && "import loadable from '".concat(require.resolve("@loadable/component"), "';"), "\n\n        export default {\n          ...coreBlocks,\n          ").concat(files
                                 .map(function (_a) {

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

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

package/cli/build.dev.js

@@ -60,7 +60,6 @@ function devCommand(opts) {
                     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",

package/cli/build.prod.js

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

package/package.json

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