eddev 0.2.0-beta.9 → 0.2.1

package/dev-ui/panels.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEV_UI_PANELS = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var PageDataDebugger_1 = require("./components/panels/PageDataDebugger");
+var SpacingEditor_1 = require("./components/panels/SpacingEditor");
+var TypographyEditor_1 = require("./components/panels/TypographyEditor");
+var icons_1 = require("./icons");
+var TempComponent = function () {
+    return (0, jsx_runtime_1.jsx)("div", { children: "Test" }, void 0);
+};
+exports.DEV_UI_PANELS = {
+    typography: {
+        label: "Typography",
+        icon: icons_1.typography,
+        component: TypographyEditor_1.TypographyEditor,
+    },
+    spacing: {
+        label: "Spacing",
+        icon: icons_1.ruler,
+        component: SpacingEditor_1.SpacingEditor,
+    },
+    page: {
+        label: "Page Data",
+        icon: icons_1.code,
+        component: PageDataDebugger_1.PageDataDebugger,
+    },
+    // structure: {
+    //   label: "Page Structure",
+    //   icon: structure,
+    //   component: TempComponent,
+    // },
+};

package/dev-ui/theme.d.ts

@@ -0,0 +1,151 @@
+/// <reference types="react" />
+export declare const styled: <Type extends import("react").ComponentType<any> | keyof JSX.IntrinsicElements | import("@stitches/react/types/util").Function, Composers extends (string | import("react").ComponentType<any> | import("@stitches/react/types/util").Function | {
+    [name: string]: unknown;
+})[], CSS = import("@stitches/react/types/css-util").CSS<{}, {
+    space: {
+        smallButtonHeight: string;
+        buttonHeight: string;
+        0: string;
+        1: string;
+        2: string;
+        3: string;
+        4: string;
+        5: string;
+        6: string;
+    };
+    colors: {
+        bg: string;
+        bgHover: string;
+        bgHoverLight: string;
+        bgLine: string;
+        bgLineStrong: string;
+        button: string;
+        buttonHover: string;
+        fg: string;
+        fgFaded: string;
+    };
+    fontSizes: {
+        sm: string;
+        md: string;
+        lg: string;
+        xl: string;
+    };
+    fonts: {
+        body: string;
+        mono: string;
+    };
+    radii: {
+        sm: string;
+        md: string;
+        lg: string;
+    };
+    transitions: {
+        default: string;
+    };
+}, import("@stitches/react/types/config").DefaultThemeMap, {}>>(type: Type, ...composers: { [K in keyof Composers]: Composers[K] extends string | import("react").ComponentType<any> | import("@stitches/react/types/util").Function ? Composers[K] : import("@stitches/react/types/stitches").RemoveIndex<CSS> & {
+    variants?: {
+        [x: string]: {
+            [x: string]: CSS;
+            [x: number]: CSS;
+        };
+    } | undefined;
+    compoundVariants?: (("variants" extends keyof Composers[K] ? { [Name in keyof Composers[K][keyof Composers[K] & "variants"]]?: import("@stitches/react/types/util").String | import("@stitches/react/types/util").Widen<keyof Composers[K][keyof Composers[K] & "variants"][Name]> | undefined; } : import("@stitches/react/types/util").WideObject) & {
+        css: CSS;
+    })[] | undefined;
+    defaultVariants?: ("variants" extends keyof Composers[K] ? { [Name_1 in keyof Composers[K][keyof Composers[K] & "variants"]]?: import("@stitches/react/types/util").String | import("@stitches/react/types/util").Widen<keyof Composers[K][keyof Composers[K] & "variants"][Name_1]> | undefined; } : import("@stitches/react/types/util").WideObject) | undefined;
+} & CSS & { [K2 in keyof Composers[K]]: K2 extends "compoundVariants" | "defaultVariants" | "variants" ? unknown : K2 extends keyof CSS ? CSS[K2] : unknown; }; }) => import("@stitches/react/types/styled-component").StyledComponent<Type, import("@stitches/react/types/styled-component").StyledComponentProps<Composers>, {}, import("@stitches/react/types/css-util").CSS<{}, {
+    space: {
+        smallButtonHeight: string;
+        buttonHeight: string;
+        0: string;
+        1: string;
+        2: string;
+        3: string;
+        4: string;
+        5: string;
+        6: string;
+    };
+    colors: {
+        bg: string;
+        bgHover: string;
+        bgHoverLight: string;
+        bgLine: string;
+        bgLineStrong: string;
+        button: string;
+        buttonHover: string;
+        fg: string;
+        fgFaded: string;
+    };
+    fontSizes: {
+        sm: string;
+        md: string;
+        lg: string;
+        xl: string;
+    };
+    fonts: {
+        body: string;
+        mono: string;
+    };
+    radii: {
+        sm: string;
+        md: string;
+        lg: string;
+    };
+    transitions: {
+        default: string;
+    };
+}, import("@stitches/react/types/config").DefaultThemeMap, {}>>, css: <Composers extends (string | import("react").JSXElementConstructor<any> | import("react").ExoticComponent<any> | import("@stitches/react/types/util").Function | {
+    [name: string]: unknown;
+})[], CSS = import("@stitches/react/types/css-util").CSS<{}, {
+    space: {
+        smallButtonHeight: string;
+        buttonHeight: string;
+        0: string;
+        1: string;
+        2: string;
+        3: string;
+        4: string;
+        5: string;
+        6: string;
+    };
+    colors: {
+        bg: string;
+        bgHover: string;
+        bgHoverLight: string;
+        bgLine: string;
+        bgLineStrong: string;
+        button: string;
+        buttonHover: string;
+        fg: string;
+        fgFaded: string;
+    };
+    fontSizes: {
+        sm: string;
+        md: string;
+        lg: string;
+        xl: string;
+    };
+    fonts: {
+        body: string;
+        mono: string;
+    };
+    radii: {
+        sm: string;
+        md: string;
+        lg: string;
+    };
+    transitions: {
+        default: string;
+    };
+}, import("@stitches/react/types/config").DefaultThemeMap, {}>>(...composers: { [K in keyof Composers]: Composers[K] extends string | import("react").JSXElementConstructor<any> | import("react").ExoticComponent<any> | import("@stitches/react/types/util").Function ? Composers[K] : import("@stitches/react/types/stitches").RemoveIndex<CSS> & {
+    variants?: {
+        [x: string]: {
+            [x: string]: CSS;
+            [x: number]: CSS;
+        };
+    } | undefined;
+    compoundVariants?: (("variants" extends keyof Composers[K] ? { [Name in keyof Composers[K][keyof Composers[K] & "variants"]]?: import("@stitches/react/types/util").String | import("@stitches/react/types/util").Widen<keyof Composers[K][keyof Composers[K] & "variants"][Name]> | undefined; } : import("@stitches/react/types/util").WideObject) & {
+        css: CSS;
+    })[] | undefined;
+    defaultVariants?: ("variants" extends keyof Composers[K] ? { [Name_1 in keyof Composers[K][keyof Composers[K] & "variants"]]?: import("@stitches/react/types/util").String | import("@stitches/react/types/util").Widen<keyof Composers[K][keyof Composers[K] & "variants"][Name_1]> | undefined; } : import("@stitches/react/types/util").WideObject) | undefined;
+} & CSS & { [K2 in keyof Composers[K]]: K2 extends "compoundVariants" | "defaultVariants" | "variants" ? unknown : K2 extends keyof CSS ? CSS[K2] : unknown; }; }) => import("@stitches/react/types/styled-component").CssComponent<import("@stitches/react/types/styled-component").StyledComponentType<Composers>, import("@stitches/react/types/styled-component").StyledComponentProps<Composers>, {}, CSS>;

