eddev 0.2.0-beta.0 → 0.2.0-beta.12

package/serverless/define-api.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineAPI = void 0;
+// import { ZodSchema, z, AnyZodObject, ZodError } from "zod"
+// import { RESTErrorCodes } from "./error-codes"
+function defineAPI(handler) {
+    return handler;
+}
+exports.defineAPI = defineAPI;
+// type RESTAPIRequest<
+//   TQuery extends ZodSchema<any> | undefined,
+//   TBody extends ZodSchema<any> | undefined
+// > = NextApiRequest & {
+//   query: TQuery extends AnyZodObject ? z.infer<TQuery> : NextApiRequest["query"]
+//   body: TBody extends AnyZodObject ? z.infer<TBody> : NextApiRequest["body"]
+// }
+// type RESTAPIResponse = NextApiResponse & {
+//   error(type: keyof typeof RESTErrorCodes, message: string, data: any): void
+// }
+// type AnyRESTAPIRequest = RESTAPIRequest<any, any>
+// const CacheKeyGenerators = {
+//   url: (req: AnyRESTAPIRequest) => req.url,
+//   query: (req: AnyRESTAPIRequest) => req.url + "." + JSON.stringify(req.query),
+// }
+// type RESTOptions<TResult, TQuery extends ZodSchema<any> | undefined, TBody extends ZodSchema<any> | undefined> = {
+//   method: "get" | "post" | "put" | "delete" | "patch"
+//   cacheKey?: keyof typeof CacheKeyGenerators
+//   cacheTime?: number
+//   querystring?: TQuery
+//   handle(req: RESTAPIRequest<TQuery, TBody>, res: RESTAPIResponse): void
+// }
+// function stringifyZodError(err: ZodError) {
+//   return err.toString()
+// }
+// export function defineRESTAPI<
+//   TResult,
+//   TQuery extends ZodSchema<any> | undefined,
+//   TBody extends ZodSchema<any> | undefined
+// >(opts: RESTOptions<TResult, TQuery, TBody>) {
+//   return (_req: NextApiRequest, _res: NextApiResponse) => {
+//     // Standard function for error codes/messages
+//     const sendError = (type: keyof typeof RESTErrorCodes, message: string, details?: any) => {
+//       _res.status(RESTErrorCodes[type] || 500)
+//       _res.json({
+//         error: true,
+//         message,
+//         details,
+//       })
+//     }
+//     // Ensure the correct method
+//     if (_req.method?.toLowerCase() !== opts.method) {
+//       return sendError("invalidverb", `Invalid verb: ${_req.method}`)
+//     }
+//     // Validate the querystring
+//     try {
+//       _req.query = opts.querystring ? (opts.querystring.safeParse(_req.query) as any) : _req.query
+//     } catch (err) {
+//       if (err instanceof ZodError) {
+//         return sendError("querystring", stringifyZodError(err), _req.query)
+//       } else {
+//         return sendError("querystring", err instanceof Error ? err.message : String(err))
+//       }
+//     }
+//     opts.handle(req, res)
+//   }
+// }

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

@@ -0,0 +1,2 @@
+import * as trpc from "@trpc/server";
+export declare function defineRPC<TContext>(): import("@trpc/server/dist/declarations/src/router").Router<TContext, TContext, {}, {}, {}, trpc.DefaultErrorShape>;

package/serverless/define-rpc-router.js

@@ -0,0 +1,27 @@
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineRPC = void 0;
+var trpc = __importStar(require("@trpc/server"));
+function defineRPC() {
+    return trpc.router();
+}
+exports.defineRPC = defineRPC;

package/serverless/error-codes.d.ts

@@ -0,0 +1,2 @@
+declare const _default: {};
+export default _default;

package/serverless/error-codes.js

@@ -0,0 +1,14 @@
+"use strict";
+// export const RESTErrorCodes = {
+//   notfound: 404,
+//   badrequest: 400,
+//   unauthorized: 401,
+//   forbidden: 403,
+//   invalidverb: 400,
+//   querystring: 400,
+//   body: 400,
+//   params: 400,
+//   internal: 500,
+// }
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {};

package/serverless/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./define-api";
+export * from "./define-rpc-router";
+export * from "./create-rpc-client";
+export * from "./error-codes";

package/serverless/index.js

@@ -0,0 +1,16 @@
+"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("./define-api"), exports);
+__exportStar(require("./define-rpc-router"), exports);
+__exportStar(require("./create-rpc-client"), exports);
+__exportStar(require("./error-codes"), exports);

package/serverless/rpc-provider.d.ts

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

package/serverless/rpc-provider.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RPCProvider = void 0;
+function RPCProvider() { }
+exports.RPCProvider = RPCProvider;

