upgrade gatsby

gatsby-node.ts

@@ -132,7 +132,22 @@ function transformMetaToNodeData(
   return {
     dateTaken: metaData.DateTimeOriginal,
     meta: {
-      ...metaData,
+      Make: metaData.Make,
+      Model: metaData.Model,
+      ExposureTime: metaData.ExposureTime,
+      FNumber: metaData.FNumber,
+      ISO: metaData.ISO,
+      DateTimeOriginal: metaData.DateTimeOriginal,
+      CreateDate: metaData.CreateDate,
+      ShutterSpeedValue: metaData.ShutterSpeedValue,
+      ApertureValue: metaData.ApertureValue,
+      FocalLength: metaData.FocalLength,
+      LensModel: metaData.LensModel,
+      ObjectName: metaData.ObjectName,
+      Caption: metaData.Caption,
+      City: metaData.City,
+      State: metaData.State,
+      Rating: metaData.Rating,
       Keywords,
     },
     vibrant,

package.json

@@ -22,7 +22,8 @@
     "pretty": "prettier --write ."
   },
   "resolutions": {
-    "@types/react": "^17.0.38"
+    "@types/react": "^17.0.38",
+    "xstate": "4.9.1"
   },
   "dependencies": {
     "@adobe/react-spectrum": "^3.19.0",
@@ -42,28 +43,28 @@
     "eslint-webpack-plugin": "^2.5.4",
     "exifr": "^7.1.3",
     "fast-exif": "^1.0.1",
-    "gatsby": "^4.24.4",
+    "gatsby": "^5.0.1",
-    "gatsby-plugin-eslint": "^3.0.0",
+    "gatsby-plugin-eslint": "^4.0.3",
-    "gatsby-plugin-image": "^2.24.0",
+    "gatsby-plugin-image": "^3.0.0",
-    "gatsby-plugin-manifest": "^4.24.0",
+    "gatsby-plugin-manifest": "^5.0.0",
-    "gatsby-plugin-mdx": "^2.7.1",
+    "gatsby-plugin-mdx": "^5.0.0",
-    "gatsby-plugin-postcss": "^5.24.0",
+    "gatsby-plugin-postcss": "^6.0.0",
     "gatsby-plugin-preval": "^1.0.0",
-    "gatsby-plugin-react-helmet": "^5.17.0",
+    "gatsby-plugin-react-helmet": "^6.0.0",
-    "gatsby-plugin-robots-txt": "^1.6.2",
+    "gatsby-plugin-robots-txt": "^1.8.0",
-    "gatsby-plugin-sharp": "^4.24.0",
+    "gatsby-plugin-sharp": "^5.0.0",
-    "gatsby-source-filesystem": "^4.24.0",
+    "gatsby-source-filesystem": "^5.0.0",
-    "gatsby-transformer-sharp": "^4.24.0",
+    "gatsby-transformer-sharp": "^5.0.0",
     "kebab-case": "^1.0.1",
     "node-iptc": "^1.0.5",
     "node-vibrant": "3.1.6",
     "postcss": "^8.4.18",
     "postcss-nested": "^6.0.0",
     "ramda": "^0.27.1",
-    "react": "^17.0.1",
+    "react": "^18.2.0",
     "react-cool-dimensions": "^2.0.7",
     "react-div-100vh": "^0.7.0",
-    "react-dom": "^17.0.1",
+    "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
     "sass": "^1.34.0",
     "tailwindcss": "^3.2.0",

src/components/Nav.tsx

@@ -11,7 +11,7 @@ const navClasses =
 const ExternalLinks = ({ isVertical }: { isVertical: boolean }) => (
   <ul
     className={classnames(
-      "z-30 bg-vibrant-dark rounded-xl overflow-hidden",
+      "z-30 overflow-hidden",
       isVertical
         ? "inline-flex flex-wrap justify-center bg-vibrant-dark rounded-xl"
         : "absolute rounded-md top-[40px] border border-vibrant-light"

src/pages/asdf-resume.mdx

@@ -1,10 +0,0 @@
----
-title: Charles Dries Resume
----
-
-import ResumeLayout from "../components/resume/ResumeLayout";
-export default ResumeLayout;
-
-# Hello, World!
-
-<h2>{props.pageContext.frontmatter.title}</h2>

src/pages/index.tsx

@@ -219,70 +219,15 @@ const IndexPage = ({
             style={{ gridArea: "1/1" }}
           ></div>
         )}
-        {imageIsLandscape && (
-          <div className="hidden portrait:flex justify-center sm:my-2">
-            <ActionButtons
-              image={image}
-              isClient={isClient}
-              shuffleImage={shuffleImage}
-            />
-          </div>
-        )}
       </main>
     </>
   );
 };
 
-export const query = graphql`
+export const query = graphql`query IndexPage {
-  query IndexPage {
   allFile(
-      filter: {
+    filter: {sourceInstanceName: {eq: "gallery"}, base: {in: ["DSC02615-2.jpg"]}}
-        sourceInstanceName: { eq: "gallery" }
+    sort: {fields: {imageMeta: {dateTaken: DESC}}}
-        base: {
-          in: [
-            # "DSC06616.jpg" # B&W abstract ## KEEP ON TOP
-            # "20160530-DSC09108.jpg" # portrait red flowers
-            # # "DSC00201.jpg" # duck
-            # "DSC04905.jpg" # purple layers
-            # "DSC05761.jpg" # monument valley
-            # "DSC05851.jpg" # utahn highway sunset
-            # # "DSC06245.jpg" # snowy milky way
-            # # # "DSC08521.jpg" # firepit bloom j&e
-            # # "DSC07490.jpg" # house on prairie
-            # # "DSC02538.jpg" # portrait pink cactus bloom
-            # # "20190624-DSC00771.jpg" # glacier forest fog
-            # # # "DSC00237.jpg" # cotton candy clouds
-            # "_DSC6062.jpg" # field of wildflowers
-            # # "_DSC6060.jpg" # edge of the world
-            # "_DSC6219.jpg" # whihte/yellow rosebush
-            # # "_DSC6243.jpg" # bright rose in darkness
-            # # "_DSC6400-2.jpg" # Horsetail falls
-            # # "_DSC6798.jpg" # Japanese zen garden
-            # # "_DSC6481.jpg" # Mt Hood from Powell Butte
-            # # "_DSC5916.jpg" # blue dart stinger
-            # # "_DSC0286.jpg" # god rays
-            # # "_DSC8998.jpg" # forest road
-            # # "DSC01169.jpg" # ferris wheel reflection
-            # "DSC01800.jpg" # cherry blossom landscape sunny sky
-            # "DSC01772.jpg" # cherry blossom portrait sunny sky
-            # # "DSC06201.jpg" # Wheatland snowy hills
-            # "DSC01924.jpg" # cherry blossom sea
-            # # "DSC03157.jpg" # constellation of flowers
-            # "DSC02610.jpg" # peter iredale portrait
-            # "DSC02615.jpg" # rori iredale beach field camera
-            "DSC02615-2.jpg" # same but red
-            # "DSC06490.jpg" # Japanese garden steps
-            # "DSC06687.jpg" # Multnomah Falls long exposure
-            # "DSC09932.jpg" # milky way
-            # "DSC09944.jpg" # milky way rori
-            # "DSC03725.jpg" # oregon coast lighthouse
-            # "DSC03750.jpg"
-            # "DSC03804.jpg"
-            # "DSC04122.jpg" # shoot the light wheel hallway
-          ]
-        }
-      }
-      sort: { order: DESC, fields: fields___imageMeta___dateTaken }
   ) {
     nodes {
       relativePath
@@ -306,7 +251,6 @@ export const query = graphql`
       }
     }
   }
-  }
+}`;
-`;
 
 export default IndexPage;

src/pages/photogallery.tsx

@@ -241,11 +241,10 @@ const GalleryPage = ({ data }: PageProps<Queries.GalleryPageQueryQuery>) => {
   );
 };
 
-export const query = graphql`
+export const query = graphql`query GalleryPageQuery {
-  query GalleryPageQuery {
   allFile(
     filter: {sourceInstanceName: {eq: "gallery"}}
-      sort: { fields: fields___imageMeta___dateTaken, order: DESC }
+    sort: {fields: {imageMeta: {dateTaken: DESC}}}
   ) {
     nodes {
       relativePath
@@ -254,11 +253,7 @@ export const query = graphql`
         fluid {
           aspectRatio
         }
-          gatsbyImageData(
+        gatsbyImageData(layout: CONSTRAINED, height: 550, placeholder: DOMINANT_COLOR)
-            layout: CONSTRAINED
-            height: 550
-            placeholder: DOMINANT_COLOR
-          )
       }
       fields {
         imageMeta {
@@ -277,7 +272,6 @@ export const query = graphql`
       }
     }
   }
-  }
+}`;
-`;
 
 export default GalleryPage;

src/utils.ts

@@ -95,7 +95,7 @@ export const getGalleryPageUrl = ({ keyword, sortKey }: galleryPageUrlProps, has
       typeof window !== "undefined"
         ? window.location.origin
         : "https://chuckdries.com"
-    }/`
+    }/photogallery/`
   );
   if (keyword !== undefined) {
     if (keyword === null) {