eddev 0.2.0-beta.33 → 0.2.0-beta.36

package/build/get-webpack-config.js

@@ -334,8 +334,8 @@ function getWebpackConfig(opts) {
                     }
                     DEFINES["process.devUI"] = config.devUI === "enabled";
                     DEFINES["process.serverlessEndpoint"] = "window.SERVERLESS_ENDPOINT";
-                    rpcExists = (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "api/_rpc.ts")) ||
-                        (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "api/_rpc/index.ts"));
+                    rpcExists = (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "apis/_rpc.ts")) ||
+                        (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "apis/_rpc/index.ts"));
                     DEFINES["process.rpcEnabled"] = rpcExists ? "true" : "false";
                     if (isBrowser) {
                         DEFINES["process.env.themePath"] = "window.THEME_PATH || ".concat(DEFINES["process.env.themePath"]);

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

@@ -138,11 +138,11 @@ function createNextApp(opts) {
                     // 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, "api"), (0, path_1.join)(serverlessDirectory, "api"), ["**/*.{tsx,ts,js,jsx}"])];
+                    return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "apis"), ["**/*.{tsx,ts,js,jsx}"])];
                 case 7:
                     // Also sync APIs into the APIs folder
                     _b.sent();
-                    return [4 /*yield*/, syncAPIProxies((0, path_1.join)(opts.baseDirectory, "api"), (0, path_1.join)(serverlessDirectory, "pages/api"))
+                    return [4 /*yield*/, syncAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
                         // Sync the public folder
                     ];
                 case 8:
@@ -174,7 +174,7 @@ function createNextApp(opts) {
                     // Sync favicon
                     _b.sent();
                     // Write APIs proxy code
-                    return [4 /*yield*/, writeAPIProxies((0, path_1.join)(opts.baseDirectory, "api"), (0, path_1.join)(serverlessDirectory, "pages/api"))
+                    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:
@@ -182,30 +182,30 @@ function createNextApp(opts) {
                     _b.sent();
                     // Remove pages/api/trpc directory if no _rpc is found
                     console.log({
-                        index: (0, path_1.join)(opts.baseDirectory, "api/_rpc/index.ts"),
-                        rpc: (0, path_1.join)(opts.baseDirectory, "api/_rpc.ts"),
+                        index: (0, path_1.join)(opts.baseDirectory, "apis/_rpc/index.ts"),
+                        rpc: (0, path_1.join)(opts.baseDirectory, "apis/_rpc.ts"),
                     });
-                    if (!(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "api/_rpc/index.ts")) &&
-                        !(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "api/_rpc.ts"))) {
+                    if (!(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "apis/_rpc/index.ts")) &&
+                        !(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "apis/_rpc.ts"))) {
                         // removeSync(join(serverlessDirectory, "pages/api/trpc"))
                     }
                     _b.label = 17;
-                case 17:
-                    if (!!isVercel) return [3 /*break*/, 19];
-                    sendSignal({ code: "packaging" });
-                    return [4 /*yield*/, updatePackages(serverlessDirectory)];
+                case 17: 
+                // Create manifests
+                return [4 /*yield*/, initManifests(serverlessDirectory, opts.dev)
+                    // Update packages
+                ];
                 case 18:
+                    // Create manifests
                     _b.sent();
-                    _b.label = 19;
+                    if (!!isVercel) return [3 /*break*/, 20];
+                    sendSignal({ code: "packaging" });
+                    return [4 /*yield*/, updatePackages(serverlessDirectory)];
                 case 19:
-                    sendSignal({ code: "compiling" });
-                    // Create manifests
-                    return [4 /*yield*/, initManifests(serverlessDirectory, opts.dev)
-                        // Start
-                    ];
-                case 20:
-                    // Create manifests
                     _b.sent();
+                    _b.label = 20;
+                case 20:
+                    sendSignal({ code: "compiling" });
                     if (!opts.dev) return [3 /*break*/, 23];
                     return [4 /*yield*/, getPort(3000)
                         // Write the endpoint URL to .env
@@ -326,6 +326,7 @@ function writeAPIProxies(sourceFolder, targetFolder) {
                             var outputPath = (0, path_1.join)(targetFolder, name);
                             if (name.includes("_rpc"))
                                 return;
+                            (0, fs_extra_1.ensureFileSync)((0, path_1.join)(outputPath));
                             return (0, fs_extra_1.writeFile)(outputPath, "import handler from \"".concat(file, "\"; export default handler;"));
                         }))];
                 case 2:

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

@@ -163,7 +163,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 \"./api/_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  ");
             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/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.33",
+  "version": "0.2.0-beta.36",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

package/serverless-template/next.config.js

@@ -61,7 +61,7 @@ module.exports = (() => {
       define.definitions["process.serverlessEndpoint"] = JSON.stringify("/")
 
       const rpcExists =
-        existsSync(join(process.cwd(), "api/_rpc.ts")) || existsSync(join(process.cwd(), "api/_rpc/index.ts"))
+        existsSync(join(process.cwd(), "apis/_rpc.ts")) || existsSync(join(process.cwd(), "apis/_rpc/index.ts"))
       define.definitions["process.rpcEnabled"] = rpcExists ? "true" : "false"
       // config.plugins.push(
       //   new DefinePlugin({

package/serverless-template/pages/api/trpc/[...trpc].ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-import { router, createContext } from "../../../api/_rpc"
+import { router, createContext } from "../../../apis/_rpc"
 import * as trpcNext from "@trpc/server/adapters/next"
 import type { NextApiRequest, NextApiResponse } from "next"
 
@@ -22,8 +22,5 @@ export default function (req: NextApiRequest, res: NextApiResponse) {
       return
     }
   }
-  // res.writeHead(200)
-  res.json("Test")
-  return
-  // return handler(req, res)
+  return handler(req, res)
 }

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