eddev 0.1.48-b1 → 0.1.51

package/build/file-tree.js

@@ -24,6 +24,10 @@ function watchFileTree(pattern, callback) {
                 files.splice(i, 1);
             if (ready)
                 callback(files);
+        })
+            .on("change", function () {
+            if (ready)
+                callback(files);
         })
             .on("ready", function () {
             ready = true;

package/build/get-webpack-config.js

@@ -76,6 +76,7 @@ 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");
 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, updateTemplateRouter, templateLookupPattern, _a, updateFieldManifest, fieldTypeLookupPattern, _b, updateBlocksManifest, blockLookupManifest, _c, buildID;
@@ -325,7 +326,7 @@ function getWebpackConfig(opts) {
                     return [3 /*break*/, 10];
                 case 8:
                     _b = updateFieldManifest;
-                    return [4 /*yield*/, (0, file_tree_1.getFileTree)(templateLookupPattern)];
+                    return [4 /*yield*/, (0, file_tree_1.getFileTree)(fieldTypeLookupPattern)];
                 case 9:
                     _b.apply(void 0, [_d.sent()]);
                     _d.label = 10;
@@ -339,36 +340,40 @@ function getWebpackConfig(opts) {
                             var name = path_1.default.basename(file).replace(/\.(jsx|tsx|ts|js)$/i, "");
                             var module = JSON.stringify("./" + relative);
                             var componentName = (0, change_case_1.pascalCase)(name);
-                            return { relative: relative, name: name, module: module, componentName: componentName };
+                            // Test if the block has Dynamic: true in the header
+                            var dynamic = !opts.isAdmin &&
+                                !!(0, fs_1.readFileSync)(file)
+                                    .toString()
+                                    .match(/\*[\s]*dynamic: true/i);
+                            return { relative: relative, name: name, module: module, componentName: componentName, dynamic: dynamic };
                         });
-                        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) {
-                                var relative = _a.relative, componentName = _a.componentName, module = _a.module;
-                                var parts = relative.replace(/\.tsx$/, "").split("/");
-                                var blockName = "acf/" + parts.slice(1).join("-");
-                                return "\"".concat(blockName, "\": loadable(() => import(").concat(module, "))");
-                            })
-                                .join(",\n"), "\n        }\n      "));
-                        }
-                        else {
-                            writeVirtualModule(ALIAS["@manifest/blocks"], "\n        import coreBlocks from './blocks/_core.tsx'\n\n        ".concat(files
-                                .map(function (_a) {
-                                var relative = _a.relative, componentName = _a.componentName, module = _a.module;
-                                var parts = relative.replace(/\.tsx$/, "").split("/");
-                                var blockName = "acf/" + parts.slice(1).join("-");
+                        writeVirtualModule(ALIAS["@manifest/blocks"], "\n        import coreBlocks from './blocks/_core.tsx'\n        import loadable from '".concat(require.resolve("@loadable/component"), "';\n\n        ").concat(files
+                            .map(function (_a) {
+                            var relative = _a.relative, componentName = _a.componentName, module = _a.module, dynamic = _a.dynamic;
+                            var parts = relative.replace(/\.tsx$/, "").split("/");
+                            var blockName = "acf/" + parts.slice(1).join("-");
+                            if (dynamic) {
+                                console.log("Dynamic", blockName);
+                                return null;
+                            }
+                            else {
                                 return "import ".concat(componentName, " from ").concat(module);
-                            })
-                                .join("\n"), "\n\n        export default {\n          ...coreBlocks,\n          ").concat(files
-                                .map(function (_a) {
-                                var relative = _a.relative, componentName = _a.componentName, module = _a.module;
-                                var parts = relative.replace(/\.tsx$/, "").split("/");
-                                var blockName = "acf/" + parts.slice(1).join("-");
+                            }
+                        })
+                            .filter(Boolean)
+                            .join("\n"), "\n\n        export default {\n          ...coreBlocks,\n          ").concat(files
+                            .map(function (_a) {
+                            var relative = _a.relative, componentName = _a.componentName, module = _a.module, dynamic = _a.dynamic;
+                            var parts = relative.replace(/\.tsx$/, "").split("/");
+                            var blockName = "acf/" + parts.slice(1).join("-");
+                            if (dynamic) {
+                                return "\"".concat(blockName, "\": loadable(() => import(").concat(module, "))");
+                            }
+                            else {
                                 return "\"".concat(blockName, "\": ").concat(componentName);
-                            })
-                                .join(",\n"), "\n        }\n      "));
-                        }
+                            }
+                        })
+                            .join(",\n"), "\n        }\n      "));
                     };
                     blockLookupManifest = path_1.default.resolve(opts.baseDirectory, "blocks/**/*.tsx");
                     if (!isDev) return [3 /*break*/, 12];

