eddev 0.2.2-beta.9 → 0.2.4

package/{fields → admin}/components/ImageWell.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type Props = {
     previewSize: string;
     aspects: string[];

package/admin/defineWidget.d.ts

@@ -0,0 +1,10 @@
+import { ComponentType } from "react";
+declare type WidgetProps = {
+    element: HTMLElement;
+    dataset: DOMStringMap;
+};
+export declare function defineWidget(name: string, component: ComponentType<WidgetProps>): {
+    name: string;
+    component: ComponentType<WidgetProps>;
+};
+export {};

package/admin/defineWidget.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineWidget = void 0;
+function defineWidget(name, component) {
+    return {
+        name: name,
+        component: component,
+    };
+}
+exports.defineWidget = defineWidget;

package/admin/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./defineField";
+export * from "./defineWidget";
+export * from "./components/ImageWell";

package/{fields → admin}/index.js

@@ -10,5 +10,6 @@ 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("./defineFIeld"), exports);
+__exportStar(require("./defineField"), exports);
+__exportStar(require("./defineWidget"), exports);
 __exportStar(require("./components/ImageWell"), exports);

package/admin/runWidgets.d.ts

@@ -0,0 +1 @@
+export declare function runWidgets(): void;

package/admin/runWidgets.js

@@ -0,0 +1,40 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runWidgets = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+// @ts-ignore
+var widgets_1 = __importDefault(require("@manifest/widgets"));
+var react_dom_1 = __importDefault(require("react-dom"));
+function runWidgets() {
+    var elements = document.querySelectorAll("[data-widget]");
+    console.log("Running widgets", elements, widgets_1.default);
+    elements.forEach(function (el) {
+        if (el instanceof HTMLElement) {
+            var data = el.dataset;
+            var name_1 = data["widget"];
+            var type = widgets_1.default.find(function (item) { return item.name === name_1; });
+            if (type) {
+                var props = {
+                    element: el,
+                    dataset: data,
+                };
+                react_dom_1.default.render((0, jsx_runtime_1.jsx)(type.component, __assign({}, props), void 0), el);
+            }
+        }
+    });
+}
+exports.runWidgets = runWidgets;

package/build/get-webpack-config.js

@@ -79,6 +79,7 @@ var manifest_blocks_1 = require("./manifests/manifest-blocks");
 var manifest_fields_1 = require("./manifests/manifest-fields");
 var manifest_views_1 = require("./manifests/manifest-views");
 var get_config_1 = require("../config/get-config");
+var manifest_widgets_1 = require("./manifests/manifest-widgets");
 function getWebpackConfig(opts) {
     return __awaiter(this, void 0, void 0, function () {
         var compiling, config, ALIAS, ENTRY, PLUGINS, RULES, DEFINES, VIRTUAL_MODULES, EXTERNALS, virtualModules, isServerless, isBrowser, isSSR, isDev, entryDir, distSuffix, outputFolder, loadableManifestFile, writeVirtualModule, manifestLoaders, rpcExists, buildID;
@@ -283,6 +284,23 @@ function getWebpackConfig(opts) {
                     else {
                         writeVirtualModule(ALIAS["@manifest/fields"], "\n        export default {}\n      ");
                     }
+                    // Field manifest
+                    ALIAS["@manifest/widgets"] = path_1.default.resolve(opts.baseDirectory, "_widgets_manifest.js");
+                    if (opts.isAdmin) {
+                        manifestLoaders.push((0, manifest_widgets_1.createWidgetManifestGenerator)({
+                            baseDirectory: opts.baseDirectory,
+                            isAdmin: true,
+                            isDev: isDev,
+                            isServerless: isServerless,
+                            watch: isDev,
+                            onGenerate: function (manifest) {
+                                writeVirtualModule(ALIAS["@manifest/widgets"], manifest);
+                            },
+                        }));
+                    }
+                    else {
+                        writeVirtualModule(ALIAS["@manifest/widgets"], "\n          export default {}\n        ");
+                    }
                     // Block manifest
                     ALIAS["@manifest/blocks"] = path_1.default.resolve(opts.baseDirectory, "_blocks_manifest.js");
                     manifestLoaders.push((0, manifest_blocks_1.createBlockManifestGenerator)({

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

@@ -0,0 +1,12 @@
+declare type Options = {
+    baseDirectory: string;
+    isAdmin: boolean;
+    isDev: boolean;
+    isServerless: boolean;
+    onGenerate: (value: string) => void;
+    watch: boolean;
+};
+export declare function createWidgetManifestGenerator(opts: Options): Promise<{
+    close(): void;
+}>;
+export {};

package/build/manifests/manifest-widgets.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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");
+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) {
+            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 };
+                });
+                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 componentName;
+                })
+                    .join(",\n"), "\n          ]\n        ");
+            }
+            else {
+                return "export default {}";
+            }
+        },
+    });
+}
+exports.createWidgetManifestGenerator = createWidgetManifestGenerator;

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

