eddev 0.2.0-beta.3 → 0.2.0-beta.7

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

@@ -61,63 +61,57 @@ var promises_1 = require("fs/promises");
 var manifest_views_1 = require("../manifests/manifest-views");
 function createNextApp(opts) {
     return __awaiter(this, void 0, void 0, function () {
-        var serverlessDirectory;
+        var isVercel, serverlessDirectory;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    serverlessDirectory = (0, path_1.resolve)(opts.baseDirectory, ".serverless");
-                    // Clean first
-                    return [4 /*yield*/, clean(serverlessDirectory)
-                        // Copy the template folder
-                    ];
+                    isVercel = process.env.VERCEL;
+                    serverlessDirectory = isVercel ? opts.baseDirectory : (0, path_1.resolve)(opts.baseDirectory, ".serverless");
+                    if (!!isVercel) return [3 /*break*/, 2];
+                    return [4 /*yield*/, clean(serverlessDirectory)];
                 case 1:
-                    // Clean first
-                    _a.sent();
-                    // Copy the template folder
-                    return [4 /*yield*/, copyTemplate(serverlessDirectory)
-                        // Update package.json
-                    ];
-                case 2:
-                    // Copy the template folder
                     _a.sent();
+                    _a.label = 2;
+                case 2: 
+                // Copy the template folder
+                return [4 /*yield*/, copyTemplate(serverlessDirectory)
                     // Update package.json
-                    return [4 /*yield*/, updatePackagesFile(opts.baseDirectory, serverlessDirectory)
-                        // Update packages
-                        // TODO: On vercel, can we maybe just symlink or copy node_modules?
-                    ];
+                ];
                 case 3:
-                    // Update package.json
+                    // Copy the template folder
                     _a.sent();
-                    // Update packages
-                    // TODO: On vercel, can we maybe just symlink or copy node_modules?
-                    return [4 /*yield*/, updatePackages(serverlessDirectory)
-                        // Symlink important files and directories
-                    ];
+                    if (!!isVercel) return [3 /*break*/, 5];
+                    return [4 /*yield*/, updatePackagesFile(opts.baseDirectory, serverlessDirectory)];
                 case 4:
-                    // Update packages
-                    // TODO: On vercel, can we maybe just symlink or copy node_modules?
                     _a.sent();
-                    // Symlink important files and directories
-                    return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory)
-                        // Create manifests
-                    ];
+                    _a.label = 5;
                 case 5:
-                    // Symlink important files and directories
+                    if (!!isVercel) return [3 /*break*/, 7];
+                    return [4 /*yield*/, updatePackages(serverlessDirectory)];
+                case 6:
+                    _a.sent();
+                    _a.label = 7;
+                case 7:
+                    if (!!isVercel) return [3 /*break*/, 9];
+                    return [4 /*yield*/, syncFiles(opts.baseDirectory, serverlessDirectory)];
+                case 8:
                     _a.sent();
+                    _a.label = 9;
+                case 9:
                     // Create manifests
                     initManifests(serverlessDirectory, opts.dev);
-                    if (!opts.dev) return [3 /*break*/, 7];
+                    if (!opts.dev) return [3 /*break*/, 11];
                     return [4 /*yield*/, runScript(serverlessDirectory, "dev")];
-                case 6:
+                case 10:
                     _a.sent();
-                    return [3 /*break*/, 9];
-                case 7:
-                    if (!opts.build) return [3 /*break*/, 9];
+                    return [3 /*break*/, 13];
+                case 11:
+                    if (!opts.build) return [3 /*break*/, 13];
                     return [4 /*yield*/, runScript(serverlessDirectory, "build")];
-                case 8:
+                case 12:
                     _a.sent();
-                    _a.label = 9;
-                case 9: return [2 /*return*/];
+                    _a.label = 13;
+                case 13: return [2 /*return*/];
             }
         });
     });

package/package.json

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

package/serverless-template/_utils/fetch-wordpress-props.ts

@@ -1,15 +1,15 @@
 export async function fetchWordpressProps(pathname: string) {
   const origin = (process.env.SITE_URL as string).replace(/\/$/, "")
   pathname = pathname.replace(/(^\/|\/$)/g, "")
-
-  const propsURL = origin + "/" + pathname + (pathname === "/" ? "" : "/") + "?_props=all"
+  const propsURL = origin + ("/" + pathname + "/?_props=all").replace(/\/+/, "/")
   let response = await fetch(propsURL)
   let text = await response.text()
 
   // Convert absolute site URL details to relative paths
   // console.log("WAS", text)
-  console.log("REPLACING", origin, propsURL, response.status, response.statusText)
-  text = text.replaceAll(origin, "")
+  console.log("REPLACING", origin, propsURL, response.status, response.statusText, text)
+  console.log("RESPONSE", response)
+  text = text.replace(new RegExp(origin, "g"), "")
   console.log("NOW", text)
 
   return JSON.parse(text)