eddev 0.2.0-beta.5 → 0.2.0-beta.9

package/build/get-webpack-config.js

@@ -247,16 +247,21 @@ function getWebpackConfig(opts) {
                     manifestLoaders = [];
                     // Views
                     ALIAS["@manifest/views"] = path_1.default.resolve(opts.baseDirectory, "_view_manifest.js");
-                    manifestLoaders.push((0, manifest_views_1.createViewManifestGenerator)({
-                        baseDirectory: opts.baseDirectory,
-                        isAdmin: true,
-                        isDev: isDev,
-                        isServerless: isServerless,
-                        watch: isDev,
-                        onGenerate: function (manifest) {
-                            writeVirtualModule(ALIAS["@manifest/views"], manifest);
-                        },
-                    }));
+                    if (opts.isAdmin) {
+                        writeVirtualModule(ALIAS["@manifest/views"], "export default {}");
+                    }
+                    else {
+                        manifestLoaders.push((0, manifest_views_1.createViewManifestGenerator)({
+                            baseDirectory: opts.baseDirectory,
+                            isAdmin: false,
+                            isDev: isDev,
+                            isServerless: isServerless,
+                            watch: isDev,
+                            onGenerate: function (manifest) {
+                                writeVirtualModule(ALIAS["@manifest/views"], manifest);
+                            },
+                        }));
+                    }
                     // Field manifest
                     ALIAS["@manifest/fields"] = path_1.default.resolve(opts.baseDirectory, "_fields_manifest.js");
                     if (opts.isAdmin) {

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

@@ -10,6 +10,25 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+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;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,6 +65,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -59,65 +87,86 @@ var fs_1 = require("fs");
 var manifest_blocks_1 = require("../manifests/manifest-blocks");
 var promises_1 = require("fs/promises");
 var manifest_views_1 = require("../manifests/manifest-views");
+function requireConfig(dir) {
+    var configPath = (0, path_1.resolve)(dir, "ed.config.json");
+    return require(configPath);
+}
 function createNextApp(opts) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var serverlessDirectory;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var isVercel, serverlessDirectory;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    serverlessDirectory = (0, path_1.resolve)(opts.baseDirectory, ".serverless");
-                    // Clean first
-                    return [4 /*yield*/, clean(serverlessDirectory)
-                        // Copy the template folder
-                    ];
+                    isVercel = process.env.VERCEL;
+                    serverlessDirectory = isVercel ? opts.baseDirectory : (0, path_1.resolve)(opts.baseDirectory, ".serverless");
+                    if (!!isVercel) return [3 /*break*/, 2];
+                    return [4 /*yield*/, clean(serverlessDirectory)];
                 case 1:
-                    // Clean first
-                    _a.sent();
-                    // Copy the template folder
-                    return [4 /*yield*/, copyTemplate(serverlessDirectory)
-                        // Update package.json
-                    ];
-                case 2:
-                    // Copy the template folder
-                    _a.sent();
+                    _b.sent();
+                    _b.label = 2;
+                case 2: 
+                // Copy the template folder
+                return [4 /*yield*/, copyTemplate(serverlessDirectory)
                     // Update package.json
-                    return [4 /*yield*/, updatePackagesFile(opts.baseDirectory, serverlessDirectory)
-                        // Update packages
-                        // TODO: On vercel, can we maybe just symlink or copy node_modules?
-                    ];
+                ];
                 case 3:
-                    // Update package.json
-                    _a.sent();
-                    // Update packages
-                    // TODO: On vercel, can we maybe just symlink or copy node_modules?
-                    return [4 /*yield*/, updatePackages(serverlessDirectory)
-                        // Symlink important files and directories
-                    ];
+                    // Copy the template folder
+                    _b.sent();
+                    if (!!isVercel) return [3 /*break*/, 5];
+                    return [4 /*yield*/, updatePackagesFile(opts.baseDirectory, serverlessDirectory)];
                 case 4:
-                    // Update packages
-                    // TODO: On vercel, can we maybe just symlink or copy node_modules?
-                    _a.sent();
-                    // Symlink important files and directories
-                    return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory)
-                        // Create manifests
-                    ];
+                    _b.sent();
+                    _b.label = 5;
                 case 5:
