eddev 0.2.0-beta.34 → 0.2.0-beta.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -334,8 +334,8 @@ function getWebpackConfig(opts) {
|
|
|
334
334
|
}
|
|
335
335
|
DEFINES["process.devUI"] = config.devUI === "enabled";
|
|
336
336
|
DEFINES["process.serverlessEndpoint"] = "window.SERVERLESS_ENDPOINT";
|
|
337
|
-
rpcExists = (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "
|
|
338
|
-
(0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "
|
|
337
|
+
rpcExists = (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "apis/_rpc.ts")) ||
|
|
338
|
+
(0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "apis/_rpc/index.ts"));
|
|
339
339
|
DEFINES["process.rpcEnabled"] = rpcExists ? "true" : "false";
|
|
340
340
|
if (isBrowser) {
|
|
341
341
|
DEFINES["process.env.themePath"] = "window.THEME_PATH || ".concat(DEFINES["process.env.themePath"]);
|
|
@@ -138,11 +138,11 @@ function createNextApp(opts) {
|
|
|
138
138
|
// Sync important files during development, as they change
|
|
139
139
|
_b.sent();
|
|
140
140
|
// Also sync APIs into the APIs folder
|
|
141
|
-
return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory, "
|
|
141
|
+
return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "apis"), ["**/*.{tsx,ts,js,jsx}"])];
|
|
142
142
|
case 7:
|
|
143
143
|
// Also sync APIs into the APIs folder
|
|
144
144
|
_b.sent();
|
|
145
|
-
return [4 /*yield*/, syncAPIProxies((0, path_1.join)(opts.baseDirectory, "
|
|
145
|
+
return [4 /*yield*/, syncAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
|
|
146
146
|
// Sync the public folder
|
|
147
147
|
];
|
|
148
148
|
case 8:
|
|
@@ -174,7 +174,7 @@ function createNextApp(opts) {
|
|
|
174
174
|
// Sync favicon
|
|
175
175
|
_b.sent();
|
|
176
176
|
// Write APIs proxy code
|
|
177
|
-
return [4 /*yield*/, writeAPIProxies((0, path_1.join)(opts.baseDirectory, "
|
|
177
|
+
return [4 /*yield*/, writeAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
|
|
178
178
|
// Remove pages/api/trpc directory if no _rpc is found
|
|
179
179
|
];
|
|
180
180
|
case 16:
|
|
@@ -182,11 +182,11 @@ function createNextApp(opts) {
|
|
|
182
182
|
_b.sent();
|
|
183
183
|
// Remove pages/api/trpc directory if no _rpc is found
|
|
184
184
|
console.log({
|
|
185
|
-
index: (0, path_1.join)(opts.baseDirectory, "
|
|
186
|
-
rpc: (0, path_1.join)(opts.baseDirectory, "
|
|
185
|
+
index: (0, path_1.join)(opts.baseDirectory, "apis/_rpc/index.ts"),
|
|
186
|
+
rpc: (0, path_1.join)(opts.baseDirectory, "apis/_rpc.ts"),
|
|
187
187
|
});
|
|
188
|
-
if (!(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "
|
|
189
|
-
!(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "
|
|
188
|
+
if (!(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "apis/_rpc/index.ts")) &&
|
|
189
|
+
!(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "apis/_rpc.ts"))) {
|
|
190
190
|
// removeSync(join(serverlessDirectory, "pages/api/trpc"))
|
|
191
191
|
}
|
|
192
192
|
_b.label = 17;
|
|
@@ -163,7 +163,7 @@ function beginWork(opts) {
|
|
|
163
163
|
});
|
|
164
164
|
}); };
|
|
165
165
|
// Create RPC/API types
|
|
166
|
-
(0, promises_1.writeFile)(Path.join(opts.baseDirectory, "types.api.ts"), "\n import type { router, createContext } from \"./
|
|
166
|
+
(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 ");
|
|
167
167
|
regenerate = debounce(100, function () { return __awaiter(_this, void 0, void 0, function () {
|
|
168
168
|
var startTime, hasChanged, err_1, documentSets, parseErrors, _loop_1, _a, _b, _i, key, generates, errors, _c, _d, _e, file, base, config, output, err_2;
|
|
169
169
|
var _this = this;
|
package/package.json
CHANGED
|
@@ -61,7 +61,7 @@ module.exports = (() => {
|
|
|
61
61
|
define.definitions["process.serverlessEndpoint"] = JSON.stringify("/")
|
|
62
62
|
|
|
63
63
|
const rpcExists =
|
|
64
|
-
existsSync(join(process.cwd(), "
|
|
64
|
+
existsSync(join(process.cwd(), "apis/_rpc.ts")) || existsSync(join(process.cwd(), "apis/_rpc/index.ts"))
|
|
65
65
|
define.definitions["process.rpcEnabled"] = rpcExists ? "true" : "false"
|
|
66
66
|
// config.plugins.push(
|
|
67
67
|
// new DefinePlugin({
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// @ts-ignore
|
|
2
|
-
import { router, createContext } from "../../../
|
|
2
|
+
import { router, createContext } from "../../../apis/_rpc"
|
|
3
3
|
import * as trpcNext from "@trpc/server/adapters/next"
|
|
4
4
|
import type { NextApiRequest, NextApiResponse } from "next"
|
|
5
5
|
|
|
@@ -12,18 +12,15 @@ export default function (req: NextApiRequest, res: NextApiResponse) {
|
|
|
12
12
|
// TODO: Use an origin whitelist
|
|
13
13
|
const origin = req.headers.origin
|
|
14
14
|
if (origin) {
|
|
15
|
+
res.setHeader("Access-Control-Allow-Origin", "*")
|
|
16
|
+
res.setHeader("Access-Control-Request-Method", "*")
|
|
17
|
+
res.setHeader("Access-Control-Request-Method", "OPTIONS, GET, POST")
|
|
18
|
+
res.setHeader("Access-Control-Allow-Headers", "*")
|
|
15
19
|
if (req.method === "OPTIONS") {
|
|
16
|
-
res.setHeader("Access-Control-Allow-Origin", "*")
|
|
17
|
-
res.setHeader("Access-Control-Request-Method", "*")
|
|
18
|
-
res.setHeader("Access-Control-Request-Method", "OPTIONS, GET, POST")
|
|
19
|
-
res.setHeader("Access-Control-Allow-Headers", "*")
|
|
20
20
|
res.writeHead(200)
|
|
21
21
|
res.end()
|
|
22
22
|
return
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
res.json("Test")
|
|
27
|
-
return
|
|
28
|
-
// return handler(req, res)
|
|
25
|
+
return handler(req, res)
|
|
29
26
|
}
|