eddev 0.2.0-beta.43 → 0.2.0-beta.46

package/build/get-webpack-config.js

@@ -323,6 +323,7 @@ function getWebpackConfig(opts) {
                     }
                     // Define some values
                     DEFINES["process.browser"] = JSON.stringify(isBrowser);
+                    DEFINES["process.client"] = JSON.stringify(isBrowser);
                     DEFINES["process.serverless"] = "false";
                     DEFINES["process.ssr"] = JSON.stringify(isServerless && !isBrowser);
                     DEFINES["process.LOADABLE_STATS_FILE"] = JSON.stringify(loadableManifestFile);

package/build/workers/codegen-worker-script.js

@@ -164,7 +164,7 @@ function beginWork(opts) {
                 });
             }); };
             // Create RPC/API types
-            (0, promises_1.writeFile)(Path.join(opts.baseDirectory, "types.api.ts"), "\n    import type { router, createContext } from \"./apis/_rpc\"\n    import { createReactQueryHooks } from \"@trpc/react\"\n    export {}\n    \n    const createQueryHooks = () => createReactQueryHooks<typeof router>()\n    \n    declare global {\n      type RPCUse = ReturnType<typeof createQueryHooks>\n      type RPCRouter = typeof router\n      type RPCContextType = Awaited<ReturnType<typeof createContext>>\n      type RPCClient = ReturnType<RPCUse[\"createClient\"]>\n      type RPCUseQuery = RPCUse[\"useQuery\"]\n      type RPCUseMutation = RPCUse[\"useMutation\"]\n      type RPCUseInfiniteQuery = RPCUse[\"useInfiniteQuery\"]\n    }    \n  ");
+            (0, promises_1.writeFile)(Path.join(opts.baseDirectory, "types.api.ts"), "\n    import type { router, createContext } from \"./apis/_rpc\"\n    import { createReactQueryHooks } from \"@trpc/react\"\n    export {}\n    \n    const createQueryHooks = () => createReactQueryHooks<typeof router>()\n    \n    declare global {\n      type RPCUse = ReturnType<typeof createQueryHooks>\n      type RPCRouter = typeof router\n      type RPCContextType = Awaited<ReturnType<typeof createContext>>\n      type RPCClient = ReturnType<RPCUse[\"createClient\"]>\n      type RPCUseQuery = RPCUse[\"useQuery\"]\n      type RPCUseMutation = RPCUse[\"useMutation\"]\n      type RPCUseInfiniteQuery = RPCUse[\"useInfiniteQuery\"]\n    }\n\n    declare global {\n      namespace NodeJS {\n        interface Process {\n          // @ts-ignore\n          browser: boolean\n          dev: boolean\n          admin: boolean\n          serverless: boolean\n        }\n      }\n    }\n    \n  ");
             regenerate = debounce(100, function () { return __awaiter(_this, void 0, void 0, function () {
                 var startTime, hasChanged, err_1, documentSets, parseErrors, _loop_1, _a, _b, _i, key, generates, errors, _c, _d, _e, file, base, config, output, err_2;
                 var _this = this;

package/components/NextRouter.js

@@ -17,8 +17,9 @@ var routing_1 = require("../routing");
 var router_1 = require("next/router");
 function NextRouter(_a) {
     var children = _a.children, path = _a.path, data = _a.data;
-    var route = (0, router_1.useRouter)();
-    return ((0, jsx_runtime_1.jsx)(routing_1.RouterRoot, __assign({ url: path, data: data, onNavigateRequest: function (url) {
+    var nextRoute = (0, router_1.useRouter)();
+    var route = __assign(__assign({}, nextRoute), { pathname: nextRoute.asPath });
+    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 })
         }, onPreload: function (url) {

package/hooks/useRPC.js

@@ -11,6 +11,6 @@ exports.useRPCMutation = trpc.useQuery;
 exports.useRPCMutation = trpc.useInfiniteQuery;
 exports.rpcClient = trpc.createClient({
     // @ts-ignore
-    url: process.serverlessEndpoint + "/api/trpc",
+    url: process.serverlessEndpoint.replace(/\/$/, "") + "/api/trpc",
     // @ts-ignore
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.0-beta.43",
+  "version": "0.2.0-beta.46",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

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/index.d.ts

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

package/serverless/index.js

@@ -10,6 +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("./error-codes"), exports);
+exports.RPCError = server_1.TRPCError;

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

@@ -9,8 +9,6 @@ export async function fetchWordpressProps(pathname: string) {
   pathname = pathname.replace(/(^\/|\/$)/g, "")
   const propsURL = origin + ("/" + pathname + "/?_props=all").replace(/\/+/, "/")
 
-  console.log("Fetching props", propsURL)
-
   // Make the request
   let response = await fetchWP(propsURL, {})
 
@@ -20,7 +18,6 @@ export async function fetchWordpressProps(pathname: string) {
   // 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?:\/\/[^\/]+/, "")
-    console.log("URL", url, path)
     if (path.startsWith("/wp-content/uploads/")) {
       if (settings?.uploads === "proxy") {
         return path

package/serverless-template/next.config.js

@@ -50,6 +50,7 @@ module.exports = (() => {
       const define = config.plugins.find((plugin) => plugin instanceof DefinePlugin)
       define.definitions["process.serverless"] = "true"
       define.definitions["process.admin"] = "false"
+      define.definitions["process.client"] = isServer ? "false" : "true"
       define.definitions["process.dev"] = process.env.NODE_ENV === "development"
 
       const themePath =

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

@@ -1,3 +1,5 @@
+import { fetchWP } from "../../../_utils/fetch-wp"
+
 const validProxyPaths = {
   "form-submit": {
     path: "/wp-json/ed/v1/gf/submit",
@@ -25,7 +27,7 @@ export default async function (req: any, res: any) {
 
   const finalPath = proxyPath.path.replace("*", req.query.method.slice(1).join("/"))
 
-  const response = await fetch(process.env.SITE_URL + finalPath, {
+  const response = await fetchWP(process.env.SITE_URL + finalPath, {
     method: proxyPath.method,
     headers: {
       "Content-Type": "application/json",