eddev 0.2.0-beta.41 → 0.2.0-beta.42

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.
Files changed (2) hide show
  1. package/build/serverless/create-next-app.js +39 -42
  2. package/package.json +1 -1
package/build/serverless/create-next-app.js CHANGED
@@ -108,18 +108,13 @@ function createNextApp(opts) {
108
108
  case 3:
109
109
  // Copy the template folder
110
110
  _b.sent();
111
- if (!!isVercel) return [3 /*break*/, 5];
112
- return [4 /*yield*/, updatePackagesFile(opts.baseDirectory, serverlessDirectory)];
111
+ // Update package.json
112
+ return [4 /*yield*/, updatePackagesFile((0, path_1.resolve)(__dirname, "../../serverless-template"), opts.baseDirectory)];
113
113
  case 4:
114
+ // Update package.json
114
115
  _b.sent();
115
- return [3 /*break*/, 7];
116
- case 5: return [4 /*yield*/, updatePackagesFile(opts.baseDirectory, (0, path_1.resolve)(__dirname, "../../serverless-template"))];
117
- case 6:
118
- _b.sent();
119
- _b.label = 7;
120
- case 7:
121
116
  assetPaths = ((_a = requireConfig(opts.baseDirectory).serverless) === null || _a === void 0 ? void 0 : _a.themeAssets) || [];
122
- if (!!isVercel) return [3 /*break*/, 14];
117
+ if (!!isVercel) return [3 /*break*/, 11];
123
118
  // Sync important files during development, as they change
124
119
  return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory, [
125
120
  "blocks/**/*",
@@ -138,50 +133,50 @@ function createNextApp(opts) {
138
133
  ])
139
134
  // Also sync APIs into the APIs folder
140
135
  ];
141
- case 8:
136
+ case 5:
142
137
  // Sync important files during development, as they change
143
138
  _b.sent();
144
139
  // Also sync APIs into the APIs folder
145
140
  return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "apis"), ["**/*.{tsx,ts,js,jsx}"])];
146
- case 9:
141
+ case 6:
147
142
  // Also sync APIs into the APIs folder
148
143
  _b.sent();
149
144
  return [4 /*yield*/, syncAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
150
145
  // Sync the public folder
151
146
  ];
152
- case 10:
147
+ case 7:
153
148
  _b.sent();