package/dynamic/dynamic-component.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+export declare const dynamic: {
+    <Props, Module = import("@loadable/component").DefaultComponent<Props>>(loadFn: (props: Props) => Promise<Module>, options: import("@loadable/component").OptionsWithResolver<Props, Module>): import("@loadable/component").LoadableComponent<Props>;
+    <Props_1>(loadFn: (props: Props_1) => Promise<import("@loadable/component").DefaultComponent<Props_1>>, options?: import("@loadable/component").OptionsWithoutResolver<Props_1> | undefined): import("@loadable/component").LoadableComponent<Props_1>;
+    <Component extends import("react").ComponentClass<any, any>>(loadFn: (props: import("react").ComponentProps<Component>) => Promise<Component | {
+        default: Component;
+    }>, options?: import("@loadable/component").Options<import("react").ComponentProps<Component>, Component> | undefined): import("@loadable/component").LoadableClassComponent<Component>;
+} & {
+    lib: <Props_2, Module_1>(loadFn: (props: Props_2) => Promise<Module_1>, options?: import("@loadable/component").OptionsWithoutResolver<Props_2> | undefined) => import("@loadable/component").LoadableLibrary<Module_1>;
+};

package/dynamic/dynamic-component.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dynamic = void 0;
+var component_1 = __importDefault(require("@loadable/component"));
+exports.dynamic = component_1.default;

package/dynamic/index.d.ts

@@ -0,0 +1 @@
+export * from "./dynamic-component";

package/dynamic/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./dynamic-component"), exports);

package/fields/installFieldTypes.js

@@ -28,17 +28,15 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var fields_1 = __importDefault(require("@manifest/fields"));
 var ReactDOM = __importStar(require("react-dom"));
 var react_1 = require("react");
-console.log("Field types available");
 function installFieldTypes() {
     // @ts-ignore
     var acf = window.acf;
-    console.log("Installing field types", fields_1.default);
     var _loop_1 = function (name_1) {
         var type = fields_1.default[name_1];
         var Component = type.render;
-        var init = function (_a) {
-            var $el = _a.$el, cid = _a.cid, data = _a.data;
-            console.log("Initializing field", $el, data);
+        var init = function (field) {
+            console.log("Field is", field);
+            var $el = field.$el, cid = field.cid, data = field.data;
             var input = $el.find("input[type='hidden']");
             var container = document.createElement("div");
             $el.append(container);
@@ -55,9 +53,20 @@ exports.installFieldTypes = installFieldTypes;
 function FieldWrapper(_a) {
     var input = _a.input, defaultValue = _a.defaultValue, Component = _a.Component, settings = _a.settings;
     var _b = (0, react_1.useState)(function () { var _a; return (_a = (input.value ? JSON.parse(input.value) : null)) !== null && _a !== void 0 ? _a : defaultValue; }), value = _b[0], setValue = _b[1];
+    var _c = (0, react_1.useState)(false), valueChanged = _c[0], setValueChanged = _c[1];
     (0, react_1.useEffect)(function () {
         input.value = JSON.stringify(value);
-        console.log(input.value);
-    }, [value]);
-    return (0, jsx_runtime_1.jsx)(Component, { value: value, onChange: setValue, settings: settings }, void 0);
+        if (valueChanged) {
+            try {
+                // @ts-ignore
+                window.jQuery(input).change();
+            }
+            catch (err) { }
+            setValueChanged(false);
+        }
+    }, [value, valueChanged]);
+    return ((0, jsx_runtime_1.jsx)(Component, { value: value, onChange: function (value) {
+            setValue(value);
+            setValueChanged(true);
+        }, settings: settings }, void 0));
 }

package/gravityforms/useGravityForm.js

@@ -96,7 +96,6 @@ function useGravityForm(opts) {
             submit: function (state) {
                 dispatch({ type: "submitting" });
                 submit(form, state).then(function (result) {
-                    console.log("RESULT", result);
                     if (cancelled)
                         return;
                     if (result.success) {
@@ -126,7 +125,11 @@ function prepareValuesPayload(form, state, data) {
     for (var _i = 0, _a = form.fields; _i < _a.length; _i++) {
         var field = _a[_i];
         var value = state.values[field.id];
-        data["input_" + field.id] = value;
+        var key = "input_" + field.id;
+        if (field.type === "consent") {
+            key += "_1";
+        }
+        data[key] = value;
     }
     return data;
 }
@@ -137,7 +140,6 @@ function submit(form, state) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 3, , 4]);
-                    console.log("Submitting", { form: form, state: state });
                     url = "/wp-json/ed/v1/gf/submit";
                     params = {
                         formID: form.id,

package/package.json

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