package/dev-ui/theme.js

@@ -0,0 +1,50 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.css = exports.styled = void 0;
+var react_1 = require("@stitches/react");
+exports.styled = (_a = (0, react_1.createStitches)({
+    theme: {
+        space: {
+            smallButtonHeight: "22px",
+            buttonHeight: "26px",
+            0: "4px",
+            1: "8px",
+            2: "12px",
+            3: "16px",
+            4: "24px",
+            5: "32px",
+            6: "48px",
+        },
+        colors: {
+            bg: "#111111",
+            bgHover: "#333333",
+            bgHoverLight: "#333333",
+            bgLine: "#1a1a1a",
+            bgLineStrong: "#222222",
+            button: "#333333",
+            buttonHover: "#555555",
+            fg: "#ffffff",
+            fgFaded: "#aaaaaa",
+        },
+        fontSizes: {
+            sm: "12px",
+            md: "14px",
+            lg: "18px",
+            xl: "24px",
+        },
+        fonts: {
+            body: '"Roboto", Helvetica, sans-serif',
+            mono: '"Roboto Mono", Menlo, monospace',
+        },
+        radii: {
+            sm: "4px",
+            md: "8px",
+            lg: "16px",
+        },
+        transitions: {
+            default: "0.2s ease",
+        },
+    },
+    prefix: "eddev",
+}), _a.styled), exports.css = _a.css;

