eddev 0.2.0-beta.40 → 0.2.0-beta.43

package/build/serverless/create-next-app.js

@@ -108,14 +108,13 @@ function createNextApp(opts) {
                 case 3:
                     // Copy the template folder
                     _b.sent();
-                    if (!!isVercel) return [3 /*break*/, 5];
-                    return [4 /*yield*/, updatePackagesFile(opts.baseDirectory, serverlessDirectory)];
+                    // Update package.json
+                    return [4 /*yield*/, updatePackagesFile((0, path_1.resolve)(__dirname, "../../serverless-template"), serverlessDirectory)];
                 case 4:
+                    // Update package.json
                     _b.sent();
-                    _b.label = 5;
-                case 5:
                     assetPaths = ((_a = requireConfig(opts.baseDirectory).serverless) === null || _a === void 0 ? void 0 : _a.themeAssets) || [];
-                    if (!!isVercel) return [3 /*break*/, 12];
+                    if (!!isVercel) return [3 /*break*/, 11];
                     // Sync important files during development, as they change
                     return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory, [
                             "blocks/**/*",
@@ -134,50 +133,50 @@ function createNextApp(opts) {
                         ])
                         // Also sync APIs into the APIs folder
                     ];
-                case 6:
+                case 5:
                     // 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 7:
+                case 6:
                     // 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 8:
+                case 7:
                     _b.sent();
-                    if (!assetPaths.length) return [3 /*break*/, 10];
+                    if (!assetPaths.length) return [3 /*break*/, 9];
                     return [4 /*yield*/, syncFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
-                case 9:
+                case 8:
                     _b.sent();
-                    _b.label = 10;
-                case 10: 
+                    _b.label = 9;
+                case 9: 
                 // Sync favicon
                 return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory), (0, path_1.join)(serverlessDirectory, "public/"), ["favicon.ico"])];
-                case 11:
+                case 10:
                     // Sync favicon
                     _b.sent();
-                    return [3 /*break*/, 17];
-                case 12:
-                    if (!assetPaths.length) return [3 /*break*/, 14];
+                    return [3 /*break*/, 16];
+                case 11:
+                    if (!assetPaths.length) return [3 /*break*/, 13];
                     return [4 /*yield*/, copyFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
-                case 13:
+                case 12:
                     _b.sent();
-                    _b.label = 14;
-                case 14: 
+                    _b.label = 13;
+                case 13: 
                 // 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 15:
+                case 14:
                     // 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 16:
+                case 15:
                     // Write APIs proxy code
                     _b.sent();
                     // Remove pages/api/trpc directory if no _rpc is found
@@ -189,28 +188,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 = 17;
-                case 17: 
+                    _b.label = 16;
+                case 16: 
                 // Create manifests
                 return [4 /*yield*/, initManifests(serverlessDirectory, opts.dev)
                     // Update packages
                 ];
-                case 18:
+                case 17:
                     // Create manifests
                     _b.sent();
-                    if (!!isVercel) return [3 /*break*/, 20];
+                    if (!!isVercel) return [3 /*break*/, 19];
                     sendSignal({ code: "packaging" });
                     return [4 /*yield*/, updatePackages(serverlessDirectory)];
-                case 19:
+                case 18:
                     _b.sent();
-                    _b.label = 20;
-                case 20:
+                    _b.label = 19;
+                case 19:
                     sendSignal({ code: "compiling" });
-                    if (!opts.dev) return [3 /*break*/, 23];
+                    if (!opts.dev) return [3 /*break*/, 22];
                     return [4 /*yield*/, getPort(3000)
                         // Write the endpoint URL to .env
                     ];
-                case 21:
+                case 20:
                     port = _b.sent();
                     // Write the endpoint URL to .env
                     (0, updateEnvFile_1.updateEnvFile)({
@@ -219,17 +218,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 22:
+                case 21:
                     // await devNext(serverlessDirectory, port)
                     _b.sent();
-                    return [3 /*break*/, 25];
-                case 23:
-                    if (!opts.build) return [3 /*break*/, 25];
+                    return [3 /*break*/, 24];
+                case 22:
+                    if (!opts.build) return [3 /*break*/, 24];
                     return [4 /*yield*/, runScript(serverlessDirectory, ["build"])];
-                case 24:
+                case 23:
                     _b.sent();
-                    _b.label = 25;
-                case 25: return [2 /*return*/];
+                    _b.label = 24;
+                case 24: return [2 /*return*/];
             }
         });
     });
