feat(basic-starter): update dependencies and components

chapter-three · Nov 5, 2021 · 233549b · 233549b · vercel · Nov 5, 2021
1 parent 8c3207b
commit 233549b
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 185 deletions.
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
   "scripts": {
     "test": "jest",
     "dev": "lerna run --parallel --ignore basic-starter dev",
+    "dev:starter": "lerna run --parallel --scope drupal-site --scope basic-starter dev",
     "prepare": "lerna run prepare",
     "watch": "lerna run watch",
     "lint": "eslint --cache --ext .js,.jsx .",

diff --git a/...starter/components/nodes/node-article.tsx → ...basic-starter/components/node-article.tsx b/...starter/components/nodes/node-article.tsx → ...basic-starter/components/node-article.tsx
@@ -1,7 +1,7 @@
 import Image from "next/image"
 import Link from "next/link"
 
-import { formatDate } from "../../lib/format-date"
+import { formatDate } from "../lib/format-date"
 
 export function NodeArticle({ node, ...props }) {
   return (

diff --git a/...rter/components/nodes/node-basic-page.tsx → ...ic-starter/components/node-basic-page.tsx b/...rter/components/nodes/node-basic-page.tsx → ...ic-starter/components/node-basic-page.tsx
diff --git a/starters/basic-starter/pages/[...slug].tsx b/starters/basic-starter/pages/[...slug].tsx
@@ -1,18 +1,22 @@
 import * as React from "react"
 import Head from "next/head"
 import {
+  DrupalNode,
   getPathsFromContext,
   getResourceFromContext,
   getResourceTypeFromContext,
 } from "next-drupal"
-import { GetStaticPropsContext } from "next"
-import { NodeArticle } from "@/nodes/node-article"
-import { NodeBasicPage } from "@/components/nodes/node-basic-page"
+import {
+  GetStaticPathsResult,
+  GetStaticPropsContext,
+  GetStaticPropsResult,
+} from "next"
+import { NodeArticle } from "@/components/node-article"
+import { NodeBasicPage } from "@/components/node-basic-page"
 
-/* eslint-disable  @typescript-eslint/no-explicit-any */
 interface NodePageProps {
   preview: GetStaticPropsContext["preview"]
-  node: Record<string, any>
+  node: DrupalNode
 }
 
 export default function NodePage({ node, preview }: NodePageProps) {
@@ -49,14 +53,16 @@ export default function NodePage({ node, preview }: NodePageProps) {
   )
 }
 
-export async function getStaticPaths(context) {
+export async function getStaticPaths(context): Promise<GetStaticPathsResult> {
   return {
     paths: await getPathsFromContext(["node--article", "node--page"], context),
-    fallback: true,
+    fallback: "blocking",
   }
 }
 
-export async function getStaticProps(context) {
+export async function getStaticProps(
+  context
+): Promise<GetStaticPropsResult<NodePageProps>> {
   const type = await getResourceTypeFromContext(context)
 
   if (!type) {
@@ -72,7 +78,7 @@ export async function getStaticProps(context) {
     }
   }
 
-  const node = await getResourceFromContext(type, context, {
+  const node = await getResourceFromContext<DrupalNode>(type, context, {
     params,
   })
 
@@ -87,6 +93,6 @@ export async function getStaticProps(context) {
       preview: context.preview || false,
       node,
     },
-    revalidate: 60,
+    revalidate: 10,
   }
 }
diff --git a/starters/basic-starter/pages/index.tsx b/starters/basic-starter/pages/index.tsx
@@ -1,8 +1,13 @@
 import Head from "next/head"
-import { getResourceCollectionFromContext } from "next-drupal"
-import { NodeArticleTeaser } from "@/components/nodes/node-article"
+import { DrupalNode, getResourceCollectionFromContext } from "next-drupal"
+import { NodeArticleTeaser } from "@/components/node-article"
+import { GetStaticPropsResult } from "next"
 
-export default function IndexPage({ articles }) {
+interface IndexPageProps {
+  nodes: DrupalNode[]
+}
+
+export default function IndexPage({ nodes }: IndexPageProps) {
   return (
     <>
       <Head>
@@ -15,23 +20,25 @@ export default function IndexPage({ articles }) {
       <div>
         <h1 className="text-6xl font-black mb-10">Latest Articles.</h1>
 
-        {articles?.length ? (
-          articles.map((node) => (
+        {nodes?.length ? (
+          nodes.map((node) => (
             <div key={node.id}>
               <NodeArticleTeaser node={node} />
               <hr className="my-20" />
             </div>
           ))
         ) : (
-          <p className="py-4">No articles found</p>
+          <p className="py-4">No nodes found</p>
         )}
       </div>
     </>
   )
 }
 
-export async function getStaticProps(context) {
-  const articles = await getResourceCollectionFromContext(
+export async function getStaticProps(
+  context
+): Promise<GetStaticPropsResult<IndexPageProps>> {
+  const nodes = await getResourceCollectionFromContext<DrupalNode[]>(
     "node--article",
     context,
     {
@@ -44,8 +51,8 @@ export async function getStaticProps(context) {
 
   return {
     props: {
-      articles,
+      nodes,
     },
-    revalidate: 60,
+    revalidate: 10,
   }
 }