-                    // Symlink important files and directories
-                    _a.sent();
+                    if (!!isVercel) return [3 /*break*/, 7];
+                    return [4 /*yield*/, updatePackages(serverlessDirectory)];
+                case 6:
+                    _b.sent();
+                    _b.label = 7;
+                case 7:
+                    if (!!isVercel) return [3 /*break*/, 10];
+                    // Sync important files during development, as they change
+                    return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory, __spreadArray([
+                            "blocks/**/*",
+                            "components/**/*",
+                            "hooks/**/*",
+                            "queries/**/*",
+                            ".env",
+                            "views/**/*",
+                            "theme.css.tsx",
+                            "types.graphql.ts",
+                            "types.views.ts",
+                            "types.blocks.ts",
+                            "utils/**/*",
+                            "ed.config.json"
+                        ], (((_a = requireConfig(opts.baseDirectory).serverless) === null || _a === void 0 ? void 0 : _a.devAssets) || []), true))
+                        // Also sync APIs into the APIs folder
+                    ];
+                case 8:
+                    // Sync important files during development, as they change
+                    _b.sent();
+                    // Also sync APIs into the APIs folder
+                    return [4 /*yield*/, syncFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "pages/"), ["api/**/*"])];
+                case 9:
+                    // Also sync APIs into the APIs folder
+                    _b.sent();
+                    _b.label = 10;
+                case 10:
                     // Create manifests
                     initManifests(serverlessDirectory, opts.dev);
-                    if (!opts.dev) return [3 /*break*/, 7];
+                    if (!opts.dev) return [3 /*break*/, 12];
                     return [4 /*yield*/, runScript(serverlessDirectory, "dev")];
-                case 6:
-                    _a.sent();
-                    return [3 /*break*/, 9];
-                case 7:
-                    if (!opts.build) return [3 /*break*/, 9];
+                case 11:
+                    _b.sent();
+                    return [3 /*break*/, 14];
+                case 12:
+                    if (!opts.build) return [3 /*break*/, 14];
                     return [4 /*yield*/, runScript(serverlessDirectory, "build")];
-                case 8:
-                    _a.sent();
-                    _a.label = 9;
-                case 9: return [2 /*return*/];
+                case 13:
+                    _b.sent();
+                    _b.label = 14;
+                case 14: return [2 /*return*/];
             }
         });
     });
@@ -152,7 +201,6 @@ function copyTemplate(targetFolder) {
             switch (_a.label) {
                 case 0:
                     sourceFolder = (0, path_1.resolve)(__dirname, "../../serverless-template");
-                    console.log("Copying from", sourceFolder, "to", targetFolder);
                     (0, fs_extra_1.mkdirp)(targetFolder);
                     return [4 /*yield*/, (0, glob_promise_1.default)((0, path_1.resolve)(sourceFolder, "**/*.*"))];
                 case 1:
@@ -160,9 +208,6 @@ function copyTemplate(targetFolder) {
                     return [4 /*yield*/, Promise.all(files.map(function (src) {
                             var dest = src.replace(sourceFolder, targetFolder);
                             return (0, fs_extra_1.copy)(src, dest);
-                            // return new Promise((resolve) => {
-                            //   console.log("Copy", src, "to", dest)
-                            // })
                         }))];
                 case 2:
                     _a.sent();
@@ -205,36 +250,35 @@ function updatePackagesFile(sourceFolder, targetFolder) {
         });
     });
 }