package/serverless-template/_utils/ed-config.ts

@@ -0,0 +1,5 @@
+// @ts-ignore
+const settings = require("../ed.config.json")
+import { EDConfig } from "eddev/config"
+
+export default settings as EDConfig

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

@@ -0,0 +1,39 @@
+import config from "./ed-config"
+
+const settings = config.serverless
+
+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", propsURL)
+  let response = await fetch(propsURL)
+  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\-\_\.]+/, "")
+    if (path.startsWith("/wp-content/uploads/")) {
+      if (settings?.uploads === "proxy") {
+        return path
+      } else if (settings?.uploads === "remote") {
+        return url
+      }
+    } else if (path.startsWith("/wp-content/themes/")) {
+      if (settings?.uploads === "proxy") {
+        return path
+      } else if (settings?.uploads === "remote") {
+        return url
+      }
+    } else if (path.startsWith("/wp-content/plugins/")) {
+      if (settings?.uploads === "proxy") {
+        return path
+      } else if (settings?.uploads === "remote") {
+        return url
+      }
+    }
+    return url
+  })
+
+  return JSON.parse(text)
+}

package/serverless-template/next.config.js

@@ -1,48 +1,69 @@
 const withTM = require("next-transpile-modules")
 const { resolve } = require("path")
 const { DefinePlugin } = require("webpack")
+const settings = require("./ed.config.json")
+const { getRepoName } = require("eddev/utils/getRepoName")
 
-// console.log("PATH", process.cwd().replace(/\.serverless/, ""))
+module.exports = (() => {
+  const cwd = process.cwd()
+  const REPO_NAME = getRepoName(cwd.replace(/\/\.serverless/, "")).repoName
 
-module.exports = {}
+  return withTM(["eddev"])({
+    rewrites() {
+      return {
+        afterFiles: [
+          settings.serverless.uploads === "proxy" && {
+            source: "/wp-content/uploads/:path*",
+            destination: process.env.SITE_URL + "/wp-content/uploads/:path*",
+          },
+          settings.serverless.plugin === "proxy" && {
+            source: "/wp-content/plugins/:path*",
+            destination: process.env.SITE_URL + "/wp-content/plugins/:path*",
+          },
+          settings.serverless.theme === "proxy" && {
+            source: "/wp-content/themes/:path*",
+            destination: process.env.SITE_URL + "/wp-content/themes/:path*",
+          },
+        ].filter(Boolean),
+      }
+    },
+    typescript: {
+      ignoreBuildErrors: true,
+    },
+    webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
+      config.resolve.alias = {
+        ...config.resolve.alias,
+        "@manifest/views": resolve(cwd, "manifest_views.ts"),
+        "@manifest/blocks": resolve(cwd, "manifest_blocks.ts"),
+        "@theme": resolve(cwd, "theme.css.tsx"),
+        "@wordpress/components": resolve(cwd, "null.ts"),
+        "@wordpress/element": resolve(cwd, "null.ts"),
+        "@wordpress/blocks": resolve(cwd, "null.ts"),
+        "@wordpress/utils": resolve(cwd, "null.ts"),
+        "@wordpress/data": resolve(cwd, "null.ts"),
+        "@wordpress/hooks": resolve(cwd, "null.ts"),
+        "@wordpress/block-editor": resolve(cwd, "null.ts"),
+      }
+      // config.defines["process.dev"] = isDev ? "true" : "false"
+      const define = config.plugins.find((plugin) => plugin instanceof DefinePlugin)
+      define.definitions["process.serverless"] = "true"
+      define.definitions["process.admin"] = "false"
+      define.definitions["process.dev"] = process.env.NODE_ENV === "development"
 
-module.exports = withTM(["eddev"])({
-  typescript: {
-    ignoreBuildErrors: true,
-  },
-  webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
-    const cwd = process.cwd()
-    console.log(resolve(cwd, "manifest_blocks.ts"))
-    config.resolve.alias = {
-      ...config.resolve.alias,
-      "@manifest/views": resolve(cwd, "manifest_views.ts"),
-      "@manifest/blocks": resolve(cwd, "manifest_blocks.ts"),
-      // "@components/*": resolve(cwd, "components/*"),
-      // "@views/*": resolve(cwd, "views/*"),
-      // "@hooks/*": resolve(cwd, "hooks/*"),
-      // "@queries/*": resolve(cwd, "hooks/queries/*"),
-      "@theme": resolve(cwd, "theme.css.tsx"),
-      "@wordpress/components": resolve(cwd, "null.ts"),
-      "@wordpress/element": resolve(cwd, "null.ts"),
-      "@wordpress/blocks": resolve(cwd, "null.ts"),
-      "@wordpress/utils": resolve(cwd, "null.ts"),
-      "@wordpress/data": resolve(cwd, "null.ts"),
-      "@wordpress/hooks": resolve(cwd, "null.ts"),
-      "@wordpress/block-editor": resolve(cwd, "null.ts"),
-    }
-    // config.defines["process.dev"] = isDev ? "true" : "false"
-    const define = config.plugins.find((plugin) => plugin instanceof DefinePlugin)
-    define.definitions["process.serverless"] = "true"
-    define.definitions["process.admin"] = "false"
-    define.definitions["process.dev"] = process.env.NODE_ENV === "development"
-    // config.plugins.push(
-    //   new DefinePlugin({
-    //     "process.serverless": "true",
-    //     "process.admin": "false",
-    //     // "process.env.themePath": JSON.stringify(`/wp-content/themes/${opts.themeName}`),
-    //     // "process.themePath": JSON.stringify(`/wp-content/themes/${opts.themeName}`),
-    //   })
-    // )
-    return config
-  },
-})
+      const themePath =
+        (settings.serverless.theme === "remote" ? process.env.SITE_URL : "") + "/wp-content/themes/" + REPO_NAME
+
+      define.definitions["process.env.themePath"] = JSON.stringify(themePath)
+      define.definitions["process.themePath"] = JSON.stringify(themePath)
+      // config.plugins.push(
+      //   new DefinePlugin({
+      //     "process.serverless": "true",
+      //     "process.admin": "false",
+      //     // "process.env.themePath": JSON.stringify(`/wp-content/themes/${opts.themeName}`),
+      //     // "process.themePath": JSON.stringify(`/wp-content/themes/${opts.themeName}`),
+      //   })
+      // )
+      return config
+    },
+  })
+})()

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