package/entry/Root.d.ts

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

package/entry/Root.js

@@ -35,12 +35,24 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var views_1 = __importStar(require("@manifest/views"));
 var react_1 = require("react");
 var routing_1 = require("../routing");
+var loader_1 = require("../dev-ui/loader");
+var next_1 = require("@trpc/next");
 function Root() {
     var route = (0, routing_1.useRoute)();
-    return ((0, jsx_runtime_1.jsx)(react_1.Fragment, { children: (0, jsx_runtime_1.jsx)(views_1.App, { children: (0, jsx_runtime_1.jsx)(routing_1.Switch, { children: Object.entries(views_1.default).map(function (_a) {
-                    var _b, _c;
-                    var name = _a[0], Component = _a[1];
-                    return ((0, jsx_runtime_1.jsx)(routing_1.Route, __assign({ match: function (route) { var _a; return ((_a = route.data) === null || _a === void 0 ? void 0 : _a.view) === name; } }, { children: (0, jsx_runtime_1.jsx)(Component, __assign({}, (_c = (_b = route.data) === null || _b === void 0 ? void 0 : _b.viewData) === null || _c === void 0 ? void 0 : _c.data), void 0) }), name));
-                }) }, void 0) }, void 0) }, void 0));
+    return ((0, jsx_runtime_1.jsxs)(react_1.Fragment, { children: [process.devUI && (0, jsx_runtime_1.jsx)(loader_1.DevUILoader, {}, void 0), (0, jsx_runtime_1.jsx)(views_1.App, { children: (0, jsx_runtime_1.jsx)(routing_1.Switch, { children: Object.entries(views_1.default).map(function (_a) {
+                        var _b, _c;
+                        var name = _a[0], Component = _a[1];
+                        return ((0, jsx_runtime_1.jsx)(routing_1.Route, __assign({ match: function (route) { var _a; return ((_a = route.data) === null || _a === void 0 ? void 0 : _a.view) === name; } }, { children: (0, jsx_runtime_1.jsx)(Component, __assign({}, (_c = (_b = route.data) === null || _b === void 0 ? void 0 : _b.viewData) === null || _c === void 0 ? void 0 : _c.data), void 0) }), name));
+                    }) }, void 0) }, void 0)] }, void 0));
 }
-exports.default = Root;
+exports.default = process.rpcEnabled
+    ? (0, next_1.withTRPC)({
+        config: function (_a) {
+            var ctx = _a.ctx;
+            return {
+                url: process.serverlessEndpoint + "api/trpc",
+            };
+        },
+        ssr: false,
+    })(Root)
+    : Root;

package/hooks/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./usePageLoad";
 export * from "./useAppData";
+export * from "./useRPC";

package/hooks/index.js

@@ -12,3 +12,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./usePageLoad"), exports);
 __exportStar(require("./useAppData"), exports);
+__exportStar(require("./useRPC"), exports);

package/{serverless/create-rpc-client.d.ts → hooks/useRPC.d.ts}