@@ -126,14 +126,11 @@ function createNextApp(opts) {
                             "components/**/*",
                             "hooks/**/*",
                             "queries/**/*",
-                            ".env",
                             "views/**/*",
-                            "theme.css.tsx",
-                            "types.graphql.ts",
-                            "types.views.ts",
-                            "types.blocks.ts",
-                            "types.api.ts",
                             "utils/**/*",
+                            ".env",
+                            "*.ts",
+                            "*.tsx",
                             "ed.config.json",
                         ])
                         // Also sync APIs into the APIs folder

package/cli/display/components/BundleDisplay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CompilerState } from "../../../build/state/compiler-state";
 import { Observable } from "../../../utils/Observable";
 export declare function BundleDisplay(props: {

package/cli/display/components/CodegenDisplay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CodegenState } from "../../../build/state/codegen-state";
 import { Observable } from "../../../utils/Observable";
 export declare function CodegenDisplay(props: {

package/cli/display/components/DevCLIDisplay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CodegenState } from "../../../build/state/codegen-state";
 import { CompilerState } from "../../../build/state/compiler-state";
 import { ServerlessState } from "../../../build/state/serverless-state";

package/cli/display/components/ServerlessDisplay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ServerlessState } from "../../../build/state/serverless-state";
 import { Observable } from "../../../utils/Observable";
 export declare function ServerlessDisplay(props: {

package/cli/display/components/StatusIcon.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type Props = {
     icon: "loading" | "tick" | "error" | "none";
 };

package/components/AdminBar.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare function AdminBar(): JSX.Element;

package/components/BrowserRouter.js

@@ -68,11 +68,13 @@ function BrowserRouter(props) {
             setIsLoading(true);
         }
         (0, remoteProps_1.fetchProps)(pending.url).then(function (data) {
+            console.log("FETCHED", data);
             var view = views_1.default[data.view];
+            var nextUrl = data.canonical || pending.url;
             var finish = function () {
                 var _a, _b;
                 setState({
-                    url: pending.url,
+                    url: nextUrl,
                     data: data,
                 });
                 // setData(data)
@@ -86,7 +88,7 @@ function BrowserRouter(props) {
                 setIsLoading(false);
                 if (!pending.popped) {
                     history.replaceState({ scrollPosition: (_b = document.scrollingElement) === null || _b === void 0 ? void 0 : _b.scrollTop }, "", document.location.href);
-                    history.pushState({}, "", pending.url);
+                    history.pushState({}, "", nextUrl);
                 }
             };
             if (view && view.preload) {

package/dev-ui/components/BreakpointColumnHeader.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type Props = {
     lerpStart?: boolean;
     lerps?: boolean;

package/dev-ui/components/BreakpointIndicator.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare function BreakpointIndicator(): JSX.Element;

package/dev-ui/components/DevUI.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function DevUI(): JSX.Element;

package/dev-ui/components/ResponsiveLerpControl.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ResponsiveAtomCalc } from "../../style";
 declare type Props = {
     data: ResponsiveAtomCalc[];

package/dev-ui/components/ResponsiveScaleEditor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { BreakpointArray } from "../../style";
 export declare const RESPONSIVE_COLUMN_WIDTH = "110px";
 export declare const RESPONSIVE_ROW_HEIGHT = "20px";

package/dev-ui/components/atoms/NumberField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type Props = {
     prefix?: string;
     suffix?: string;

package/dev-ui/components/panels/PageDataDebugger.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare function PageDataDebugger(): JSX.Element;

package/dev-ui/components/panels/SpacingEditor.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare function SpacingEditor(): JSX.Element;

package/dev-ui/components/panels/TypographyEditor.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare function TypographyEditor(): JSX.Element;

package/dev-ui/icons.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const bolt: JSX.Element;
 export declare const typography: JSX.Element;
 export declare const ruler: JSX.Element;

package/dev-ui/loader.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare function DevUILoader(): JSX.Element | null;

package/entry/Root.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare function Root(): JSX.Element;
 declare const _default: typeof Root | import("next").NextComponentType<import("next").NextPageContext, {}, {}>;
 export default _default;

package/entry/entry.admin.dev.js

@@ -3,9 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var installGutenbergHooks_1 = require("../blocks/installGutenbergHooks");
 // @ts-ignore
 var _theme_1 = require("@theme");
-var installFieldTypes_1 = require("../fields/installFieldTypes");
+var installFieldTypes_1 = require("../admin/installFieldTypes");
+var runWidgets_1 = require("../admin/runWidgets");
 (0, installGutenbergHooks_1.installEDGutenbergHooks)();
 (0, installFieldTypes_1.installFieldTypes)();
+window.onload = runWidgets_1.runWidgets;
+// @ts-ignore
+// if (import.meta.webpackHot) {
+//   console.log("HEY", require.resolve("@manifest/widgets"))
+//   // @ts-ignore
+//   import.meta.webpackHot.accept([require.resolve("@manifest/widgets")], () => {
+//     const runWidgets = require("../admin/runWidgets").runWidgets
+//     console.log("HELLO")
+//     runWidgets()
+//   })
+// }
 if (_theme_1.editorGlobalStyles) {
     (0, _theme_1.editorGlobalStyles)();
 }

package/entry/entry.admin.prod.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var installGutenbergHooks_1 = require("../blocks/installGutenbergHooks");
 // @ts-ignore
 var _theme_1 = require("@theme");
-var installFieldTypes_1 = require("../fields/installFieldTypes");
+var installFieldTypes_1 = require("../admin/installFieldTypes");
+var runWidgets_1 = require("../admin/runWidgets");
 (0, installGutenbergHooks_1.installEDGutenbergHooks)();
 (0, installFieldTypes_1.installFieldTypes)();
+window.onload = runWidgets_1.runWidgets;
 if (_theme_1.editorGlobalStyles) {
     (0, _theme_1.editorGlobalStyles)();
 }

package/entry/entry.monolith.dev.js

@@ -9,17 +9,11 @@ var jsx_runtime_1 = require("react/jsx-runtime");
  * It also assumes that it's being run from a theme directory in WordPress, and
  * that it's not being run in the Admin panel, but the user may be logged in.
  */
-var react_dom_1 = __importDefault(require("react-dom"));
+var client_1 = __importDefault(require("react-dom/client"));
 var BrowserRouter_1 = require("../components/BrowserRouter");
 var Root_1 = __importDefault(require("./Root"));
 // @ts-ignore
 if (!window.wp)
     window.wp = {};
 // @ts-ignore
-if (react_dom_1.default.createRoot) {
-    // @ts-ignore
-    react_dom_1.default.createRoot(document.getElementById("root")).render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0));
-}
-else {
-    react_dom_1.default.render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0), document.getElementById("root"));
-}
+client_1.default.createRoot(document.getElementById("root")).render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0));

package/entry/entry.monolith.prod.js

@@ -9,15 +9,10 @@ var jsx_runtime_1 = require("react/jsx-runtime");
  * It also assumes that it's being run from a theme directory in WordPress, and
  * that it's not being run in the Admin panel, but the user may be logged in.
  */
-// @ts-ignore
-var react_dom_1 = __importDefault(require("react-dom"));
+var client_1 = __importDefault(require("react-dom/client"));
 var BrowserRouter_1 = require("../components/BrowserRouter");
 var Root_1 = __importDefault(require("./Root"));
 // @ts-ignore
-if (react_dom_1.default.createRoot) {
-    // @ts-ignore
-    react_dom_1.default.createRoot(document.getElementById("root")).render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0));
-}
-else {
-    react_dom_1.default.render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0), document.getElementById("root"));
-}
+// if (ReactDOM.createRoot) {
+// @ts-ignore
+client_1.default.createRoot(document.getElementById("root")).render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.2-beta.9",
+  "version": "0.2.4",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -87,7 +87,7 @@
     "rimraf": "^3.0.2",
     "swr": "^1.0.1",
     "to-icon": "^1.1.4",
