eddev 0.2.0-beta.42 → 0.2.0-beta.45

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

@@ -109,7 +109,7 @@ function createNextApp(opts) {
                     // Copy the template folder
                     _b.sent();
                     // Update package.json
-                    return [4 /*yield*/, updatePackagesFile((0, path_1.resolve)(__dirname, "../../serverless-template"), opts.baseDirectory)];
+                    return [4 /*yield*/, updatePackagesFile((0, path_1.resolve)(__dirname, "../../serverless-template"), serverlessDirectory)];
                 case 4:
                     // Update package.json
                     _b.sent();

package/components/NextRouter.js

@@ -17,8 +17,9 @@ var routing_1 = require("../routing");
 var router_1 = require("next/router");
 function NextRouter(_a) {
     var children = _a.children, path = _a.path, data = _a.data;
-    var route = (0, router_1.useRouter)();
-    return ((0, jsx_runtime_1.jsx)(routing_1.RouterRoot, __assign({ url: path, data: data, onNavigateRequest: function (url) {
+    var nextRoute = (0, router_1.useRouter)();
+    var route = __assign(__assign({}, nextRoute), { pathname: nextRoute.asPath });
+    return ((0, jsx_runtime_1.jsx)(routing_1.RouterRoot, __assign({ url: nextRoute.asPath, data: data, onNavigateRequest: function (url) {
             route.push(url);
             // setPendingUrl({ popped: false, url })
         }, onPreload: function (url) {

package/package.json

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

package/routing/routing.js

@@ -329,7 +329,7 @@ exports.Link = (0, react_1.forwardRef)(function (props, ref) {
     // @ts-ignore
     if (process.serverless) {
         var NextLink = require("next/link").default;
-        return ((0, jsx_runtime_1.jsx)(NextLink, __assign({ href: props.href, passHref: true }, { children: (0, jsx_runtime_1.jsx)("a", __assign({}, props, { href: undefined }), void 0) }), void 0));
+        return ((0, jsx_runtime_1.jsx)(NextLink, __assign({ href: props.href, passHref: true }, { children: (0, jsx_runtime_1.jsx)("a", __assign({ ref: ref }, props, { href: undefined }), void 0) }), void 0));
     }
     var localRef = (0, react_1.useRef)();
     var router = (0, react_1.useContext)(RouterContext);

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

@@ -20,6 +20,7 @@ export async function fetchWordpressProps(pathname: string) {
   // Convert absolute site URL details to relative paths
   text = text.replace(new RegExp(origin.replace(/(http|https)/, `https?`) + "([a-z0-9-_./]+)", "g"), (url) => {
     const path = url.replace(/https?:\/\/[^\/]+/, "")
+    console.log("URL", url, path)
     if (path.startsWith("/wp-content/uploads/")) {
       if (settings?.uploads === "proxy") {
         return path
@@ -38,6 +39,8 @@ export async function fetchWordpressProps(pathname: string) {
       } else if (settings?.uploads === "remote") {
         return url
       }
+    } else {
+      return path
     }
     return url
   })