@@ -1,6 +1,8 @@
-export declare function createRPCClient(): {
+/// <reference types="react" />
+import { TRPCClientError } from "@trpc/client";
+declare const trpc: {
     Provider: ({ client, queryClient, children, isPrepass, ssrContext, }: {
-        queryClient: QueryClient;
+        queryClient: import("react-query").QueryClient;
         client: import("@trpc/react").TRPCClient<import("@trpc/server").AnyRouter<any>>;
         children: import("react").ReactNode;
         isPrepass?: boolean | undefined;
@@ -8,25 +10,23 @@ export declare function createRPCClient(): {
     }) => 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) => UseQueryResult<{ [TPath_1 in keyof TRouter["_def"]["queries"]]: {
-        input: import("@trpc/server").inferProcedureInput<TRouter["_def"]["queries"][TPath_1]>;
-        output: import("@trpc/server").ThenArg<ReturnType<TRouter["_def"]["queries"][TPath_1]["call"]>>;
-    }; }[TPath_2]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>>;
-    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) => UseMutationResult<{ [TPath_3 in keyof TRouter["_def"]["mutations"]]: {
-        input: import("@trpc/server").inferProcedureInput<TRouter["_def"]["mutations"][TPath_3]>;
-        output: import("@trpc/server").ThenArg<ReturnType<TRouter["_def"]["mutations"][TPath_3]["call"]>>;
-    }; }[TPath_1_1]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>, { [TPath_3 in keyof TRouter["_def"]["mutations"]]: {
-        input: import("@trpc/server").inferProcedureInput<TRouter["_def"]["mutations"][TPath_3]>;
-        output: import("@trpc/server").ThenArg<ReturnType<TRouter["_def"]["mutations"][TPath_3]["call"]>>;
-    }; }[TPath_1_1]["input"], 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: any) => any;
-    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) => UseInfiniteQueryResult<{ [TPath_1 in keyof TRouter["_def"]["queries"]]: {
-        input: import("@trpc/server").inferProcedureInput<TRouter["_def"]["queries"][TPath_1]>;
-        output: import("@trpc/server").ThenArg<ReturnType<TRouter["_def"]["queries"][TPath_1]["call"]>>;
-    }; }[TPath_3_1]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>>;
+    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>>>;
 };
+export declare const useRPCQuery: RPCUseQuery;
+export declare const useRPCMutation: RPCUseMutation;
+export declare const useRPCInfiniteQuery: RPCUseInfiniteQuery;
+export declare const rpcClient: RPCClient;
+export declare type UseRPCMutationResult = ReturnType<typeof trpc.useMutation>;
+export declare type UseRPCQueryResult = ReturnType<typeof trpc.useQuery>;
+export declare type UseRPCInfiniteQueryResult = ReturnType<typeof trpc.useInfiniteQuery>;
+export declare const RPCClientError: typeof TRPCClientError;
+export declare type RPCClientError = InstanceType<typeof TRPCClientError>;
+export {};

package/hooks/useRPC.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RPCClientError = exports.rpcClient = exports.useRPCInfiniteQuery = exports.useRPCMutation = exports.useRPCQuery = void 0;
+var react_1 = require("@trpc/react");
+var client_1 = require("@trpc/client");
+var trpc = (0, react_1.createReactQueryHooks)();
+// @ts-ignore
+exports.useRPCQuery = trpc.useQuery;
+// @ts-ignore
+exports.useRPCMutation = trpc.useMutation;
+// @ts-ignore
+exports.useRPCInfiniteQuery = trpc.useInfiniteQuery;
+exports.rpcClient = trpc.createClient({
+    // @ts-ignore
+    url: process.serverlessEndpoint.replace(/\/$/, "") + "/api/trpc",
+    // @ts-ignore
+});
+exports.RPCClientError = client_1.TRPCClientError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.0-beta.9",
+  "version": "0.2.1",
   "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.0.10",
