eddev 0.2.0-beta.20 → 0.2.0-beta.23

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

@@ -116,7 +116,7 @@ function createNextApp(opts) {
                     _b.label = 5;
                 case 5:
                     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*/, 12];
                     // Sync important files during development, as they change
                     return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory, [
                             "blocks/**/*",
@@ -138,58 +138,64 @@ function createNextApp(opts) {
                     // 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/**/*"])
-                        // Sync the public folder
-                    ];
+                    return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory, "api"), (0, path_1.join)(serverlessDirectory, "api"), ["**/*.{tsx,ts,js,jsx}"])];
                 case 7:
                     // Also sync APIs into the APIs folder
                     _b.sent();
-                    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)];
+                    return [4 /*yield*/, syncAPIProxies((0, path_1.join)(serverlessDirectory, "api"), (0, path_1.join)(serverlessDirectory, "pages/api"))
+                        // Sync the public folder
+                    ];
                 case 8:
                     _b.sent();
-                    _b.label = 9;
-                case 9: 
+                    if (!assetPaths.length) return [3 /*break*/, 10];
+                    return [4 /*yield*/, syncFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
+                case 9:
+                    _b.sent();
+                    _b.label = 10;
+                case 10: 
                 // Sync favicon
                 return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory), (0, path_1.join)(serverlessDirectory, "public/"), ["favicon.ico"])];
-                case 10:
+                case 11:
                     // Sync favicon
                     _b.sent();
-                    return [3 /*break*/, 15];
-                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)];
+                    return [3 /*break*/, 17];
                 case 12:
+                    if (!assetPaths.length) return [3 /*break*/, 14];
+                    return [4 /*yield*/, copyFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
+                case 13:
                     _b.sent();
-                    _b.label = 13;
-                case 13: 
+                    _b.label = 14;
+                case 14: 
                 // Sync favicon
                 return [4 /*yield*/, copyFiles((0, path_1.join)(opts.baseDirectory), (0, path_1.join)(serverlessDirectory, "public/"), ["favicon.ico"])];
-                case 14:
+                case 15:
                     // Sync favicon
                     _b.sent();
-                    _b.label = 15;
-                case 15:
-                    if (!!isVercel) return [3 /*break*/, 17];
-                    sendSignal({ code: "packaging" });
-                    return [4 /*yield*/, updatePackages(serverlessDirectory)];
+                    return [4 /*yield*/, writeAPIProxies((0, path_1.join)(opts.baseDirectory, "api"), (0, path_1.join)(serverlessDirectory, "pages/api"))];
                 case 16:
                     _b.sent();
                     _b.label = 17;
                 case 17:
+                    if (!!isVercel) return [3 /*break*/, 19];
+                    sendSignal({ code: "packaging" });
+                    return [4 /*yield*/, updatePackages(serverlessDirectory)];
+                case 18:
+                    _b.sent();
+                    _b.label = 19;
+                case 19:
                     sendSignal({ code: "compiling" });
                     // Create manifests
                     return [4 /*yield*/, initManifests(serverlessDirectory, opts.dev)
                         // Start
                     ];
-                case 18:
+                case 20:
                     // Create manifests
                     _b.sent();
-                    if (!opts.dev) return [3 /*break*/, 21];
+                    if (!opts.dev) return [3 /*break*/, 23];
                     return [4 /*yield*/, getPort(3000)
                         // Write the endpoint URL to .env
                     ];
-                case 19:
+                case 21:
                     port = _b.sent();
                     // Write the endpoint URL to .env
                     (0, updateEnvFile_1.updateEnvFile)({
@@ -198,17 +204,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 20:
+                case 22:
                     // await devNext(serverlessDirectory, port)
                     _b.sent();
-                    return [3 /*break*/, 23];
-                case 21:
-                    if (!opts.build) return [3 /*break*/, 23];
+                    return [3 /*break*/, 25];
+                case 23:
+                    if (!opts.build) return [3 /*break*/, 25];
                     return [4 /*yield*/, runScript(serverlessDirectory, ["build"])];
-                case 22:
+                case 24:
                     _b.sent();
-                    _b.label = 23;
-                case 23: return [2 /*return*/];
+                    _b.label = 25;
+                case 25: return [2 /*return*/];
             }
         });
     });
@@ -292,6 +298,36 @@ function updatePackagesFile(sourceFolder, targetFolder) {
         });
     });
 }