@@ -269,6 +268,8 @@ function copyTemplate(targetFolder) {
                 case 1:
                     files = _a.sent();
                     return [4 /*yield*/, Promise.all(files.map(function (src) {
+                            if (src.includes("package.json"))
+                                return null;
                             var dest = src.replace(sourceFolder, targetFolder);
                             return (0, fs_extra_1.copy)(src, dest);
                         }))];
@@ -305,7 +306,7 @@ function updatePackagesFile(sourceFolder, targetFolder) {
             targetPackageFile = (0, path_1.resolve)(targetFolder, "package.json");
             sourcePackage = require(sourcePackageFile);
             targetPackage = require(targetPackageFile);
-            mergedPackage = __assign(__assign({}, targetPackage), { dependencies: __assign(__assign({}, (targetPackage.dependencies || {})), (sourcePackage.dependencies || {})), devDependencies: __assign(__assign({}, (targetPackage.devDependencies || {})), (sourcePackage.devDependencies || {})) });
+            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, {
                 spaces: 2,
             });

package/hooks/rpc-client.d.ts

@@ -0,0 +1,3 @@
+export declare const useRPCQuery: <TPath extends string>(pathAndInput: [TPath, (null | undefined)?], opts?: import("@trpc/react").UseTRPCQueryOptions<TPath, RPCRouter, RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>> | undefined) => import("react-query").UseQueryResult<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>>;
+export declare const useRPCMutation: <TPath_1 extends string>(path: TPath_1 | [TPath_1], opts?: import("@trpc/react").UseTRPCMutationOptions<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>, RPCRouter> | undefined) => import("react-query").UseMutationResult<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>, RPCRouter, unknown>;
+export declare const rpcClient: import("@trpc/react").TRPCClient<RPCRouter>;

package/hooks/rpc-client.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rpcClient = exports.useRPCMutation = exports.useRPCQuery = void 0;
+var react_1 = require("@trpc/react");
+// @ts-ignore
+var _a = (0, react_1.createReactQueryHooks)({
+    // @ts-ignore
+    url: process.serverlessEndpoint + "/api/trpc",
+}), useQuery = _a.useQuery, useMutation = _a.useMutation, createClient = _a.createClient;
+exports.useRPCQuery = useQuery;
+exports.useRPCMutation = useMutation;
+exports.rpcClient = createClient({
+    // @ts-ignore
+    url: process.serverlessEndpoint + "/api/trpc",
+});

package/package.json

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

package/serverless/create-rpc-client.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="react" />
 export declare function createRPCClient(): {
     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;
@@ -9,25 +8,13 @@ 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>>>;
 };

package/serverless/rpc-client.d.ts

@@ -0,0 +1,3 @@
+export declare const useRPCQuery: <TPath extends string>(pathAndInput: [TPath, (null | undefined)?], opts?: import("@trpc/react").UseTRPCQueryOptions<TPath, RPCRouter, RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>> | undefined) => import("react-query").UseQueryResult<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>>;
+export declare const useRPCMutation: <TPath_1 extends string>(path: TPath_1 | [TPath_1], opts?: import("@trpc/react").UseTRPCMutationOptions<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>, RPCRouter> | undefined) => import("react-query").UseMutationResult<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>, RPCRouter, unknown>;
+export declare const rpcClient: import("@trpc/react").TRPCClient<RPCRouter>;

package/serverless/rpc-client.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rpcClient = exports.useRPCMutation = exports.useRPCQuery = void 0;
+var react_1 = require("@trpc/react");
+// @ts-ignore
+var _a = (0, react_1.createReactQueryHooks)({
+    // @ts-ignore
+    url: process.serverlessEndpoint + "/api/trpc",
+}), useQuery = _a.useQuery, useMutation = _a.useMutation, createClient = _a.createClient;
+exports.useRPCQuery = useQuery;
+exports.useRPCMutation = useMutation;
+exports.rpcClient = createClient({
+    // @ts-ignore
+    url: process.serverlessEndpoint + "/api/trpc",
+});

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

@@ -20,6 +20,7 @@ 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
@@ -38,6 +39,8 @@ export async function fetchWordpressProps(pathname: string) {
       } else if (settings?.uploads === "remote") {
         return url
       }
+    } else {
+      return path
     }
     return url
   })

package/entry/entry.serverless.dev.js

@@ -1,2 +0,0 @@
-"use strict";
-console.log("Dev serverless");