eddev 0.2.0-beta.45 → 0.2.0-beta.48

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/serverless/create-next-app.js

@@ -108,13 +108,18 @@ function createNextApp(opts) {
                 case 3:
                     // Copy the template folder
                     _b.sent();
-                    // Update package.json
-                    return [4 /*yield*/, updatePackagesFile((0, path_1.resolve)(__dirname, "../../serverless-template"), serverlessDirectory)];
+                    if (!isVercel) return [3 /*break*/, 5];
+                    return [4 /*yield*/, updatePackagesFile((0, path_1.resolve)(__dirname, "../../serverless-template"), opts.baseDirectory, opts.baseDirectory)];
                 case 4:
-                    // Update package.json
                     _b.sent();
+                    return [3 /*break*/, 7];
+                case 5: return [4 /*yield*/, updatePackagesFile((0, path_1.resolve)(__dirname, "../../serverless-template"), opts.baseDirectory, serverlessDirectory)];
+                case 6:
+                    _b.sent();
+                    _b.label = 7;
+                case 7:
                     assetPaths = ((_a = requireConfig(opts.baseDirectory).serverless) === null || _a === void 0 ? void 0 : _a.themeAssets) || [];
-                    if (!!isVercel) return [3 /*break*/, 11];
+                    if (!!isVercel) return [3 /*break*/, 14];
                     // Sync important files during development, as they change
                     return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory, [
                             "blocks/**/*",
@@ -133,50 +138,50 @@ function createNextApp(opts) {
                         ])
                         // Also sync APIs into the APIs folder
                     ];
-                case 5:
+                case 8:
                     // Sync important files during development, as they change
                     _b.sent();
                     // Also sync APIs into the APIs folder
                     return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "apis"), ["**/*.{tsx,ts,js,jsx}"])];
-                case 6:
+                case 9:
                     // Also sync APIs into the APIs folder
                     _b.sent();
                     return [4 /*yield*/, syncAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
                         // Sync the public folder
                     ];
-                case 7:
+                case 10:
                     _b.sent();
-                    if (!assetPaths.length) return [3 /*break*/, 9];
+                    if (!assetPaths.length) return [3 /*break*/, 12];
                     return [4 /*yield*/, syncFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
-                case 8:
+                case 11:
                     _b.sent();
-                    _b.label = 9;
-                case 9: 
+                    _b.label = 12;
+                case 12: 
                 // Sync favicon
                 return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory), (0, path_1.join)(serverlessDirectory, "public/"), ["favicon.ico"])];
-                case 10:
+                case 13:
                     // Sync favicon
                     _b.sent();
-                    return [3 /*break*/, 16];
-                case 11:
-                    if (!assetPaths.length) return [3 /*break*/, 13];
+                    return [3 /*break*/, 19];
+                case 14:
+                    if (!assetPaths.length) return [3 /*break*/, 16];
                     return [4 /*yield*/, copyFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
-                case 12:
+                case 15:
                     _b.sent();
-                    _b.label = 13;
-                case 13: 
+                    _b.label = 16;
+                case 16: 
                 // Sync favicon
                 return [4 /*yield*/, copyFiles((0, path_1.join)(opts.baseDirectory), (0, path_1.join)(serverlessDirectory, "public/"), ["favicon.ico"])
                     // Write APIs proxy code
                 ];
-                case 14:
+                case 17:
                     // Sync favicon
                     _b.sent();
                     // Write APIs proxy code
                     return [4 /*yield*/, writeAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
                         // Remove pages/api/trpc directory if no _rpc is found
                     ];
-                case 15:
+                case 18:
                     // Write APIs proxy code
                     _b.sent();
                     // Remove pages/api/trpc directory if no _rpc is found
@@ -188,28 +193,28 @@ function createNextApp(opts) {
                         !(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "apis/_rpc.ts"))) {
                         // removeSync(join(serverlessDirectory, "pages/api/trpc"))
                     }
-                    _b.label = 16;
-                case 16: 
+                    _b.label = 19;
+                case 19: 
                 // Create manifests
                 return [4 /*yield*/, initManifests(serverlessDirectory, opts.dev)
                     // Update packages
                 ];
-                case 17:
+                case 20:
                     // Create manifests
                     _b.sent();
-                    if (!!isVercel) return [3 /*break*/, 19];
+                    if (!!isVercel) return [3 /*break*/, 22];
                     sendSignal({ code: "packaging" });
                     return [4 /*yield*/, updatePackages(serverlessDirectory)];
-                case 18:
+                case 21:
                     _b.sent();
-                    _b.label = 19;
-                case 19:
+                    _b.label = 22;
+                case 22:
                     sendSignal({ code: "compiling" });
-                    if (!opts.dev) return [3 /*break*/, 22];
+                    if (!opts.dev) return [3 /*break*/, 25];
                     return [4 /*yield*/, getPort(3000)
                         // Write the endpoint URL to .env
                     ];
