eddev 0.2.65 → 0.2.67-beta1

package/build/manifests/manifest-fields.js

@@ -4,37 +4,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFieldManifestGenerator = void 0;
-var manifest_1 = require("./manifest");
-var path_1 = __importDefault(require("path"));
-var change_case_1 = require("change-case");
+const manifest_1 = require("./manifest");
+const path_1 = __importDefault(require("path"));
+const change_case_1 = require("change-case");
 function createFieldManifestGenerator(opts) {
     return (0, manifest_1.createManifestGenerator)({
         glob: path_1.default.join(opts.baseDirectory, "/backend/fields/**.tsx"),
         onGenerate: opts.onGenerate,
         watch: opts.watch,
-        generate: function (fileNames) {
+        generate(fileNames) {
             if (opts.isAdmin) {
-                var files = fileNames
-                    .filter(function (file) { return !file.includes("/_app"); })
-                    .map(function (file) {
-                    var relative = path_1.default.relative(opts.baseDirectory, file);
-                    var name = path_1.default.basename(file).replace(/\.(jsx|tsx|ts|js)$/i, "");
-                    var module = JSON.stringify("./" + relative);
-                    var componentName = "FieldType" + (0, change_case_1.pascalCase)(name);
-                    return { relative: relative, name: name, module: module, componentName: componentName };
+                const files = fileNames
+                    .filter((file) => !file.includes("/_app"))
+                    .map((file) => {
+                    const relative = path_1.default.relative(opts.baseDirectory, file);
+                    const name = path_1.default.basename(file).replace(/\.(jsx|tsx|ts|js)$/i, "");
+                    const module = JSON.stringify("./" + relative);
+                    const componentName = "FieldType" + (0, change_case_1.pascalCase)(name);
+                    return { relative, name, module, componentName };
                 });
-                return "\n          ".concat(files.map(function (_a) {
-                    var componentName = _a.componentName, module = _a.module;
-                    return "import ".concat(componentName, " from ").concat(module);
-                }).join("\n"), "\n\n          export default {\n            ").concat(files
-                    .map(function (_a) {
-                    var relative = _a.relative, componentName = _a.componentName, module = _a.module, name = _a.name;
-                    return "\"".concat(name, "\": ").concat(componentName);
+                return `
+          ${files.map(({ componentName, module }) => `import ${componentName} from ${module}`).join("\n")}
+
+          export default {
+            ${files
+                    .map(({ relative, componentName, module, name }) => {
+                    return `"${name}": ${componentName}`;
                 })
-                    .join(",\n"), "\n          }\n        ");
+                    .join(",\n")}
+          }
+        `;
             }
             else {
-                return "export default {}";
+                return `export default {}`;
             }
         },
     });

package/build/manifests/manifest-views.d.ts

@@ -1,4 +1,4 @@
-declare type Options = {
+type Options = {
     baseDirectory: string;
     isAdmin: boolean;
     isDev: boolean;

package/build/manifests/manifest-views.js

@@ -4,45 +4,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createViewManifestGenerator = void 0;
-var manifest_1 = require("./manifest");
-var path_1 = __importDefault(require("path"));
-var change_case_1 = require("change-case");
-var JSX = /\.(jsx|tsx|ts|js)$/i;
+const manifest_1 = require("./manifest");
+const path_1 = __importDefault(require("path"));
+const change_case_1 = require("change-case");
+const JSX = /\.(jsx|tsx|ts|js)$/i;
 function createViewManifestGenerator(opts) {
     return (0, manifest_1.createManifestGenerator)({
         glob: path_1.default.join(opts.baseDirectory, "/views/**/*.tsx"),
         onGenerate: opts.onGenerate,
         watch: opts.watch,
-        generate: function (fileNames) {
-            var files = fileNames
-                .filter(function (file) { return !file.includes("/_app"); })
-                .map(function (file) {
-                var relative = path_1.default.relative(opts.baseDirectory, file).replace(JSX, "");
-                var name = path_1.default.basename(file).replace(JSX, "");
-                var module = JSON.stringify("./" + relative);
-                var componentName = "View" + (0, change_case_1.pascalCase)(name);
-                return { relative: relative, name: name, module: module, componentName: componentName };
+        generate(fileNames) {
+            const files = fileNames
+                .filter((file) => !file.includes("/_app"))
+                .map((file) => {
+                const relative = path_1.default.relative(opts.baseDirectory, file).replace(JSX, "");
+                const name = path_1.default.basename(file).replace(JSX, "");
+                const module = JSON.stringify("./" + relative);
+                const componentName = "View" + (0, change_case_1.pascalCase)(name);
+                return { relative, name, module, componentName };
             });
-            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;
-                    return "import ".concat(componentName, " from ").concat(module);
-                }).join("\n")
-                : "", "\n\n        export { App }\n\n        export default {\n          ").concat(files
-                .map(function (_a) {
-                var relative = _a.relative, componentName = _a.componentName, module = _a.module;
+            const useDynamicViews = false; //opts.isServerless
+            return `
+        ${useDynamicViews && `import { dynamic } from 'eddev/dynamic';`}
+        import App from ${JSON.stringify("./views/_app")}
+
+        ${!useDynamicViews
+                ? files.map(({ componentName, module }) => `import ${componentName} from ${module}`).join("\n")
+                : ""}
+
+        export { App }
+
+        export default {
+          ${files
+                .map(({ relative, componentName, module }) => {
                 if (useDynamicViews) {
                     // In serverless mode, export @loadable components. Script tags will be
                     // auto-included in output HTML
-                    return "\"".concat(relative, "\": dynamic(() => import(").concat(module, "))");
+                    return `"${relative}": dynamic(() => import(${module}))`;
                 }
                 else {
                     // On non-serverless, the templates are bundled straight into the main app.
-                    return "\"".concat(relative, "\": ").concat(componentName);
+                    return `"${relative}": ${componentName}`;
                 }
             })
-                .join(",\n"), "\n        }\n      ");
+                .join(",\n")}
+        }
+      `;
         },
     });
 }

package/build/manifests/manifest-widgets.d.ts

@@ -1,4 +1,4 @@
-declare type Options = {
+type Options = {
     baseDirectory: string;
     isAdmin: boolean;
     isDev: boolean;

package/build/manifests/manifest-widgets.js

@@ -4,37 +4,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWidgetManifestGenerator = void 0;
-var manifest_1 = require("./manifest");
-var path_1 = __importDefault(require("path"));
-var change_case_1 = require("change-case");
+const manifest_1 = require("./manifest");
+const path_1 = __importDefault(require("path"));
+const change_case_1 = require("change-case");
 function createWidgetManifestGenerator(opts) {
     return (0, manifest_1.createManifestGenerator)({
         glob: path_1.default.join(opts.baseDirectory, "/backend/widgets/*.tsx"),
         onGenerate: opts.onGenerate,
         watch: opts.watch,
-        generate: function (fileNames) {
+        generate(fileNames) {
             if (opts.isAdmin) {
-                var files = fileNames
-                    .filter(function (file) { return !file.includes("/_app"); })
-                    .map(function (file) {
-                    var relative = path_1.default.relative(opts.baseDirectory, file);
-                    var name = path_1.default.basename(file).replace(/\.(jsx|tsx|ts|js)$/i, "");
-                    var module = JSON.stringify("./" + relative);
-                    var componentName = "Widget" + (0, change_case_1.pascalCase)(name);
-                    return { relative: relative, name: name, module: module, componentName: componentName };
+                const files = fileNames
+                    .filter((file) => !file.includes("/_app"))
+                    .map((file) => {
+                    const relative = path_1.default.relative(opts.baseDirectory, file);
+                    const name = path_1.default.basename(file).replace(/\.(jsx|tsx|ts|js)$/i, "");
+                    const module = JSON.stringify("./" + relative);
+                    const componentName = "Widget" + (0, change_case_1.pascalCase)(name);
+                    return { relative, name, module, componentName };
                 });
-                return "\n          ".concat(files.map(function (_a) {
-                    var componentName = _a.componentName, module = _a.module;
-                    return "import ".concat(componentName, " from ").concat(module);
-                }).join("\n"), "\n\n          export default [\n            ").concat(files
-                    .map(function (_a) {
-                    var relative = _a.relative, componentName = _a.componentName, module = _a.module, name = _a.name;
+                return `
+          ${files.map(({ componentName, module }) => `import ${componentName} from ${module}`).join("\n")}
+
+          export default [
+            ${files
+                    .map(({ relative, componentName, module, name }) => {
                     return componentName;
                 })
-                    .join(",\n"), "\n          ]\n        ");
+                    .join(",\n")}
+          ]
+        `;
             }
             else {
-                return "export default {}";
+                return `export default {}`;
             }
         },
     });

package/build/manifests/manifest.d.ts

@@ -1,10 +1,10 @@
-declare type Options = {
+type Options = {
     glob: string;
     watch: boolean;
     generate: (files: string[]) => Promise<string> | string;
     onGenerate: (value: string) => void;
 };
-declare type ManifestGenerator = {
+type ManifestGenerator = {
     close(): void;
 };
 export declare function createManifestGenerator(opts: Options): Promise<ManifestGenerator>;

package/build/manifests/manifest.js

@@ -1,96 +1,36 @@
 "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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createManifestGenerator = void 0;
-var file_tree_1 = require("../file-tree");
-function createManifestGenerator(opts) {
-    return __awaiter(this, void 0, void 0, function () {
-        var resolvedFirst;
-        var _this = this;
-        return __generator(this, function (_a) {
-            resolvedFirst = false;
-            return [2 /*return*/, new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
-                    var close, self, files, update;
-                    var _this = this;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0:
-                                self = {
-                                    close: function () {
-                                        if (close)
-                                            close();
-                                    },
-                                };
-                                files = [];
-                                update = function () { return __awaiter(_this, void 0, void 0, function () {
-                                    var value;
-                                    return __generator(this, function (_a) {
-                                        switch (_a.label) {
-                                            case 0: return [4 /*yield*/, opts.generate(files)];
-                                            case 1:
-                                                value = _a.sent();
-                                                opts.onGenerate(value);
-                                                if (!resolvedFirst) {
-                                                    resolvedFirst = true;
-                                                    resolve(self);
-                                                }
-                                                return [2 /*return*/];
-                                        }
-                                    });
-                                }); };
-                                if (!opts.watch) return [3 /*break*/, 2];
-                                return [4 /*yield*/, (0, file_tree_1.watchFileTree)(opts.glob, function (updatedFiles) {
-                                        files = updatedFiles;
-                                        update();
-                                    })];
-                            case 1:
-                                close = _a.sent();
-                                return [3 /*break*/, 4];
-                            case 2: return [4 /*yield*/, (0, file_tree_1.getFileTree)(opts.glob)];
-                            case 3:
-                                files = _a.sent();
-                                update();
-                                _a.label = 4;
-                            case 4: return [2 /*return*/];
-                        }
-                    });
-                }); })];
-        });
+const file_tree_1 = require("../file-tree");
+async function createManifestGenerator(opts) {
+    let resolvedFirst = false;
+    return new Promise(async (resolve) => {
+        let close;
+        const self = {
+            close: () => {
+                if (close)
+                    close();
+            },
+        };
+        let files = [];
+        const update = async () => {
+            const value = await opts.generate(files);
+            opts.onGenerate(value);
+            if (!resolvedFirst) {
+                resolvedFirst = true;
+                resolve(self);
+            }
+        };
+        if (opts.watch) {
+            close = await (0, file_tree_1.watchFileTree)(opts.glob, (updatedFiles) => {
+                files = updatedFiles;
+                update();
+            });
+        }
+        else {
+            files = await (0, file_tree_1.getFileTree)(opts.glob);
+            update();
+        }
     });
 }
 exports.createManifestGenerator = createManifestGenerator;

package/build/reporter.d.ts

@@ -1,5 +1,5 @@
 import { Compiler, Stats } from "webpack";
-declare type Options = {
+type Options = {
     title: string;
 };
 export declare class ReporterPlugin {

package/build/reporter.js

@@ -4,16 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReporterPlugin = void 0;
-var chalk_1 = __importDefault(require("chalk"));
-var ReporterPlugin = /** @class */ (function () {
-    function ReporterPlugin(opts) {
+const chalk_1 = __importDefault(require("chalk"));
+class ReporterPlugin {
+    constructor(opts) {
         this.title = opts.title;
     }
-    ReporterPlugin.prototype.apply = function (compiler) {
-        var _this = this;
-        var plugin = { name: "EDDevReporterPlugin" };
-        var log = function (type, message, errors) {
-            var label = " ".concat(type.toUpperCase(), " (").concat(_this.title, ") ");
+    apply(compiler) {
+        const plugin = { name: "EDDevReporterPlugin" };
+        const log = (type, message, errors) => {
+            let label = ` ${type.toUpperCase()} (${this.title}) `;
             if (type === "done") {
                 label = chalk_1.default.bgGreenBright.black(label);
             }
@@ -31,10 +30,10 @@ var ReporterPlugin = /** @class */ (function () {
                 console.log(errors);
             }
         };
-        compiler.hooks.done.tap(plugin, function (stats) {
+        compiler.hooks.done.tap(plugin, (stats) => {
             // console.log(this.title + ": Done")
-            var hasErrors = stats.hasErrors();
-            var hasWarnings = stats.hasWarnings();
+            const hasErrors = stats.hasErrors();
+            const hasWarnings = stats.hasWarnings();
             // const status: StatusItem = {
             //   statusType: "success",
             //   message: "",
@@ -45,44 +44,42 @@ var ReporterPlugin = /** @class */ (function () {
                 return;
             }
             if (hasErrors) {
-                var errors = extractErrorsFromStats(stats, "errors")
-                    .map(function (err) { return err.message; })
+                const errors = extractErrorsFromStats(stats, "errors")
+                    .map((err) => err.message)
                     .join("\n");
                 log("error", "Error compiling", errors);
                 return;
             }
             if (hasWarnings) {
-                var warnings = extractErrorsFromStats(stats, "warnings")
-                    .map(function (err) { return err.message; })
+                const warnings = extractErrorsFromStats(stats, "warnings")
+                    .map((err) => err.message)
                     .join("\n");
                 log("warn", "Warnings encountered", warnings);
                 // log.warn("Warnings encountered %s", warnings)
                 // this.displayErrors(extractErrorsFromStats(stats, "warnings"), "warning")
             }
         });
-        compiler.hooks.invalid.tap(plugin, function () {
+        compiler.hooks.invalid.tap(plugin, () => {
             log("wait", "Building...");
         });
-    };
-    ReporterPlugin.prototype.displaySuccess = function (stats) {
+    }
+    displaySuccess(stats) {
         console.log("SUCCESS", this.title);
-    };
-    ReporterPlugin.prototype.displayErrors = function (errors, type) {
+    }
+    displayErrors(errors, type) {
         console.log(type, this.title, errors);
-    };
-    return ReporterPlugin;
-}());
+    }
+}
 exports.ReporterPlugin = ReporterPlugin;
 function extractErrorsFromStats(stats, type) {
-    var findErrorsRecursive = function (compilation) {
-        var errors = compilation[type];
+    const findErrorsRecursive = (compilation) => {
+        const errors = compilation[type];
         if (errors.length === 0 && compilation.children) {
-            for (var _i = 0, _a = compilation.children; _i < _a.length; _i++) {
-                var child = _a[_i];
-                errors.push.apply(errors, findErrorsRecursive(child));
+            for (const child of compilation.children) {
+                errors.push(...findErrorsRecursive(child));
             }
         }
-        return uniqueBy(errors, function (error) { return error.message; });
+        return uniqueBy(errors, (error) => error.message);
     };
     return findErrorsRecursive(stats.compilation);
 }
@@ -94,9 +91,9 @@ function extractErrorsFromStats(stats, type) {
  * ) = [{ id: 1 }, { id: 2 }]
  */
 function uniqueBy(arr, fun) {
-    var seen = {};
-    return arr.filter(function (el) {
-        var e = fun(el);
+    const seen = {};
+    return arr.filter((el) => {
+        const e = fun(el);
         return !(e in seen) && (seen[e] = 1);
     });
 }

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

@@ -1,5 +1,5 @@
 import { ServerlessSignal } from "../state/serverless-state";
-declare type Options = {
+type Options = {
     baseDirectory: string;
     dev: boolean;
     build: boolean;