-function syncFiles(sourceFolder, targetFolder) {
+function syncFiles(sourceFolder, targetFolder, patterns) {
     return __awaiter(this, void 0, void 0, function () {
-        var links;
+        var _this = this;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    links = [
-                        "blocks",
-                        "components",
-                        "hooks",
-                        "queries",
-                        ".env",
-                        "views",
-                        "theme.css.tsx",
-                        "types.graphql.ts",
-                        "types.views.ts",
-                        "types.blocks.ts",
-                        "utils",
-                    ];
-                    return [4 /*yield*/, Promise.all(links.map(function (file) {
-                            var src = (0, path_1.resolve)(sourceFolder, file);
-                            var dest = (0, path_1.resolve)(targetFolder, file);
-                            if ((0, fs_1.existsSync)(src)) {
-                                return (0, fs_extra_1.copy)(src, dest);
-                            }
-                        }))];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
+            return [2 /*return*/, new Promise(function (ready) { return __awaiter(_this, void 0, void 0, function () {
+                    var chokidar;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("chokidar")); })];
+                            case 1:
+                                chokidar = (_a.sent()).default;
+                                chokidar
+                                    .watch(patterns)
+                                    .on("add", function (path) {
+                                    (0, fs_extra_1.copy)(path, (0, path_1.join)(targetFolder, path));
+                                })
+                                    .on("unlink", function (path) {
+                                    (0, fs_extra_1.remove)((0, path_1.join)(targetFolder, path));
+                                })
+                                    .on("change", function (path) {
+                                    (0, fs_extra_1.copy)(path, (0, path_1.join)(targetFolder, path));
+                                })
+                                    .on("ready", function () {
+                                    ready(undefined);
+                                });
+                                return [2 /*return*/];
+                        }
+                    });
+                }); })];
         });
     });
 }

package/cli/build.dev.js

@@ -48,12 +48,15 @@ var ink_1 = require("ink");
 var DevCLIDisplay_1 = require("./display/components/DevCLIDisplay");
 var create_webpack_worker_1 = require("../build/create-webpack-worker");
 var create_codegen_worker_1 = require("../build/create-codegen-worker");