+function writeAPIProxies(sourceFolder, targetFolder) {
+    return __awaiter(this, void 0, void 0, function () {
+        var files;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, glob_promise_1.default)((0, path_1.join)(sourceFolder, "**/*.{tsx,ts,js}"))];
+                case 1:
+                    files = _a.sent();
+                    return [4 /*yield*/, Promise.all(files.map(function (file) {
+                            var name = file.replace(sourceFolder, "");
+                            var outputPath = (0, path_1.join)(targetFolder, name);
+                            var relativePath = (0, path_1.relative)(outputPath, file);
+                            return (0, promises_1.writeFile)(outputPath, "import handler from \"".concat(file, "\"; export default handler;"));
+                        }))];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function syncAPIProxies(sourceFolder, targetFolder) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, syncFiles(sourceFolder, targetFolder, ["**/*.{tsx,ts,js}"], function (inputPath, outputPath) {
+                    return "import handler from \"".concat(inputPath.replace(/\.(ts|js)x?$/, ""), "\"; export default handler;");
+                })];
+        });
+    });
+}
 function copyFiles(sourceFolder, targetFolder, patterns) {
     return __awaiter(this, void 0, void 0, function () {
         var files;
@@ -301,12 +337,24 @@ function copyFiles(sourceFolder, targetFolder, patterns) {
                 case 1:
                     files = (_a.sent()).flat();
                     console.log("Files are", files);
+                    // Replace sourceFolder in each path, and copy to target folder
+                    return [4 /*yield*/, Promise.all(files.map(function (file) {
+                            console.log("Copying", file, file.replace(sourceFolder, targetFolder));
+                            var stat = (0, fs_1.statSync)(file);
+                            console.log("File exists", file);
+                            if (!stat.isDirectory()) {
+                                return (0, fs_extra_1.copy)(file, file.replace(sourceFolder, targetFolder));
+                            }
+                        }))];
+                case 2:
+                    // Replace sourceFolder in each path, and copy to target folder
+                    _a.sent();
                     return [2 /*return*/];
             }
         });
     });
 }
-function syncFiles(sourceFolder, targetFolder, patterns) {
+function syncFiles(sourceFolder, targetFolder, patterns, proxy) {
     return __awaiter(this, void 0, void 0, function () {
         var _this = this;
         return __generator(this, function (_a) {
@@ -322,13 +370,20 @@ function syncFiles(sourceFolder, targetFolder, patterns) {
                                     cwd: sourceFolder,
                                 })
                                     .on("add", function (path) {
-                                    (0, fs_extra_1.copy)((0, path_1.join)(sourceFolder, path), (0, path_1.join)(targetFolder, path));
+                                    if (proxy) {
+                                        (0, promises_1.writeFile)((0, path_1.join)(targetFolder, path), proxy((0, path_1.relative)(targetFolder, (0, path_1.join)(sourceFolder, path)), (0, path_1.join)(targetFolder, path)));
+                                    }
+                                    else {
+                                        (0, fs_extra_1.copy)((0, path_1.join)(sourceFolder, 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)((0, path_1.join)(sourceFolder, path), (0, path_1.join)(targetFolder, path));
+                                    if (!proxy) {
+                                        (0, fs_extra_1.copy)((0, path_1.join)(sourceFolder, path), (0, path_1.join)(targetFolder, path));
+                                    }
                                 })
                                     .on("ready", function () {
                                     ready(undefined);
@@ -423,7 +478,7 @@ function getPort(port) {
         var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("http")); })];
+                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("net")); })];
                 case 1:
                     createServer = (_a.sent()).createServer;
                     return [4 /*yield*/, new Promise(function (resolve) {

package/config/config-schema.d.ts

@@ -12,18 +12,18 @@ export declare const EDConfigSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
-        theme: "copy" | "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
         endpoints: Record<string, string>;
     }, {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
-        theme: "copy" | "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
         endpoints: Record<string, string>;
     }>>;
     devUI: z.ZodEnum<["disabled", "enabled"]>;
@@ -32,10 +32,10 @@ export declare const EDConfigSchema: z.ZodObject<{
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
-        theme: "copy" | "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
         endpoints: Record<string, string>;
     } | undefined;
     devUI: "disabled" | "enabled";
@@ -44,10 +44,10 @@ export declare const EDConfigSchema: z.ZodObject<{
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
-        theme: "copy" | "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
         endpoints: Record<string, string>;
     } | undefined;
     devUI: "disabled" | "enabled";

package/config/get-config.d.ts

@@ -3,10 +3,10 @@ export declare function getEDConfig(dir?: string): import("zod").SafeParseReturn
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
-        theme: "copy" | "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
         endpoints: Record<string, string>;
     } | undefined;
     devUI: "disabled" | "enabled";
@@ -15,10 +15,10 @@ export declare function getEDConfig(dir?: string): import("zod").SafeParseReturn
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
-        theme: "copy" | "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
         endpoints: Record<string, string>;
     } | undefined;
     devUI: "disabled" | "enabled";
@@ -28,10 +28,10 @@ export declare function getEDConfigUnwrapped(dir?: string): {
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
-        theme: "copy" | "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
         endpoints: Record<string, string>;
     } | undefined;
     devUI: "disabled" | "enabled";

package/config/parse-config.d.ts

@@ -3,10 +3,10 @@ export declare function parseConfig(config: any): import("zod").SafeParseReturnT
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
-        theme: "copy" | "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
         endpoints: Record<string, string>;
     } | undefined;
     devUI: "disabled" | "enabled";
@@ -15,10 +15,10 @@ export declare function parseConfig(config: any): import("zod").SafeParseReturnT
     serverless?: {
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
-        theme: "copy" | "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
         plugins: "proxy" | "remote";
+        theme: "copy" | "proxy" | "remote";
         endpoints: Record<string, string>;
     } | undefined;
     devUI: "disabled" | "enabled";

package/dev-ui/theme.d.ts

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

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/package.json

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare function createRPCClient(): {
     Provider: ({ client, queryClient, children, isPrepass, ssrContext, }: {
         queryClient: import("react-query").QueryClient;

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