eddev 0.2.6 → 0.2.9

package/blocks/ContentBlocks.js

@@ -31,7 +31,39 @@ var blockAttributes_1 = require("./blockAttributes");
 var react_1 = require("react");
 var ErrorBoundaryFrontend_1 = require("./ErrorBoundaryFrontend");
 exports.BlocksContext = (0, react_1.createContext)(undefined);
+function wrapPromise(promise) {
+    var status = "pending";
+    var result;
+    var suspender = promise.then(function (r) {
+        status = "success";
+        result = r;
+    }, function (e) {
+        status = "error";
+        result = e;
+    });
+    return {
+        read: function () {
+            //console.log(status);
+            if (status === "pending") {
+                throw suspender;
+            }
+            else if (status === "error") {
+                throw result;
+            }
+            else if (status === "success") {
+                return result;
+            }
+        },
+    };
+}
+var blockManifestResource = null;
 function ContentBlocks(props) {
+    var blockTypes = blocks_1.default;
+    if (blocks_1.default.then && process.serverless && !blocks_1.default.default) {
+        if (!blockManifestResource)
+            blockManifestResource = wrapPromise(blocks_1.default);
+        blockTypes = blockManifestResource.read().default;
+    }
     if (process.admin) {
         throw new Error("ContentBlocks should only be used on the frontend.");
     }
@@ -44,8 +76,8 @@ function ContentBlocks(props) {
             var ctx = __assign(__assign({}, parentContext), { ancestors: __spreadArray(__spreadArray([], ((parentContext === null || parentContext === void 0 ? void 0 : parentContext.ancestors) || []), true), [parentContext === null || parentContext === void 0 ? void 0 : parentContext.current], false).filter(Boolean), parent: parentContext === null || parentContext === void 0 ? void 0 : parentContext.current, current: block, prev: props.blocks[index - 1], next: props.blocks[index + 1] });
             // Figure out the
             var blockNode;
-            if (block.blockName in blocks_1.default) {
-                var Component = blocks_1.default[block.blockName];
+            if (block.blockName in blockTypes) {
+                var Component = blockTypes[block.blockName];
                 if (!Component)
                     return (0, jsx_runtime_1.jsx)(react_1.Fragment, {}, void 0);
                 blockNode = ((0, jsx_runtime_1.jsx)(blockAttributes_1.InlineEditingContextProvider, __assign({ block: [block.blockName, block.props], values: block.inline, innerBlocks: block.innerBlocks }, { children: (0, jsx_runtime_1.jsx)(Component, __assign({}, block.props, { innerHTML: block.innerHTML, 

package/blocks/inlineEditing.js

@@ -32,7 +32,7 @@ var react_1 = require("react");
 var blockAttributes_1 = require("./blockAttributes");
 var react_2 = require("@stitches/react");
 var remoteProps_1 = require("../routing/remoteProps");
-var __1 = require("..");
+var routing_1 = require("../routing");
 function EditableText(_a) {
     var id = _a.id, as = _a.as, appendOnEnter = _a.appendOnEnter, props = __rest(_a, ["id", "as", "appendOnEnter"]);
     if (process.admin) {
@@ -48,7 +48,7 @@ function EditableText(_a) {
     }
     else {
         var value = (0, blockAttributes_1.useInlineEditableValue)(id)[0];
-        var router_1 = (0, __1.useRouter)();
+        var router_1 = (0, routing_1.useRouter)();
         var otherProps = __assign({}, props);
         delete otherProps.inlineToolbar;
         delete otherProps.disableLineBreaks;

package/cli/preinstall.js

@@ -9,7 +9,7 @@ function main() {
         // const pkg = JSON.parse(readFileSync(pkgFile).toString()) as any
         // pkg.devDependencies["next"] = "^12.1.0"
         // writeFile(pkgFile, JSON.stringify(pkg, null, "  "), () => {})
-        var proc = (0, child_process_1.spawn)("yarn", ["add", "--dev", "next@^12.1.0"], {
+        var proc = (0, child_process_1.spawn)("yarn", ["add", "--dev", "next@^12.1.6"], {
             cwd: process.cwd(),
         });
         (_a = proc.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);

package/components/BrowserRouter.js

@@ -68,7 +68,6 @@ 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 () {

package/components/NextRouter.js

@@ -15,10 +15,21 @@ exports.NextRouter = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var routing_1 = require("../routing");
 var router_1 = require("next/router");
+var react_1 = require("react");
+var hooks_1 = require("../hooks");
 function NextRouter(_a) {
     var children = _a.children, path = _a.path, data = _a.data;
     var nextRoute = (0, router_1.useRouter)();
+    var setIsLoading = (0, hooks_1.usePageLoad)(function (s) { return s.setIsLoading; });
     var route = __assign(__assign({}, nextRoute), { pathname: nextRoute.asPath });
+    (0, react_1.useEffect)(function () {
+        router_1.Router.events.on("routeChangeStart", function () {
+            console.log("Loading");
+            setIsLoading(true);
+        });
+        router_1.Router.events.on("routeChangeStart", function () { return setIsLoading(false); });
+        router_1.Router.events.on("routeChangeError", function () { return setIsLoading(false); });
+    }, []);
     return ((0, jsx_runtime_1.jsx)(routing_1.RouterRoot, __assign({ url: nextRoute.asPath, data: data, onNavigateRequest: function (url) {
             route.push(url);
             // setPendingUrl({ popped: false, url })

package/config/config-schema.d.ts

@@ -9,9 +9,11 @@ export declare const EDConfigSchema: z.ZodObject<{
         themeAssets: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         apiOnly: z.ZodOptional<z.ZodBoolean>;
         endpoints: z.ZodRecord<z.ZodString, z.ZodString>;
+        defaultRevalidate: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
+        defaultRevalidate?: number | undefined;
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
@@ -20,6 +22,7 @@ export declare const EDConfigSchema: z.ZodObject<{
     }, {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
+        defaultRevalidate?: number | undefined;
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
@@ -32,6 +35,7 @@ export declare const EDConfigSchema: z.ZodObject<{
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
+        defaultRevalidate?: number | undefined;
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
@@ -44,6 +48,7 @@ export declare const EDConfigSchema: z.ZodObject<{
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
+        defaultRevalidate?: number | undefined;
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";

package/config/config-schema.js

@@ -13,6 +13,7 @@ exports.EDConfigSchema = zod_1.z.object({
         themeAssets: zod_1.z.array(zod_1.z.string()).optional(),
         apiOnly: zod_1.z.boolean().optional(),
         endpoints: zod_1.z.record(zod_1.z.string(), zod_1.z.string()),
+        defaultRevalidate: zod_1.z.number().optional(),
     })
         .optional(),
     devUI: zod_1.z.enum(["disabled", "enabled"]),

package/config/get-config.d.ts

@@ -3,6 +3,7 @@ export declare function getEDConfig(dir?: string): import("zod").SafeParseReturn
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
+        defaultRevalidate?: number | undefined;
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
@@ -15,6 +16,7 @@ export declare function getEDConfig(dir?: string): import("zod").SafeParseReturn
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
+        defaultRevalidate?: number | undefined;
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
@@ -28,6 +30,7 @@ export declare function getEDConfigUnwrapped(dir?: string): {
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
+        defaultRevalidate?: number | undefined;
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";

package/config/parse-config.d.ts

@@ -3,6 +3,7 @@ export declare function parseConfig(config: any): import("zod").SafeParseReturnT
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
+        defaultRevalidate?: number | undefined;
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
@@ -15,6 +16,7 @@ export declare function parseConfig(config: any): import("zod").SafeParseReturnT
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
+        defaultRevalidate?: number | undefined;
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";

package/hooks/queryUtils.d.ts

@@ -6,7 +6,10 @@ declare type GraphQLError = {
 declare type CreateUseQueryOptions = {
     name: string;
 };
-declare type QueryOptions = {};
+declare type QueryOptions = {
+    revalidateIfStale?: boolean;
+    revalidateOnFocus?: boolean;
+};
 declare type MaybeVars = {
     [key: string]: any;
 } | undefined;

package/hooks/queryUtils.js

@@ -83,9 +83,11 @@ var fetcherGET = function (name, params) { return __awaiter(void 0, void 0, void
 }); };
 function createUseQuery(init) {
     var hook = function (vars, opts) {
-        var _a = (0, swr_1.default)([init.name, JSON.stringify(vars)], fetcherGET, {
-            revalidateIfStale: false,
-        }), payload = _a.data, isValidating = _a.isValidating, error = _a.error, mutate = _a.mutate;
+        var _a, _b;
+        var _c = (0, swr_1.default)([init.name, JSON.stringify(vars)], fetcherGET, {
+            revalidateIfStale: (_a = opts === null || opts === void 0 ? void 0 : opts.revalidateIfStale) !== null && _a !== void 0 ? _a : false,
+            revalidateOnFocus: (_b = opts === null || opts === void 0 ? void 0 : opts.revalidateOnFocus) !== null && _b !== void 0 ? _b : false,
+        }), payload = _c.data, isValidating = _c.isValidating, error = _c.error, mutate = _c.mutate;
         return {
             loading: isValidating && !payload,
             data: payload === null || payload === void 0 ? void 0 : payload.data,

package/hooks/useRPC.d.ts

@@ -1,25 +1,5 @@
-/// <reference types="react" />
 import { TRPCClientError } from "@trpc/client";
-declare const trpc: {
-    Provider: ({ client, queryClient, children, isPrepass, ssrContext, }: {
-        queryClient: import("react-query").QueryClient;
-        client: import("@trpc/react").TRPCClient<import("@trpc/server").AnyRouter<any>>;
-        children: import("react").ReactNode;
-        isPrepass?: boolean | undefined;
-        ssrContext?: unknown;
-    }) => JSX.Element;
-    createClient: (opts: import("@trpc/react").CreateTRPCClientOptions<import("@trpc/server").AnyRouter<any>>) => import("@trpc/react").TRPCClient<import("@trpc/server").AnyRouter<any>>;
-    useContext: () => import("@trpc/react/dist/declarations/src/internals/context").TRPCContextState<import("@trpc/server").AnyRouter<any>, unknown>;
-    useQuery: <TPath extends string>(pathAndInput: [TPath, (null | undefined)?], opts?: import("@trpc/react").UseTRPCQueryOptions<TPath, unknown, any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>> | undefined) => import("react-query").UseQueryResult<any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>>;
-    useMutation: <TPath_1 extends string>(path: TPath_1 | [TPath_1], opts?: import("@trpc/react").UseTRPCMutationOptions<unknown, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>, any> | undefined) => import("react-query").UseMutationResult<any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>, unknown, unknown>;
-    useSubscription: <TPath_2 extends string, TOutput extends any>(pathAndInput: [TPath_2, (null | undefined)?], opts: {
-        enabled?: boolean | undefined;
-        onError?: ((err: import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>) => void) | undefined;
-        onNext: (data: TOutput) => void;
-    }) => void;
-    useDehydratedState: (client: import("@trpc/react").TRPCClient<import("@trpc/server").AnyRouter<any>>, trpcState: import("react-query").DehydratedState | undefined) => import("react-query").DehydratedState | undefined;
-    useInfiniteQuery: <TPath_3 extends never>(pathAndInput: [path: TPath_3, input: Omit<unknown, "cursor">], opts?: import("@trpc/react").UseTRPCInfiniteQueryOptions<TPath_3, Omit<unknown, "cursor">, any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>> | undefined) => import("react-query").UseInfiniteQueryResult<any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>>;
-};
+declare const trpc: any;
 export declare const useRPCQuery: RPCUseQuery;
 export declare const useRPCMutation: RPCUseMutation;
 export declare const useRPCInfiniteQuery: RPCUseInfiniteQuery;

package/index.d.ts

@@ -1,3 +1 @@
-export * from "./components";
-export * from "./hooks";
-export * from "./routing";
+export {};

package/index.js

@@ -1,15 +1,5 @@
 "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);
-};
+// export * from "./components"
+// export * from "./hooks"
+// export * from "./routing"
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./components"), exports);
-__exportStar(require("./hooks"), exports);
-__exportStar(require("./routing"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.6",
+  "version": "0.2.9",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -27,7 +27,7 @@
     "@types/url-parse": "^1.4.4",
     "@types/webpack-dev-server": "^3.11.2",
     "csstype": "^3.0.9",
-    "next": "^12.1.0",
+    "next": "^12.1.6",
     "react-html-props": "^1.0.32"
   },
   "dependencies": {
@@ -48,8 +48,8 @@
     "@loadable/webpack-plugin": "^5.15.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
-    "@stitches/core": "^1.2.7",
-    "@stitches/react": "^1.2.7",
+    "@stitches/core": "^1.2.8",
+    "@stitches/react": "^1.2.8",
     "@trpc/client": "^9.19.0",
     "@trpc/next": "^9.19.0",
     "@trpc/react": "^9.19.0",

package/routing/routing.js

@@ -329,7 +329,7 @@ exports.Link = (0, react_1.forwardRef)(function (props, ref) {
     // @ts-ignore
     if (process.serverless) {
         var NextLink = require("next/link").default;
-        return ((0, jsx_runtime_1.jsx)(NextLink, __assign({ href: props.href, passHref: true }, { children: (0, jsx_runtime_1.jsx)("a", __assign({ ref: ref }, props, { href: undefined }), void 0) }), void 0));
+        return ((0, jsx_runtime_1.jsx)(NextLink, __assign({ href: props.href, passHref: true, prefetch: false }, { children: (0, jsx_runtime_1.jsx)("a", __assign({ ref: ref }, props, { href: undefined }), void 0) }), void 0));
     }
     var localRef = (0, react_1.useRef)();
     var router = (0, react_1.useContext)(RouterContext);

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

@@ -8,6 +8,7 @@ export async function fetchWordpressProps(pathname: string) {
   const origin = (process.env.SITE_URL as string).replace(/\/$/, "")
   pathname = pathname.replace(/(^\/|\/$)/g, "")
   const propsURL = origin + ("/" + pathname + "/?_props=all").replace(/\/+/, "/")
+  console.log("Fetching from", propsURL)
 
   // Make the request
   let response = await fetchWP(propsURL, {})

package/serverless-template/package.json

@@ -16,6 +16,6 @@
   "devDependencies": {
     "@types/react": "17.0.39",
     "typescript": "4.5.5",
-    "next": "^12.1.0"
+    "next": "^12.1.6"
   }
 }

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

@@ -1,4 +1,5 @@
 import { GetStaticPathsResult, GetStaticPropsContext, GetStaticPropsResult } from "next"
+import settings from "_utils/ed-config"
 import { fetchWordpressProps } from "../_utils/fetch-wordpress-props"
 
 export default function Home(props: any) {
@@ -8,7 +9,7 @@ export default function Home(props: any) {
 export async function getStaticPaths(): Promise<GetStaticPathsResult> {
   return {
     paths: [],
-    fallback: true,
+    fallback: "blocking",
   }
 }
 
@@ -27,7 +28,10 @@ export async function getStaticProps({ params }: GetStaticPropsContext): Promise
       },
     }
   }
+  const revalidate = result.data.revalidate || settings.serverless?.defaultRevalidate || false
+  console.log("REVALIDATE", revalidate)
   return {
     props: result.data,
+    revalidate: revalidate,
   }
 }

package/serverless-template/pages/_app.tsx

@@ -8,6 +8,7 @@ import { useRouter } from "next/router"
 import { DevUILoader } from "eddev/dev-ui/loader"
 import { PageMeta } from "../_utils/PageMeta"
 import { withTRPC } from "@trpc/next"
+import { Suspense } from "react"
 
 let appData: any
 
@@ -16,10 +17,6 @@ function Root({ Component, pageProps }: AppProps) {
 
   if (!appData) appData = pageProps?.appData?.data
 
-  // const appData = useMemo(() => {
-  //   return pageProps?.appData?.data
-  // }, [])
-
   const viewProps = pageProps?.viewData?.data
 
   const View = manifest[pageProps.view || "404"]
@@ -36,7 +33,9 @@ function Root({ Component, pageProps }: AppProps) {
         {pageProps?.meta?.head && <PageMeta {...pageProps?.meta?.head} />}
         {pageProps?.meta?.footer && <PageMeta {...pageProps?.meta?.footer} />}
         {process.devUI ? <DevUILoader /> : null}
-        <App>{View && <View {...viewProps} />}</App>
+        <App>
+          <Suspense fallback={null}>{View && <View {...viewProps} />}</Suspense>
+        </App>
       </NextRouter>
     </ServerlessAppDataProvider>
   )

package/serverless-template/pages/api/rest/{[method].ts → [...method].ts}

@@ -17,7 +17,8 @@ const validProxyPaths = {
 
 export default async function (req: any, res: any) {
   // Ensure that the request is for a proxy path
-  const proxyPath = validProxyPaths[req.query.method as keyof typeof validProxyPaths]!
+  console.log("METHOD", req.query.method)
+  const proxyPath = validProxyPaths[req.query.method[0] as keyof typeof validProxyPaths]!
 
   if (!proxyPath) {
     return res.status(404).json({