154
- if (!assetPaths.length) return [3 /*break*/, 12];
149
+ if (!assetPaths.length) return [3 /*break*/, 9];
155
150
  return [4 /*yield*/, syncFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
156
- case 11:
151
+ case 8:
157
152
  _b.sent();
158
- _b.label = 12;
159
- case 12:
153
+ _b.label = 9;
154
+ case 9:
160
155
  // Sync favicon
161
156
  return [4 /*yield*/, syncFiles((0, path_1.join)(opts.baseDirectory), (0, path_1.join)(serverlessDirectory, "public/"), ["favicon.ico"])];
162
- case 13:
157
+ case 10:
163
158
  // Sync favicon
164
159
  _b.sent();
165
- return [3 /*break*/, 19];
166
- case 14:
167
- if (!assetPaths.length) return [3 /*break*/, 16];
160
+ return [3 /*break*/, 16];
161
+ case 11:
162
+ if (!assetPaths.length) return [3 /*break*/, 13];
168
163
  return [4 /*yield*/, copyFiles(opts.baseDirectory, (0, path_1.join)(serverlessDirectory, "public/wp-content/themes/".concat(repoName.repoName)), assetPaths)];
169
- case 15:
164
+ case 12:
170
165
  _b.sent();
171
- _b.label = 16;
172
- case 16:
166
+ _b.label = 13;
167
+ case 13:
173
168
  // Sync favicon
174
169
  return [4 /*yield*/, copyFiles((0, path_1.join)(opts.baseDirectory), (0, path_1.join)(serverlessDirectory, "public/"), ["favicon.ico"])
175
170
  // Write APIs proxy code
176
171
  ];
177
- case 17:
172
+ case 14:
178
173
  // Sync favicon
179
174
  _b.sent();
180
175
  // Write APIs proxy code
181
176
  return [4 /*yield*/, writeAPIProxies((0, path_1.join)(opts.baseDirectory, "apis"), (0, path_1.join)(serverlessDirectory, "pages/api"))
182
177
  // Remove pages/api/trpc directory if no _rpc is found
183
178
  ];
184
- case 18:
179
+ case 15:
185
180
  // Write APIs proxy code
186
181
  _b.sent();
187
182
  // Remove pages/api/trpc directory if no _rpc is found
@@ -193,28 +188,28 @@ function createNextApp(opts) {
193
188
  !(0, fs_1.existsSync)((0, path_1.join)(opts.baseDirectory, "apis/_rpc.ts"))) {
194
189
  // removeSync(join(serverlessDirectory, "pages/api/trpc"))
195
190
  }
196
- _b.label = 19;
197
- case 19:
191
+ _b.label = 16;
192
+ case 16:
198
193
  // Create manifests
199
194
  return [4 /*yield*/, initManifests(serverlessDirectory, opts.dev)
200
195
  // Update packages
201
196
  ];
202
- case 20:
197
+ case 17:
203
198
  // Create manifests
204
199
  _b.sent();
205
- if (!!isVercel) return [3 /*break*/, 22];
200
+ if (!!isVercel) return [3 /*break*/, 19];
206
201
  sendSignal({ code: "packaging" });
207
202
  return [4 /*yield*/, updatePackages(serverlessDirectory)];
208
- case 21:
203
+ case 18:
209
204
  _b.sent();
210
- _b.label = 22;
211
- case 22:
205
+ _b.label = 19;
206
+ case 19:
212
207
  sendSignal({ code: "compiling" });
213
- if (!opts.dev) return [3 /*break*/, 25];
208
+ if (!opts.dev) return [3 /*break*/, 22];
214
209
  return [4 /*yield*/, getPort(3000)
215
210
  // Write the endpoint URL to .env
216
211
  ];
217
- case 23:
212
+ case 20:
218
213
  port = _b.sent();
219
214
  // Write the endpoint URL to .env
220
215
  (0, updateEnvFile_1.updateEnvFile)({
@@ -223,17 +218,17 @@ function createNextApp(opts) {
223
218
  sendSignal({ code: "url", url: "http://127.0.0.1:".concat(port) });
224
219
  // await devNext(serverlessDirectory, port)
225
220
  return [4 /*yield*/, runScript(serverlessDirectory, ["dev", "--port", String(port)])];
226
- case 24:
221
+ case 21:
227
222
  // await devNext(serverlessDirectory, port)
228
223
  _b.sent();
229
- return [3 /*break*/, 27];
230
- case 25:
231
- if (!opts.build) return [3 /*break*/, 27];
224
+ return [3 /*break*/, 24];
225
+ case 22:
226
+ if (!opts.build) return [3 /*break*/, 24];
232
227
  return [4 /*yield*/, runScript(serverlessDirectory, ["build"])];
233
- case 26:
228
+ case 23:
234
229
  _b.sent();
235
- _b.label = 27;
236
- case 27: return [2 /*return*/];
230
+ _b.label = 24;
231
+ case 24: return [2 /*return*/];
237
232
  }
238
233
  });
239
234
  });
@@ -273,6 +268,8 @@ function copyTemplate(targetFolder) {
273
268
  case 1:
274
269
  files = _a.sent();
275
270
  return [4 /*yield*/, Promise.all(files.map(function (src) {
271
+ if (src.includes("package.json"))
272
+ return null;
276
273
  var dest = src.replace(sourceFolder, targetFolder);
277
274
  return (0, fs_extra_1.copy)(src, dest);
278
275
  }))];
@@ -309,7 +306,7 @@ function updatePackagesFile(sourceFolder, targetFolder) {
309
306
  targetPackageFile = (0, path_1.resolve)(targetFolder, "package.json");
310
307
  sourcePackage = require(sourcePackageFile);
311
308
  targetPackage = require(targetPackageFile);
312
- mergedPackage = __assign(__assign({}, targetPackage), { dependencies: __assign(__assign({}, (targetPackage.dependencies || {})), (sourcePackage.dependencies || {})), devDependencies: __assign(__assign({}, (targetPackage.devDependencies || {})), (sourcePackage.devDependencies || {})) });
309
+ mergedPackage = __assign(__assign({}, sourcePackage), { dependencies: __assign(__assign({}, (sourcePackage.dependencies || {})), (targetPackage.dependencies || {})), devDependencies: __assign(__assign({}, (sourcePackage.devDependencies || {})), (targetPackage.devDependencies || {})) });
313
310
  (0, fs_extra_1.writeJSON)(targetPackageFile, mergedPackage, {
314
311
  spaces: 2,
315
312
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eddev",
3
- "version": "0.2.0-beta.41",
3
+ "version": "0.2.0-beta.42",
4
4
  "main": "./index.js",
5
5
  "license": "MIT",
6
6
  "bin": {