+    "next": "^12.1.0",
     "react-html-props": "^1.0.32"
   },
   "dependencies": {
@@ -37,7 +37,6 @@
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/traverse": "^7.15.4",
-    "@boost/log": "^3.0.0",
     "@graphql-codegen/cli": "^2.2.0",
     "@graphql-codegen/core": "^2.1.0",
     "@graphql-codegen/typescript": "^2.2.1",
@@ -51,39 +50,44 @@
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
     "@stitches/core": "^1.2.6",
     "@stitches/react": "^1.2.6",
+    "@trpc/client": "^9.19.0",
+    "@trpc/next": "^9.19.0",
+    "@trpc/react": "^9.19.0",
+    "@trpc/server": "^9.19.0",
     "autoprefixer": "^10.3.4",
     "babel-loader": "^8.2.2",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
     "chokidar": "^3.5.2",
     "commander": "^8.1.0",
+    "compare-versions": "^4.1.3",
     "cross-fetch": "^3.1.4",
     "css-loader": "^6.2.0",
     "dotenv": "^10.0.0",
     "error-overlay-webpack-plugin": "^1.0.0",
     "error-stack-parser": "^2.0.6",
-    "execa": "^6.0.0",
     "friendly-errors-webpack-plugin": "^1.7.0",
     "fs-extra": "^10.0.0",
     "git-repo-name": "^1.0.1",
     "glob": "^7.1.7",
     "glob-promise": "^4.2.0",
     "graphql": "^15.5.3",
-    "history": "^5.0.1",
+    "immer": "^9.0.12",
     "ink": "^3.2.0",
     "inquirer": "^8.1.2",
     "mini-css-extract-plugin": "^2.2.2",
     "next-transpile-modules": "^9.0.0",
     "postcss-loader": "^6.1.1",
     "qs": "^6.10.1",
-    "react-dev-utils": "^12.0.0-next.37",
     "react-error-overlay": "^6.0.9",
     "react-inspector": "^5.1.1",
     "react-merge-refs": "^1.1.0",
+    "react-query": "^3.34.16",
     "react-refresh": "^0.10.0",
     "rimraf": "^3.0.2",
     "swr": "^1.0.1",
-    "typescript": "^4.4.2",
+    "to-icon": "^1.1.4",
+    "typescript": "^4.5.5",
     "url-parse": "^1.5.3",
     "webpack": "^5.52.0",
     "webpack-bundle-analyzer": "^4.5.0",
@@ -95,6 +99,10 @@
     "zustand": "^3.5.10"
   },
   "peerDependencies": {
+    "@trpc/client": "^9.19.0",
+    "@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"
   }

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({}, props, { href: undefined }), void 0) }), void 0));
+        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));
     }
     var localRef = (0, react_1.useRef)();
     var router = (0, react_1.useContext)(RouterContext);

package/serverless/define-rpc-router.d.ts

@@ -1,2 +1,6 @@
 import * as trpc from "@trpc/server";
-export declare function defineRPC<TContext>(): import("@trpc/server/dist/declarations/src/router").Router<TContext, TContext, {}, {}, {}, trpc.DefaultErrorShape>;
+import * as trpcNext from "@trpc/server/adapters/next";
+declare const createRouter: () => import("@trpc/server/dist/declarations/src/router").Router<RPCContextType, RPCContextType, {}, {}, {}, trpc.DefaultErrorShape>;
+export declare function defineRPC<TCreator extends (base: ReturnType<typeof createRouter>, z: typeof import("zod")) => any>(creator: TCreator): ReturnType<TCreator>;
+export declare function defineRPCContextCreator<TCreator extends (opts: trpcNext.CreateNextContextOptions) => any>(creator: TCreator): TCreator;
+export {};

package/serverless/define-rpc-router.js

@@ -19,9 +19,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineRPC = void 0;
+exports.defineRPCContextCreator = exports.defineRPC = void 0;
 var trpc = __importStar(require("@trpc/server"));
-function defineRPC() {
-    return trpc.router();
+var z = __importStar(require("zod"));
+// @ts-ignore
+var createRouter = function () { return trpc.router(); };
+// @ts-ignore
+function defineRPC(creator) {
+    return creator(trpc.router(), z);
 }
 exports.defineRPC = defineRPC;
+function defineRPCContextCreator(creator) {
+    return creator;
+}
+exports.defineRPCContextCreator = defineRPCContextCreator;

package/serverless/index.d.ts

@@ -1,4 +1,5 @@
+import { TRPCError } from "@trpc/server";
 export * from "./define-api";
 export * from "./define-rpc-router";
-export * from "./create-rpc-client";
 export * from "./error-codes";
+export declare const RPCError: typeof TRPCError;

package/serverless/index.js

@@ -10,7 +10,9 @@ 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 });
+exports.RPCError = void 0;
+var server_1 = require("@trpc/server");
 __exportStar(require("./define-api"), exports);
 __exportStar(require("./define-rpc-router"), exports);