-    "typescript": "^4.5.5",
+    "typescript": "4.5.5",
     "url-parse": "^1.5.3",
     "webpack": "^5.52.0",
     "webpack-bundle-analyzer": "^4.5.0",
@@ -103,7 +103,7 @@
     "@trpc/next": "^9.19.0",
     "@trpc/react": "^9.19.0",
     "@trpc/server": "^9.19.0",
-    "react": "^18.0.0-rc.0",
-    "react-dom": "^18.0.0-rc.0"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   }
 }

package/routing/remoteProps.d.ts

@@ -8,6 +8,8 @@ export interface RouteData {
     viewType: "react" | "html";
     viewData: any;
     appData: any;
+    redirect?: string;
+    canonical?: string;
     meta?: {
         head: ParsedRouteTags;
         footer: ParsedRouteTags;

package/routing/remoteProps.js

@@ -78,6 +78,13 @@ function fetchProps(url) {
             promise = fetch(requestUrl)
                 .then(function (response) { return response.json(); })
                 .then(function (data) {
+                if (data.redirect) {
+                    var redirect_1 = data.redirect;
+                    return fetchProps(redirect_1).then(function (data) {
+                        data.canonical = redirect_1;
+                        return data;
+                    });
+                }
                 delete pending[cacheKey];
                 cache[cacheKey] = data;
                 return data;

package/serverless-template/_utils/fetch-wordpress-props.ts

@@ -42,8 +42,18 @@ export async function fetchWordpressProps(pathname: string) {
     return url
   })
 
+  const payload = JSON.parse(text)
+
+  if (payload.redirect) {
+    return {
+      status: payload.code,
+      redirect: true,
+      uri: payload.redirect,
+    }
+  }
+
   return {
     status: response.status,
-    data: JSON.parse(text),
+    data: payload,
   }
 }

package/serverless-template/package.json

@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "^18.0.0-rc.3",
+    "react-dom": "^18.0.0-rc.3",
     "@trpc/next": "^9.19.0",
     "@trpc/server": "^9.19.0"
   },

package/serverless-template/pages/[...slug].tsx

@@ -14,10 +14,18 @@ export async function getStaticPaths(): Promise<GetStaticPathsResult> {
 
 export async function getStaticProps({ params }: GetStaticPropsContext): Promise<GetStaticPropsResult<any>> {
   const result = await fetchWordpressProps((params?.slug as string[]).join("/"))
+  console.log("RESULT", result)
   if (result.status === 404) {
     return {
       notFound: true,
     }
+  } else if (result.redirect) {
+    return {
+      redirect: {
+        destination: result.uri,
+        permanent: result.status === 301,
+      },
+    }
   }
   return {
     props: result.data,

package/fields/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./defineFIeld";
-export * from "./components/ImageWell";