eddev 0.2.32 → 0.2.34

package/build/get-webpack-config.js

@@ -130,7 +130,6 @@ function getWebpackConfig(opts) {
                     ALIAS["@components"] = path_1.default.join(opts.baseDirectory, "components");
                     ALIAS["@views"] = path_1.default.join(opts.baseDirectory, "views");
                     ALIAS["@hooks"] = path_1.default.join(opts.baseDirectory, "hooks");
-                    ALIAS["@lib"] = path_1.default.join(opts.baseDirectory, "lib");
                     ALIAS["@queries"] = path_1.default.join(opts.baseDirectory, "hooks/queries");
                     ALIAS["@utils"] = path_1.default.join(opts.baseDirectory, "utils");
                     RULES.push({

package/components/ServerlessRouter.js

@@ -0,0 +1 @@
+"use strict";

package/dev-ui/theme.d.ts

@@ -1,4 +1,5 @@
-export declare const styled: <Type extends import("@stitches/react/types/util").Function | keyof JSX.IntrinsicElements | import("react").ComponentType<any>, Composers extends (string | import("@stitches/react/types/util").Function | import("react").ComponentType<any> | {
+/// <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: {
@@ -41,7 +42,7 @@ export declare const styled: <Type extends import("@stitches/react/types/util").
     transitions: {
         default: string;
     };
-}, import("@stitches/react/types/config").DefaultThemeMap, {}>>(type: Type, ...composers: { [K in keyof Composers]: string extends Composers[K] ? Composers[K] : Composers[K] extends string | import("@stitches/react/types/util").Function | import("react").ComponentType<any> ? Composers[K] : import("@stitches/react/types/stitches").RemoveIndex<CSS> & {
+}, 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;
@@ -93,7 +94,7 @@ export declare const styled: <Type extends import("@stitches/react/types/util").
     transitions: {
         default: string;
     };
-}, import("@stitches/react/types/config").DefaultThemeMap, {}>>, css: <Composers extends (string | import("@stitches/react/types/util").Function | import("react").JSXElementConstructor<any> | import("react").ExoticComponent<any> | {
+}, 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: {
@@ -136,7 +137,7 @@ export declare const styled: <Type extends import("@stitches/react/types/util").
     transitions: {
         default: string;
     };
-}, import("@stitches/react/types/config").DefaultThemeMap, {}>>(...composers: { [K in keyof Composers]: string extends Composers[K] ? Composers[K] : Composers[K] extends string | import("@stitches/react/types/util").Function | import("react").JSXElementConstructor<any> | import("react").ExoticComponent<any> ? Composers[K] : import("@stitches/react/types/stitches").RemoveIndex<CSS> & {
+}, 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;

package/dynamic/dynamic-component.d.ts

@@ -1,3 +1,4 @@
+/// <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>;

package/entry/Root.d.ts

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

package/package.json

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

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

@@ -1,6 +1,6 @@
 import * as trpc from "@trpc/server";
 import * as trpcNext from "@trpc/server/adapters/next";
-declare const createRouter: () => import("@trpc/server/dist/declarations/src/router").Router<RPCContextType, RPCContextType, {}, {}, {}, {}, trpc.DefaultErrorShape>;
+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-template/next.config.js

@@ -15,11 +15,15 @@ module.exports = (() => {
         afterFiles: [
           {
             source: "/sitemap.xml",
-            destination: process.env.SITE_URL + "/sitemap.xml",
+            destination: "/api/sitemap/sitemap.xml",
           },
           {
             source: "/:path*-sitemap.xml",
-            destination: process.env.SITE_URL + "/:path*-sitemap.xml",
+            destination: "/api/sitemap/:path*-sitemap.xml",
+          },
+          {
+            source: "/sitemap_index.xml",
+            destination: "/api/sitemap/sitemap_index.xml",
           },
           settings.serverless.uploads === "proxy" && {
             source: "/wp-content/uploads/:path*",

package/serverless-template/pages/api/sitemap/[...sitemap].ts

@@ -0,0 +1,56 @@
+import config from "../../../_utils/ed-config"
+import type { NextApiRequest, NextApiResponse } from "next"
+import { fetchWP } from "../../../_utils/fetch-wp"
+
+const validProxyPaths = {
+  "form-submit": {
+    path: "/wp-json/ed/v1/gf/submit",
+    method: "POST",
+  },
+  query: {
+    path: "/wp-json/ed/v1/query/*",
+    method: "GET",
+  },
+  mutation: {
+    path: "/wp-json/ed/v1/mutation/*",
+    method: "POST",
+  },
+}
+
+export default async function (req: NextApiRequest, res: NextApiResponse) {
+  const name = req.query.sitemap[0] as string
+  if (name === "sitemap.xml") {
+    res.status(301).redirect("/sitemap_index.xml")
+    return
+  }
+
+  const response = await fetchWP(
+    process.env.SITE_URL + "/" + name,
+    {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    },
+    async (response) => ({
+      payload: await response.text(),
+      cacheFor: parseInt(response.headers.get("x-ed-cache-duration") || "") || 0,
+    })
+  )
+
+  let content = response.payload
+  content = content.replace(/<\?xml-stylesheet.+\?>/, "")
+  if (config.serverless?.endpoints) {
+    Object.entries(config.serverless?.endpoints).forEach(([endpoint, url]) => {
+      console.log(endpoint, url)
+      content = content.replaceAll("https://" + endpoint, "https://" + url)
+      content = content.replaceAll("http://" + endpoint, "https://" + url)
+      content = content.replaceAll(endpoint, url)
+    })
+  }
+
+  res.status(200)
+  res.setHeader("Content-Type", "text/xml; charset=UTF-8")
+  res.send(content)
+  res.end()
+}

package/style/createStitches.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DefaultThemeMap } from "@stitches/react";
 import { ConfigType } from "@stitches/core/types/config";
 import { Properties as CSS } from "csstype";
@@ -656,7 +657,7 @@ export declare function createStitches<Prefix extends string = "", Media extends
     } & { [Scale_4 in keyof (Theme & { [Scale_1 in keyof Responsive]: { [T_1 in keyof Responsive[Scale_1]]: string; }; })]: { [Token_2 in keyof (Theme & { [Scale_1 in keyof Responsive]: { [T_1 in keyof Responsive[Scale_1]]: string; }; })[Scale_4]]: import("@stitches/react/types/theme").Token<Extract<Token_2, string | number>, string, Extract<Scale_4, string | void>, "">; }; };
     reset: () => void;
     getCssText: () => string;
-    css: <Composers extends (string | import("@stitches/react/types/util").Function | import("react").JSXElementConstructor<any> | import("react").ExoticComponent<any> | {
+    css: <Composers extends (string | import("react").JSXElementConstructor<any> | import("react").ExoticComponent<any> | import("@stitches/react/types/util").Function | {
         [name: string]: unknown;
     })[], CSS_1 = import("@stitches/react/types/css-util").CSS<{
         initial: "";
@@ -779,7 +780,7 @@ export declare function createStitches<Prefix extends string = "", Media extends
             gridColumn: string;
             "--grid-columns": number;
         };
-    }>>(...composers: { [K_1 in keyof Composers]: string extends Composers[K_1] ? Composers[K_1] : Composers[K_1] extends string | import("@stitches/react/types/util").Function | import("react").JSXElementConstructor<any> | import("react").ExoticComponent<any> ? Composers[K_1] : import("@stitches/react/types/stitches").RemoveIndex<CSS_1> & {
+    }>>(...composers: { [K_1 in keyof Composers]: Composers[K_1] extends string | import("react").JSXElementConstructor<any> | import("react").ExoticComponent<any> | import("@stitches/react/types/util").Function ? Composers[K_1] : import("@stitches/react/types/stitches").RemoveIndex<CSS_1> & {
         variants?: {
             [x: string]: {
                 [x: string]: CSS_1;
@@ -793,7 +794,7 @@ export declare function createStitches<Prefix extends string = "", Media extends
     } & CSS_1 & { [K2 in keyof Composers[K_1]]: K2 extends "compoundVariants" | "defaultVariants" | "variants" ? unknown : K2 extends keyof CSS_1 ? CSS_1[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>, {
         initial: "";
     } & Media, CSS_1>;
-    styled: <Type extends import("@stitches/react/types/util").Function | keyof JSX.IntrinsicElements | import("react").ComponentType<any>, Composers_1 extends (string | import("@stitches/react/types/util").Function | import("react").ComponentType<any> | {
+    styled: <Type extends import("react").ComponentType<any> | keyof JSX.IntrinsicElements | import("@stitches/react/types/util").Function, Composers_1 extends (string | import("react").ComponentType<any> | import("@stitches/react/types/util").Function | {
         [name: string]: unknown;
     })[], CSS_2 = import("@stitches/react/types/css-util").CSS<{
         initial: "";
@@ -916,7 +917,7 @@ export declare function createStitches<Prefix extends string = "", Media extends
             gridColumn: string;
             "--grid-columns": number;
         };
-    }>>(type: Type, ...composers: { [K_2 in keyof Composers_1]: string extends Composers_1[K_2] ? Composers_1[K_2] : Composers_1[K_2] extends string | import("@stitches/react/types/util").Function | import("react").ComponentType<any> ? Composers_1[K_2] : import("@stitches/react/types/stitches").RemoveIndex<CSS_2> & {
+    }>>(type: Type, ...composers: { [K_2 in keyof Composers_1]: Composers_1[K_2] extends string | import("react").ComponentType<any> | import("@stitches/react/types/util").Function ? Composers_1[K_2] : import("@stitches/react/types/stitches").RemoveIndex<CSS_2> & {
         variants?: {
             [x: string]: {
                 [x: string]: CSS_2;

package/style/createStitches.js

@@ -274,8 +274,8 @@ function parseResponsiveObject(breakpoints, object) {
 }
 exports.parseResponsiveObject = parseResponsiveObject;
 function getResponsiveObjectStyles(breakpoints, object, varName, unit) {
-    var _a, _b, _c;
-    var _d;
+    var _a, _b;
+    var _c;
     if (unit === void 0) { unit = "px"; }
     // Prescale object
     object = __assign({}, object);
@@ -294,13 +294,8 @@ function getResponsiveObjectStyles(breakpoints, object, varName, unit) {
                 _b[varName] = atom.concreteValue + unit,
                 _b);
         }
-        else if (atom.defined) {
-            globals["@" + atom.breakpoint] = (_c = {},
-                _c[varName] = atom.value,
-                _c);
-        }
     }
-    return [globals, (_d = globals["@initial"]) === null || _d === void 0 ? void 0 : _d[varName]];
+    return [globals, (_c = globals["@initial"]) === null || _c === void 0 ? void 0 : _c[varName]];
 }
 exports.getResponsiveObjectStyles = getResponsiveObjectStyles;
 // parseResponsiveTokens({'@initial': blah, '@desktop': blah}, breakpoints, )