-__exportStar(require("./create-rpc-client"), exports);
 __exportStar(require("./error-codes"), exports);
+exports.RPCError = server_1.TRPCError;

package/serverless-template/_utils/PageMeta.tsx

@@ -0,0 +1,44 @@
+import { ParsedRouteTags } from "eddev/routing/remoteProps"
+import Head from "next/head"
+import { Fragment } from "react"
+
+type Props = ParsedRouteTags
+
+export function PageMeta(props: Props) {
+  return (
+    <Head>
+      {props.title?.map((tag, i) => (
+        <title key={"title" + i}>{tag.__code}</title>
+      ))}
+      {/* {props.style?.map((tag, i) => {
+        return (
+          <style
+            key={"style" + i}
+            className={tag["class"]}
+            type={tag.type}
+            id={tag.id}
+            dangerouslySetInnerHTML={{ __html: tag.__code }}
+          />
+        )
+      })}
+      {props.script?.map((tag, i) => {
+        return (
+          <script
+            key={"script" + i}
+            className={tag["class"]}
+            type={tag.type}
+            id={tag.id}
+            dangerouslySetInnerHTML={{ __html: tag.__code }}
+          />
+        )
+      })} */}
+      {props.meta?.map((tag, i) => {
+        return <meta key={"meta" + i} {...tag} />
+      })}
+      {props.link?.map((tag, i) => {
+        if (tag.rel === "stylesheet") return <Fragment key={"link" + i} />
+        return <link key={"link" + i} {...tag} />
+      })}
+    </Head>
+  )
+}

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

@@ -1,17 +1,23 @@
 import config from "./ed-config"
+import { fetchWP } from "./fetch-wp"
 
 const settings = config.serverless
 
 export async function fetchWordpressProps(pathname: string) {
+  // Determine the URL for fetching
   const origin = (process.env.SITE_URL as string).replace(/\/$/, "")
   pathname = pathname.replace(/(^\/|\/$)/g, "")
   const propsURL = origin + ("/" + pathname + "/?_props=all").replace(/\/+/, "/")
-  let response = await fetch(propsURL)
+
+  // Make the request
+  let response = await fetchWP(propsURL, {})
+
+  // Convert to text, rather than JSON — so we can do find-and-replace
   let text = await response.text()
 
   // Convert absolute site URL details to relative paths
   text = text.replace(new RegExp(origin.replace(/(http|https)/, `https?`) + "([a-z0-9-_./]+)", "g"), (url) => {
-    const path = url.replace(/https?:\/\/[a-z0-9\-\_\.]+/, "")
+    const path = url.replace(/https?:\/\/[^\/]+/, "")
     if (path.startsWith("/wp-content/uploads/")) {
       if (settings?.uploads === "proxy") {
         return path
@@ -30,9 +36,14 @@ export async function fetchWordpressProps(pathname: string) {
       } else if (settings?.uploads === "remote") {
         return url
       }
+    } else {
+      return path
     }
     return url
   })
 
-  return JSON.parse(text)
+  return {
+    status: response.status,
+    data: JSON.parse(text),
+  }
 }

package/serverless-template/_utils/fetch-wp.ts

@@ -0,0 +1,16 @@
+import { Agent } from "https"
+
+// Used to allow self-signed certificates
+const agent = new Agent({
+  rejectUnauthorized: false,
+})
+
+export const fetchWP: typeof fetch = async (url, opts) => {
+  // TODO — basic auth via env variable
+  // https://stackoverflow.com/questions/43842793/basic-authentication-with-fetch
+  return fetch(url, {
+    ...opts,
+    // @ts-ignore
+    agent: url.includes("https") ? agent : undefined,
+  })
+}

package/serverless-template/global.d.ts

@@ -1,9 +1,15 @@
 declare global {
   namespace NodeJS {
     interface Process {
-      browser: boolean
+      client: boolean
       serverless: boolean
       dev: boolean
+      devUI: boolean
     }
   }
 }
+
+module "@manifest/views" {
+  export default any
+  export const App: any
+}