-                case 20:
+                case 23:
                     port = _b.sent();
                     // Write the endpoint URL to .env
                     (0, updateEnvFile_1.updateEnvFile)({
@@ -218,17 +223,17 @@ function createNextApp(opts) {
                     sendSignal({ code: "url", url: "http://127.0.0.1:".concat(port) });
                     // await devNext(serverlessDirectory, port)
                     return [4 /*yield*/, runScript(serverlessDirectory, ["dev", "--port", String(port)])];
-                case 21:
+                case 24:
                     // await devNext(serverlessDirectory, port)
                     _b.sent();
-                    return [3 /*break*/, 24];
-                case 22:
-                    if (!opts.build) return [3 /*break*/, 24];
+                    return [3 /*break*/, 27];
+                case 25:
+                    if (!opts.build) return [3 /*break*/, 27];
                     return [4 /*yield*/, runScript(serverlessDirectory, ["build"])];
-                case 23:
+                case 26:
                     _b.sent();
-                    _b.label = 24;
-                case 24: return [2 /*return*/];
+                    _b.label = 27;
+                case 27: return [2 /*return*/];
             }
         });
     });
@@ -298,16 +303,17 @@ function updatePackages(dir) {
         });
     });
 }
-function updatePackagesFile(sourceFolder, targetFolder) {
+function updatePackagesFile(templateFolder, appFolder, outDirectory) {
     return __awaiter(this, void 0, void 0, function () {
-        var sourcePackageFile, targetPackageFile, sourcePackage, targetPackage, mergedPackage;
+        var sourcePackageFile, targetPackageFile, outPackageFile, sourcePackage, targetPackage, mergedPackage;
         return __generator(this, function (_a) {
-            sourcePackageFile = (0, path_1.resolve)(sourceFolder, "package.json");
-            targetPackageFile = (0, path_1.resolve)(targetFolder, "package.json");
+            sourcePackageFile = (0, path_1.resolve)(templateFolder, "package.json");
+            targetPackageFile = (0, path_1.resolve)(appFolder, "package.json");
+            outPackageFile = (0, path_1.resolve)(outDirectory, "package.json");
             sourcePackage = require(sourcePackageFile);
             targetPackage = require(targetPackageFile);
             mergedPackage = __assign(__assign({}, sourcePackage), { dependencies: __assign(__assign({}, (sourcePackage.dependencies || {})), (targetPackage.dependencies || {})), devDependencies: __assign(__assign({}, (sourcePackage.devDependencies || {})), (targetPackage.devDependencies || {})) });
-            (0, fs_extra_1.writeJSON)(targetPackageFile, mergedPackage, {
+            (0, fs_extra_1.writeJSON)(outPackageFile, mergedPackage, {
                 spaces: 2,
             });
             return [2 /*return*/];

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

@@ -1,4 +1,32 @@
+/// <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>>>;
+};
 export declare const useRPCQuery: RPCUseQuery;
 export declare const useRPCMutation: RPCUseMutation;
-export declare const useRPCMutation: RPCUseInfiniteQuery;
+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

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rpcClient = exports.useRPCMutation = exports.useRPCQuery = void 0;
+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.useQuery;
+exports.useRPCMutation = trpc.useMutation;
 // @ts-ignore
-exports.useRPCMutation = trpc.useInfiniteQuery;
+exports.useRPCInfiniteQuery = trpc.useInfiniteQuery;
 exports.rpcClient = trpc.createClient({
     // @ts-ignore
-    url: process.serverlessEndpoint + "/api/trpc",
+    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.45",
+  "version": "0.2.0-beta.48",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

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/404.tsx

@@ -0,0 +1,13 @@
+import { fetchWordpressProps } from "../_utils/fetch-wordpress-props"
+
+export default function Home() {
+  return <div />
+}
+
+export async function getStaticProps({ params }: any) {
+  const result = await fetchWordpressProps("/404")
+  console.log("404", result)
+  return {
+    props: result,
+  }
+}

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

@@ -2,7 +2,7 @@ import { GetStaticPathsResult, GetStaticPropsContext, GetStaticPropsResult } fro
 import { fetchWordpressProps } from "../_utils/fetch-wordpress-props"
 
 export default function Home(props: any) {
-  return <div>{JSON.stringify(props)}</div>
+  return <div />
 }
 
 export async function getStaticPaths(): Promise<GetStaticPathsResult> {

package/serverless-template/pages/_app.tsx

@@ -10,18 +10,20 @@ import { PageMeta } from "../_utils/PageMeta"
 import { withTRPC } from "@trpc/next"
 
 function Root({ Component, pageProps }: AppProps) {
-  if (!pageProps.appData) return <div />
-
+  const route = useRouter()
+  console.log("Route", route)
   const appData = useMemo(() => {
-    return pageProps.appData.data
+    return pageProps?.appData?.data
   }, [])
 
-  const route = useRouter()
-
   const viewProps = pageProps?.viewData?.data
 
   const View = manifest[pageProps.view]
 
+  console.log("Page Props", pageProps)
+
+  if (!pageProps.appData) return <div />
+
   return (
     <ServerlessAppDataProvider value={appData}>
       <NextRouter data={pageProps} path={route.pathname}>

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",

package/serverless-template/pages/index.tsx

@@ -1,7 +1,7 @@
 import { fetchWordpressProps } from "../_utils/fetch-wordpress-props"
 
 export default function Home() {
-  return <div>Test</div>
+  return <div />
 }
 
 export async function getStaticProps({ params }: any) {