eddev 0.2.0-beta.32 → 0.2.0-beta.35
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.
- package/build/get-webpack-config.js +2 -2
- package/build/serverless/create-next-app.js +27 -25
- package/build/workers/codegen-worker-script.js +1 -1
- package/package.json +1 -1
- package/serverless-template/next.config.js +1 -1
- package/serverless-template/pages/api/rest/{[...method].ts → [method].ts} +1 -1
- package/serverless-template/pages/api/trpc/[...trpc].ts +1 -1
|
@@ -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"]);
|
|
@@ -76,7 +76,6 @@ var glob_promise_1 = __importDefault(require("glob-promise"));
|
|
|
76
76
|
var child_process_1 = require("child_process");
|
|
77
77
|
var fs_1 = require("fs");
|
|
78
78
|
var manifest_blocks_1 = require("../manifests/manifest-blocks");
|
|
79
|
-
var promises_1 = require("fs/promises");
|
|
80
79
|
var manifest_views_1 = require("../manifests/manifest-views");
|
|
81
80
|
var getRepoName_1 = require("../../utils/getRepoName");
|
|
82
81
|
var updateEnvFile_1 = require("../../utils/updateEnvFile");
|
|
@@ -139,11 +138,11 @@ function createNextApp(opts) {
|
|
|
139
138
|
// Sync important files during development, as they change
|
|
140
139
|
_b.sent();
|
|
141
140
|
// Also sync APIs into the APIs folder
|
|
142
|
-
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}"])];
|
|
143
142
|
case 7:
|
|
144
143
|
// Also sync APIs into the APIs folder
|
|
145
144
|
_b.sent();
|
|
146
|
-
return [4 /*yield*/, syncAPIProxies((0, path_1.join)(
|
|
145
|
+
return [4 /*yield*/, syncAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
|
|
147
146
|
// Sync the public folder
|
|
148
147
|
];
|
|
149
148
|
case 8:
|
|
@@ -175,7 +174,7 @@ function createNextApp(opts) {
|
|
|
175
174
|
// Sync favicon
|
|
176
175
|
_b.sent();
|
|
177
176
|
// Write APIs proxy code
|
|
178
|
-
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"))
|
|
179
178
|
// Remove pages/api/trpc directory if no _rpc is found
|
|
180
179
|
];
|
|
181
180
|
case 16:
|
|
@@ -183,30 +182,30 @@ function createNextApp(opts) {
|
|
|
183
182
|
_b.sent();
|
|
184
183
|
// Remove pages/api/trpc directory if no _rpc is found
|
|
185
184
|
console.log({
|
|
186
|
-
index: (0, path_1.join)(opts.baseDirectory, "
|
|
187
|
-
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"),
|
|
188
187
|
});
|
|
189
|
-
if (!(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "
|
|
190
|
-
!(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"))) {
|
|
191
190
|
// removeSync(join(serverlessDirectory, "pages/api/trpc"))
|
|
192
191
|
}
|
|
193
192
|
_b.label = 17;
|
|
194
|
-
case 17:
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
193
|
+
case 17:
|
|
194
|
+
// Create manifests
|
|
195
|
+
return [4 /*yield*/, initManifests(serverlessDirectory, opts.dev)
|
|
196
|
+
// Update packages
|
|
197
|
+
];
|
|
198
198
|
case 18:
|
|
199
|
+
// Create manifests
|
|
199
200
|
_b.sent();
|
|
200
|
-
|
|
201
|
+
if (!!isVercel) return [3 /*break*/, 20];
|
|
202
|
+
sendSignal({ code: "packaging" });
|
|
203
|
+
return [4 /*yield*/, updatePackages(serverlessDirectory)];
|
|
201
204
|
case 19:
|
|
202
|
-
sendSignal({ code: "compiling" });
|
|
203
|
-
// Create manifests
|
|
204
|
-
return [4 /*yield*/, initManifests(serverlessDirectory, opts.dev)
|
|
205
|
-
// Start
|
|
206
|
-
];
|
|
207
|
-
case 20:
|
|
208
|
-
// Create manifests
|
|
209
205
|
_b.sent();
|
|
206
|
+
_b.label = 20;
|
|
207
|
+
case 20:
|
|
208
|
+
sendSignal({ code: "compiling" });
|
|
210
209
|
if (!opts.dev) return [3 /*break*/, 23];
|
|
211
210
|
return [4 /*yield*/, getPort(3000)
|
|
212
211
|
// Write the endpoint URL to .env
|
|
@@ -327,7 +326,8 @@ function writeAPIProxies(sourceFolder, targetFolder) {
|
|
|
327
326
|
var outputPath = (0, path_1.join)(targetFolder, name);
|
|
328
327
|
if (name.includes("_rpc"))
|
|
329
328
|
return;
|
|
330
|
-
|
|
329
|
+
(0, fs_extra_1.ensureFileSync)((0, path_1.join)(outputPath));
|
|
330
|
+
return (0, fs_extra_1.writeFile)(outputPath, "import handler from \"".concat(file, "\"; export default handler;"));
|
|
331
331
|
}))];
|
|
332
332
|
case 2:
|
|
333
333
|
_a.sent();
|
|
@@ -339,7 +339,8 @@ function writeAPIProxies(sourceFolder, targetFolder) {
|
|
|
339
339
|
function syncAPIProxies(sourceFolder, targetFolder) {
|
|
340
340
|
return __awaiter(this, void 0, void 0, function () {
|
|
341
341
|
return __generator(this, function (_a) {
|
|
342
|
-
|
|
342
|
+
console.log("Syncing files", sourceFolder, targetFolder);
|
|
343
|
+
return [2 /*return*/, syncFiles(sourceFolder, targetFolder, ["**/*"], function (inputPath) {
|
|
343
344
|
if (inputPath.includes("_rpc"))
|
|
344
345
|
return null;
|
|
345
346
|
return "import handler from \"".concat(inputPath.replace(/\.(ts|js)x?$/, ""), "\"; export default handler;");
|
|
@@ -389,7 +390,8 @@ function syncFiles(sourceFolder, targetFolder, patterns, proxy) {
|
|
|
389
390
|
if (proxy) {
|
|
390
391
|
var output = proxy((0, path_1.relative)(targetFolder, (0, path_1.join)(sourceFolder, path)), (0, path_1.join)(targetFolder, path));
|
|
391
392
|
if (typeof output === "string") {
|
|
392
|
-
(0,
|
|
393
|
+
(0, fs_extra_1.ensureFileSync)((0, path_1.join)(targetFolder, path));
|
|
394
|
+
(0, fs_extra_1.writeFile)((0, path_1.join)(targetFolder, path), output);
|
|
393
395
|
}
|
|
394
396
|
}
|
|
395
397
|
else {
|
|
@@ -463,7 +465,7 @@ function initManifests(dir, dev) {
|
|
|
463
465
|
isServerless: true,
|
|
464
466
|
onGenerate: function (manifest) { return __awaiter(_this, void 0, void 0, function () {
|
|
465
467
|
return __generator(this, function (_a) {
|
|
466
|
-
(0,
|
|
468
|
+
(0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, "manifest_blocks.ts"), manifest);
|
|
467
469
|
return [2 /*return*/];
|
|
468
470
|
});
|
|
469
471
|
}); },
|
|
@@ -476,7 +478,7 @@ function initManifests(dir, dev) {
|
|
|
476
478
|
isServerless: true,
|
|
477
479
|
onGenerate: function (manifest) { return __awaiter(_this, void 0, void 0, function () {
|
|
478
480
|
return __generator(this, function (_a) {
|
|
479
|
-
(0,
|
|
481
|
+
(0, fs_extra_1.writeFile)((0, path_1.resolve)(dir, "manifest_views.ts"), manifest);
|
|
480
482
|
return [2 /*return*/];
|
|
481
483
|
});
|
|
482
484
|
}); },
|
|
@@ -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({
|
|
@@ -15,7 +15,7 @@ const validProxyPaths = {
|
|
|
15
15
|
|
|
16
16
|
export default async function (req: any, res: any) {
|
|
17
17
|
// Ensure that the request is for a proxy path
|
|
18
|
-
const proxyPath = validProxyPaths[req.query.method
|
|
18
|
+
const proxyPath = validProxyPaths[req.query.method as keyof typeof validProxyPaths]!
|
|
19
19
|
|
|
20
20
|
if (!proxyPath) {
|
|
21
21
|
return res.status(404).json({
|