eddev 0.2.2 → 0.2.5

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

@@ -126,14 +126,11 @@ function createNextApp(opts) {
                             "components/**/*",
                             "hooks/**/*",
                             "queries/**/*",
-                            ".env",
                             "views/**/*",
-                            "theme.css.tsx",
-                            "types.graphql.ts",
-                            "types.views.ts",
-                            "types.blocks.ts",
-                            "types.api.ts",
                             "utils/**/*",
+                            ".env",
+                            "*.ts",
+                            "*.tsx",
                             "ed.config.json",
                         ])
                         // Also sync APIs into the APIs folder

package/components/BrowserRouter.js

@@ -68,11 +68,13 @@ function BrowserRouter(props) {
             setIsLoading(true);
         }
         (0, remoteProps_1.fetchProps)(pending.url).then(function (data) {
+            console.log("FETCHED", data);
             var view = views_1.default[data.view];
+            var nextUrl = data.canonical || pending.url;
             var finish = function () {
                 var _a, _b;
                 setState({
-                    url: pending.url,
+                    url: nextUrl,
                     data: data,
                 });
                 // setData(data)
@@ -86,7 +88,7 @@ function BrowserRouter(props) {
                 setIsLoading(false);
                 if (!pending.popped) {
                     history.replaceState({ scrollPosition: (_b = document.scrollingElement) === null || _b === void 0 ? void 0 : _b.scrollTop }, "", document.location.href);
-                    history.pushState({}, "", pending.url);
+                    history.pushState({}, "", nextUrl);
                 }
             };
             if (view && view.preload) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.2",
+  "version": "0.2.5",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

package/routing/remoteProps.d.ts

@@ -8,6 +8,8 @@ export interface RouteData {
     viewType: "react" | "html";
     viewData: any;
     appData: any;
+    redirect?: string;
+    canonical?: string;
     meta?: {
         head: ParsedRouteTags;
         footer: ParsedRouteTags;

package/routing/remoteProps.js

@@ -78,6 +78,13 @@ function fetchProps(url) {
             promise = fetch(requestUrl)
                 .then(function (response) { return response.json(); })
                 .then(function (data) {
+                if (data.redirect) {
+                    var redirect_1 = data.redirect;
+                    return fetchProps(redirect_1).then(function (data) {
+                        data.canonical = redirect_1;
+                        return data;
+                    });
+                }
                 delete pending[cacheKey];
                 cache[cacheKey] = data;
                 return data;

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

@@ -42,8 +42,18 @@ export async function fetchWordpressProps(pathname: string) {
     return url
   })
 
+  const payload = JSON.parse(text)
+
+  if (payload.redirect) {
+    return {
+      status: payload.code,
+      redirect: true,
+      uri: payload.redirect,
+    }
+  }
+
   return {
     status: response.status,
-    data: JSON.parse(text),
+    data: payload,
   }
 }

package/serverless-template/pages/[...slug].tsx

@@ -14,10 +14,18 @@ export async function getStaticPaths(): Promise<GetStaticPathsResult> {
 
 export async function getStaticProps({ params }: GetStaticPropsContext): Promise<GetStaticPropsResult<any>> {
   const result = await fetchWordpressProps((params?.slug as string[]).join("/"))
+  console.log("RESULT", result)
   if (result.status === 404) {
     return {
       notFound: true,
     }
+  } else if (result.redirect) {
+    return {
+      redirect: {
+        destination: result.uri,
+        permanent: result.status === 301,
+      },
+    }
   }
   return {
     props: result.data,