+var create_schema_file_1 = require("../config/create-schema-file");
 function devCommand(opts) {
     return __awaiter(this, void 0, void 0, function () {
         var themeName, enableFrontend, enableAdmin, enableCodegen, frontendObservable, adminObservable, codegenObservable;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, promptIfRepoNameIncorrect_1.promptIfRepoThemeMismatch)()];
+                case 0:
+                    (0, create_schema_file_1.createConfigSchemaFile)(path_1.default.resolve(process.cwd(), ".ed.config.schema.json"));
+                    return [4 /*yield*/, (0, promptIfRepoNameIncorrect_1.promptIfRepoThemeMismatch)()];
                 case 1:
                     _a.sent();
                     themeName = path_1.default.basename(process.cwd());

package/config/config-schema.d.ts

@@ -0,0 +1,47 @@
+import { z } from "zod";
+export declare const EDConfigSchema: z.ZodObject<{
+    $schema: z.ZodOptional<z.ZodString>;
+    serverless: z.ZodOptional<z.ZodObject<{
+        enabled: z.ZodBoolean;
+        uploads: z.ZodEnum<["proxy", "remote"]>;
+        plugins: z.ZodEnum<["proxy", "remote"]>;
+        theme: z.ZodEnum<["proxy", "copy", "remote"]>;
+        devAssets: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        apiOnly: z.ZodOptional<z.ZodBoolean>;
+    }, "strip", z.ZodTypeAny, {
+        devAssets?: string[] | undefined;
+        apiOnly?: boolean | undefined;
+        plugins: "proxy" | "remote";
+        enabled: boolean;
+        uploads: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
+    }, {
+        devAssets?: string[] | undefined;
+        apiOnly?: boolean | undefined;
+        plugins: "proxy" | "remote";
+        enabled: boolean;
+        uploads: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    $schema?: string | undefined;
+    serverless?: {
+        devAssets?: string[] | undefined;
+        apiOnly?: boolean | undefined;
+        plugins: "proxy" | "remote";
+        enabled: boolean;
+        uploads: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
+    } | undefined;
+}, {
+    $schema?: string | undefined;
+    serverless?: {
+        devAssets?: string[] | undefined;
+        apiOnly?: boolean | undefined;
+        plugins: "proxy" | "remote";
+        enabled: boolean;
+        uploads: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
+    } | undefined;
+}>;
+export declare type EDConfig = z.infer<typeof EDConfigSchema>;

package/config/config-schema.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EDConfigSchema = void 0;
+var zod_1 = require("zod");
+exports.EDConfigSchema = zod_1.z.object({
+    $schema: zod_1.z.string().optional(),
+    serverless: zod_1.z
+        .object({
+        enabled: zod_1.z.boolean(),
+        uploads: zod_1.z.enum(["proxy", "remote"]),
+        plugins: zod_1.z.enum(["proxy", "remote"]),
+        theme: zod_1.z.enum(["proxy", "copy", "remote"]),
+        devAssets: zod_1.z.array(zod_1.z.string()).optional(),
+        apiOnly: zod_1.z.boolean().optional(),
+    })
+        .optional(),
+});

package/config/create-schema-file.d.ts

@@ -0,0 +1 @@
+export declare function createConfigSchemaFile(location: string): void;

package/config/create-schema-file.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createConfigSchemaFile = void 0;
+var fs_1 = require("fs");
+var zod_to_json_schema_1 = __importDefault(require("zod-to-json-schema"));
+var config_schema_1 = require("./config-schema");
+function createConfigSchemaFile(location) {
+    var schema = (0, zod_to_json_schema_1.default)(config_schema_1.EDConfigSchema);
+    var content = JSON.stringify(schema, null, 2);
+    if ((0, fs_1.existsSync)(location)) {
+        var existingContent = (0, fs_1.readFileSync)(location).toString();
+        if (existingContent === content)
+            return;
+    }
+    (0, fs_1.writeFileSync)(location, content);
+}
+exports.createConfigSchemaFile = createConfigSchemaFile;

package/config/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./config-schema";
+export * from "./parse-config";

package/config/index.js

@@ -0,0 +1,14 @@
+"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("./config-schema"), exports);
+__exportStar(require("./parse-config"), exports);

package/config/parse-config.d.ts

@@ -0,0 +1,21 @@
+export declare function parseConfig(config: any): import("zod").SafeParseReturnType<{
+    $schema?: string | undefined;
+    serverless?: {
+        devAssets?: string[] | undefined;
+        apiOnly?: boolean | undefined;
+        plugins: "proxy" | "remote";
+        enabled: boolean;
+        uploads: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
+    } | undefined;
+}, {
+    $schema?: string | undefined;
+    serverless?: {
+        devAssets?: string[] | undefined;
+        apiOnly?: boolean | undefined;
+        plugins: "proxy" | "remote";
+        enabled: boolean;
+        uploads: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
+    } | undefined;
+}>;

package/config/parse-config.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseConfig = void 0;
+var config_schema_1 = require("./config-schema");
+function parseConfig(config) {
+    return config_schema_1.EDConfigSchema.safeParse(config);
+}
+exports.parseConfig = parseConfig;

package/config/schema.d.ts

@@ -0,0 +1 @@
+export {};

package/config/schema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/hooks/useAppData.js

@@ -18,7 +18,6 @@ function useAppData(selector) {
     // @ts-ignore
     if (process.serverless) {
         var value = (0, react_1.useContext)(serverlessAppContext_1.ServerlessAppDataContext);
-        console.log("VALUE IS", value);
         if (selector)
             return selector(value);
         return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.0-beta.5",
+  "version": "0.2.0-beta.9",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -16,6 +16,7 @@
     "@types/babel__traverse": "^7.14.2",
     "@types/chokidar": "^2.1.3",
     "@types/fs-extra": "^9.0.13",
+    "@types/git-repo-name": "^1.0.1",
     "@types/inquirer": "^8.1.1",
     "@types/loadable__component": "^5.13.4",
     "@types/node": "^16.7.10",
@@ -64,7 +65,7 @@
     "execa": "^6.0.0",
     "friendly-errors-webpack-plugin": "^1.7.0",
     "fs-extra": "^10.0.0",
-    "git-remote-origin-url": "^3.1.0",
+    "git-repo-name": "^1.0.1",
     "glob": "^7.1.7",
     "glob-promise": "^4.2.0",
     "graphql": "^15.5.3",
@@ -89,6 +90,8 @@
     "webpack-dev-server": "^3.11.2",
     "webpack-hot-middleware": "^2.25.0",
     "webpack-virtual-modules": "^0.4.3",
+    "zod": "^3.11.6",
+    "zod-to-json-schema": "^3.11.3",
     "zustand": "^3.5.10"
   },
   "peerDependencies": {

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

@@ -0,0 +1,32 @@
+export declare function createRPCClient(): {
+    Provider: ({ client, queryClient, children, isPrepass, ssrContext, }: {
+        queryClient: 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) => 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>;
+    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>>;
+};

package/serverless/create-rpc-client.js

@@ -0,0 +1,20 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRPCClient = void 0;
+var react_1 = require("@trpc/react");
+function createRPCClient() {
+    var trpc = (0, react_1.createReactQueryHooks)();
+    return __assign({}, trpc);
+}
+exports.createRPCClient = createRPCClient;

package/serverless/define-api.d.ts

@@ -0,0 +1,2 @@
+import { NextApiHandler } from "next/types";
+export declare function defineAPI(handler: NextApiHandler): NextApiHandler<any>;

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

@@ -1,17 +1,38 @@
+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(/\/+/, "/")
   let response = await fetch(propsURL)
   let text = await response.text()
 
   // Convert absolute site URL details to relative paths
-  // console.log("WAS", text)
-  console.log("REPLACING", origin, propsURL, response.status, response.statusText, text)
-  console.log("RESPONSE", response)
-  text = text.replaceAll(origin, "")
-  console.log("NOW", text)
+  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,58 +1,71 @@
 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 }) => {
+      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"),
+        "@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"])({
-  async rewrites() {
-    return {
-      afterFiles: [
-        {
-          source: "/wp-content/uploads/:path*",
-          destination: process.env.SITE_URL + "/wp-content/uploads/:path*",
-        },
-      ],
-    }
-  },
-  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
+
+      console.log("Theme path", themePath)
+      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/utils/getRepoName.d.ts

@@ -1,4 +1,4 @@
-export declare function getRepoName(dir: string): Promise<{
+export declare function getRepoName(dir: string): {
     repoName: string | undefined;
     themeName: string;
-}>;
+};

package/utils/getRepoName.js

@@ -1,62 +1,16 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRepoName = void 0;
-var git_remote_origin_url_1 = __importDefault(require("git-remote-origin-url"));
+var git_repo_name_1 = __importDefault(require("git-repo-name"));
 var path_1 = __importDefault(require("path"));
 function getRepoName(dir) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function () {
-        var info;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, git_remote_origin_url_1.default)(dir)];
-                case 1:
-                    info = _b.sent();
-                    return [2 /*return*/, {
-                            repoName: (_a = info.match(/([^\/]+).git$/)) === null || _a === void 0 ? void 0 : _a[1],
-                            themeName: path_1.default.basename(dir),
-                        }];
-            }
-        });
-    });
+    var info = git_repo_name_1.default.sync(dir);
+    return {
+        repoName: info || "",
+        themeName: path_1.default.basename(dir),
+    };
 }
 exports.getRepoName = getRepoName;