@@ -1,20 +1,19 @@
+import { GetStaticPathsResult, GetStaticPropsContext, GetStaticPropsResult } from "next"
+import { fetchWordpressProps } from "../_utils/fetch-wordpress-props"
+
 export default function Home(props: any) {
   return <div>{JSON.stringify(props)}</div>
 }
 
-export async function getStaticPaths() {
+export async function getStaticPaths(): Promise<GetStaticPathsResult> {
   return {
-    // paths: [{ params: { slug: ["tees"] } }],
     paths: [],
     fallback: true,
   }
 }
 
-export async function getStaticProps({ params }: any) {
-  console.log("Params", params, process.env.SITE_URL + "/" + params.slug.join("/") + "/?_props=all")
-  const response = await fetch(process.env.SITE_URL + "/" + params.slug.join("/") + "/?_props=all")
-  const result = await response.json()
-  console.log("Result is", result)
+export async function getStaticProps({ params }: GetStaticPropsContext): Promise<GetStaticPropsResult<any>> {
+  const result = await fetchWordpressProps((params?.slug as string[]).join("/"))
   return {
     props: result,
   }

package/serverless-template/pages/_app.tsx

@@ -1,10 +1,10 @@
 import type { AppProps } from "next/app"
 import { App } from "@manifest/views"
 import manifest from "@manifest/views"
+import { NextRouter } from "eddev/components/NextRouter"
 import { ServerlessAppDataProvider } from "eddev/utils/serverlessAppContext"
 import { useMemo } from "react"
-
-console.log("FF", ServerlessAppDataProvider)
+import { useRouter } from "next/router"
 
 function MyApp({ Component, pageProps }: AppProps) {
   if (!pageProps.appData) return <div />
@@ -13,15 +13,19 @@ function MyApp({ Component, pageProps }: AppProps) {
     return pageProps.appData.data
   }, [])
 
+  const route = useRouter()
+
   const viewProps = pageProps?.viewData?.data
 
   const View = manifest[pageProps.view]
 
   return (
     <ServerlessAppDataProvider value={appData}>
-      <App>
-        <View {...viewProps} />
-      </App>
+      <NextRouter data={pageProps} path={route.pathname}>
+        <App>
+          <View {...viewProps} />
+        </App>
+      </NextRouter>
     </ServerlessAppDataProvider>
   )
 }

package/serverless-template/pages/_document.tsx

@@ -0,0 +1,19 @@
+import React from "react"
+import NextDocument, { Html, Head, Main, NextScript } from "next/document"
+import { getCssText } from "@theme"
+
+export default class Document extends NextDocument {
+  render() {
+    return (
+      <Html lang="en">
+        <Head>
+          <style id="stitches" dangerouslySetInnerHTML={{ __html: getCssText() }} />
+        </Head>
+        <body>
+          <Main />
+          <NextScript />
+        </body>
+      </Html>
+    )
+  }
+}

package/serverless-template/pages/index.tsx

@@ -1,10 +1,11 @@
+import { fetchWordpressProps } from "../_utils/fetch-wordpress-props"
+
 export default function Home() {
   return <div>Test</div>
 }
 
 export async function getStaticProps({ params }: any) {
-  const response = await fetch(process.env.SITE_URL + "/?_props=all")
-  const result = await response.json()
+  const result = await fetchWordpressProps("/")
   return {
     props: result,
   }

package/style/createStitches.d.ts

@@ -17,6 +17,12 @@ declare type TypographyConfig<Theme extends ConfigType.Theme<{}>, Media extends
         lineHeight?: ResponsiveValue<Media, Theme["lineHeights"] extends {} ? `$${Extract<keyof Theme["lineHeights"], string>}` | CSS["lineHeight"] : CSS["lineHeight"]>;
     };
 };
+declare type BreakpointArray = {
+    key: string;
+    min: string | null;
+    max: string | null;
+}[];
+export declare function parseBreakpoints(names: string[], medias: any): BreakpointArray;
 interface GridConfig<Theme extends ConfigType.Theme<{}>, Media extends ConfigType.Media<{}>> {
     columns: number;
     breakpoints: {
@@ -35,7 +41,41 @@ declare type ResponsiveScale<Media extends ConfigType.Media<{}>, T extends {}> =
 declare type ResponsiveConfig<Media extends ConfigType.Media<{}>, T extends {}> = {
     [Scale in keyof T]: ResponsiveScale<Media, T[Scale]>;
 };
-export declare function createStitches<Prefix extends string = "", Media extends {} = {}, Theme extends {} = {}, Responsive extends {} = {}, ThemeMap extends {} = DefaultThemeMap, Utils extends {} = {}, Typography extends {} = {}>(config: {
+declare type ResponsiveAtom = {
+    lerpStart: boolean;
+} & ({
+    type: "multiplier";
+    value: number;
+} | {
+    type: "px";
+    value: number;
+} | {
+    type: "number";
+    value: number;
+} | {
+    type: "unknown";
+    value: string | number;
+} | {
+    type: "undefined";
+});
+declare type ResponsiveAtomCalc = (ResponsiveAtom & {
+    defined: boolean;
+    breakpoint: string;
+    baseBreakpoint: string;
+    lerping?: {
+        fromBP: string | null;
+        toBP: string | null;
+        minMedia: number;
+        maxMedia: number;
+        minValue: number;
+        maxValue: number;
+    };
+    concreteValue: number | null;
+})[];
+export declare function parseResponsiveObject(breakpoints: ReturnType<typeof parseBreakpoints>, object: any): ResponsiveAtomCalc;
+export declare function getResponsiveObjectStyles(theme: any, breakpoints: ReturnType<typeof parseBreakpoints>, object: any, varName: string, scale?: string, unit?: string): any[];
+export declare function createStitches<Prefix extends string = "", Media extends {} = {}, Breakpoints extends (keyof Media)[] = [], Theme extends {} = {}, Responsive extends {} = {}, ThemeMap extends {} = DefaultThemeMap, Utils extends {} = {}, Typography extends {} = {}>(config: {
+    breakpoints: Breakpoints;
     prefix?: ConfigType.Prefix<Prefix>;
     media: ConfigType.Media<Media>;
     theme: ConfigType.Theme<Theme>;
@@ -54,12 +94,34 @@ export declare function createStitches<Prefix extends string = "", Media extends
     themeMap?: ConfigType.ThemeMap<ThemeMap>;
     utils: ConfigType.Utils<Utils>;
 }): {
+    originalConfig: {
+        breakpoints: Breakpoints;
+        prefix?: ConfigType.Prefix<Prefix> | undefined;
+        media: ConfigType.Media<Media>;
+        theme: ConfigType.Theme<Theme>;
+        responsive: ResponsiveConfig<Media & {
+            initial: string;
+            editor: string;
+        }, Responsive>;
+        typography: TypographyConfig<Theme, Media & {
+            initial: string;
+            editor: string;
+        }, Typography>;
+        grid: GridConfig<Theme, Media & {
+            initial: string;
+            editor: string;
+        }>;
+        themeMap?: ConfigType.ThemeMap<ThemeMap> | undefined;
+        utils: ConfigType.Utils<Utils>;
+    };
+    breakpoints: BreakpointArray;
     typeVariants: { [key in keyof TypographyConfig<Theme, Media & {
         initial: string;
         editor: string;
     }, Typography>]: any; };
     gridVariants: {};
     responsiveTokens: { [Scale in keyof Responsive]: { [T in keyof Responsive[Scale]]: number; }; };
+    responsiveGlobals: any;
     config: {
         prefix: "";
         media: {