Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ module.exports = {
],
},
},
`gatsby-transformer-sharp`,
`gatsby-plugin-sharp`,
{
resolve: `gatsby-plugin-csv-feed`,
Expand Down Expand Up @@ -152,6 +151,7 @@ module.exports = {
url: `${site.siteMetadata.siteUrl}${edge.node.fields.slug}`,
})),
output: "/rss.xml",
title: "Clausehound Blog RSS Feed",
},
],
},
Expand Down Expand Up @@ -187,24 +187,14 @@ module.exports = {
},
},
`gatsby-plugin-sitemap`,
{
resolve: "gatsby-plugin-netlify-cache",
options: {
cachePublic: true,
},
},
{
resolve: `gatsby-plugin-facebook-pixel`,
options: {
pixelId: "946837209425086",
},
},
{
resolve: `gatsby-plugin-linkedin-insight`,
options: {
partnerId: `3630777`,
},
},
"gatsby-transformer-sharp",
"gatsby-plugin-image",
],
mapping: {
"MarkdownRemark.frontmatter.author": `AuthorJson`,
Expand Down
19,139 changes: 0 additions & 19,139 deletions package-lock.json

This file was deleted.

71 changes: 37 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,42 @@
"url": "https://github.com/gatsbyjs/gatsby/issues"
},
"dependencies": {
"@material-ui/core": "^4.7.1",
"@material-ui/icons": "^4.5.1",
"gatsby": "^2.18.7",
"gatsby-image": "^2.2.34",
"gatsby-plugin-csv-feed": "^2.0.0",
"@emotion/core": "^10.0.35",
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",
"@mui/icons-material": "^5.2.0",
"@mui/material": "^5.16.4",
"@mui/styles": "^5.16.4",
"gatsby": "^5.14.1",
"gatsby-plugin-csv-feed": "^4.0.1",
"gatsby-plugin-facebook-pixel": "^1.0.8",
"gatsby-plugin-feed": "^2.3.23",
"gatsby-plugin-google-analytics": "^2.1.31",
"gatsby-plugin-feed": "^5.14.0",
"gatsby-plugin-google-analytics": "^5.14.0",
"gatsby-plugin-image": "^3.14.0",
"gatsby-plugin-linkedin-insight": "^1.0.1",
"gatsby-plugin-manifest": "^2.2.31",
"gatsby-plugin-material-ui": "^2.1.6",
"gatsby-plugin-netlify-cache": "^1.2.0",
"gatsby-plugin-offline": "^3.0.27",
"gatsby-plugin-react-helmet": "^3.1.16",
"gatsby-plugin-react-svg": "^2.1.2",
"gatsby-plugin-sharp": "^2.3.5",
"gatsby-plugin-sitemap": "^2.2.25",
"gatsby-plugin-typography": "^2.3.18",
"gatsby-remark-copy-linked-files": "^2.1.31",
"gatsby-plugin-manifest": "^5.14.0",
"gatsby-plugin-material-ui": "^4.1.0",
"gatsby-plugin-offline": "^6.14.0",
"gatsby-plugin-react-helmet": "^6.14.0",
"gatsby-plugin-react-svg": "^3.3.0",
"gatsby-plugin-sharp": "^5.14.0",
"gatsby-plugin-sitemap": "^6.14.0",
"gatsby-plugin-typography": "^5.14.0",
"gatsby-remark-copy-linked-files": "^6.14.0",
"gatsby-remark-external-links": "^0.0.4",
"gatsby-remark-images": "^3.1.35",
"gatsby-remark-prismjs": "^3.3.25",
"gatsby-remark-responsive-iframe": "^2.2.28",
"gatsby-remark-smartypants": "^2.1.17",
"gatsby-source-filesystem": "^2.1.40",
"gatsby-transformer-json": "^2.2.20",
"gatsby-transformer-remark": "^2.6.39",
"gatsby-transformer-sharp": "^2.3.7",
"gatsby-remark-images": "^7.14.0",
"gatsby-remark-prismjs": "^7.14.0",
"gatsby-remark-responsive-iframe": "^6.14.0",
"gatsby-remark-smartypants": "^6.14.0",
"gatsby-source-filesystem": "^5.14.0",
"gatsby-transformer-json": "^5.14.0",
"gatsby-transformer-remark": "^6.14.0",
"gatsby-transformer-sharp": "^5.14.0",
"prismjs": "^1.17.1",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-helmet": "^5.2.1",
"react-typography": "^0.16.19",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-helmet": "^6.1.0",
"react-typography": "^0.16.23",
"slugify": "^1.3.6",
"typeface-merriweather": "0.0.72",
"typeface-montserrat": "0.0.75",
Expand All @@ -50,14 +53,14 @@
},
"devDependencies": {
"@types/node": "^12.12.14",
"@types/react": "^16.9.15",
"@types/react-dom": "^16.9.4",
"@types/react-helmet": "^5.0.14",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@types/react-helmet": "^6.1.11",
"@types/typography": "^0.16.3",
"gatsby-plugin-typescript": "^2.1.20",
"gatsby-plugin-typescript": "^5.14.0",
"prettier": "^1.19.1",
"ts-node": "^8.6.2",
"typescript": "^3.7.3"
"typescript": "^5.7.3"
},
"homepage": "https://github.com/gatsbyjs/gatsby-starter-blog#readme",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion src/components/article-preview.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC, createElement as h, Fragment } from "react";
import { Chip } from "@material-ui/core";
import { Chip } from "@mui/material";
import { Link, navigate } from "gatsby";
import { rhythm } from "../utils/typography";
import { authors } from "../utils/filters";
Expand Down
10 changes: 5 additions & 5 deletions src/components/author.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FC, createElement as h } from "react";
import { makeStyles } from "@material-ui/core/styles";
import { makeStyles } from "@mui/styles";
import { Link } from "gatsby";
import Image, { GatsbyImageProps } from "gatsby-image";
import { GatsbyImage, GatsbyImageProps } from "gatsby-plugin-image";

interface Props {
id: string;
Expand Down Expand Up @@ -51,9 +51,9 @@ const Author: FC<Props> = ({ first, id, image, last }) => {
className: classes.root,
to: `/${id}`,
},
image?.childImageSharp?.fluid &&
h(Image, {
fluid: image.childImageSharp.fluid,
image?.childImageSharp?.gatsbyImageData &&
h(GatsbyImage, {
image: image.childImageSharp.gatsbyImageData,
alt: `picture of ${first}`,
className: classes.avatar,
imgStyle: {
Expand Down
1 change: 0 additions & 1 deletion src/components/bio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import { FC, createElement as h } from "react";
import { useStaticQuery, graphql } from "gatsby";
import Image from "gatsby-image";

import { rhythm } from "../utils/typography";

Expand Down
22 changes: 11 additions & 11 deletions src/components/header.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {
makeStyles,
useScrollTrigger,
useTheme,
} from "@material-ui/core";
import LanguageIcon from "@material-ui/icons/Language";
} from "@mui/material";
import LanguageIcon from "@mui/icons-material/Language";

import Logo from "./logo";

Expand Down Expand Up @@ -58,15 +58,15 @@ const Header: FC<Props> = () => {
ref: head,
style: { position: "sticky" },
},
h(
Link,
{
to: "/",
className: classes.logo,
style: { boxShadow: "none", alignSelf: "flex-end" },
},
h(Logo, { style: { height: "1.2rem", width: "auto" } }),
),
h(
Link,
{
to: "/",
className: classes.logo,
style: { boxShadow: "none", alignSelf: "flex-end" },
},
h(Logo, { style: { height: "1.2rem", width: "auto" } }),
),
),
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/hubspotForm.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC, createElement as h, useEffect } from "react";
import { makeStyles } from "@material-ui/core";
import { makeStyles } from "@mui/styles";
import { trackCustomEvent } from "gatsby-plugin-google-analytics";

const useStyles = makeStyles(theme => ({
Expand Down
17 changes: 7 additions & 10 deletions src/components/layout.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { FC, createElement as h } from "react";
import { Link } from "gatsby";
import {
createMuiTheme,
MuiThemeProvider,
makeStyles,
} from "@material-ui/core/styles";
import { amber, lightBlue, grey } from "@material-ui/core/colors";
import useMediaQuery from "@material-ui/core/useMediaQuery";
import { makeStyles } from "@mui/styles";
import { createTheme, ThemeProvider } from "@mui/material/styles";
import { amber, lightBlue, grey } from "@mui/material/colors";
import useMediaQuery from "@mui/material/useMediaQuery";

import { rhythm, scale } from "../utils/typography";

Expand Down Expand Up @@ -63,12 +60,12 @@ const typography = {
},
} as const;

const themeLight = createMuiTheme({
const themeLight = createTheme({
palette: paletteLight,
typography,
});

const themeDark = createMuiTheme({
const themeDark = createTheme({
palette: paletteDark,
typography,
});
Expand Down Expand Up @@ -147,7 +144,7 @@ const Layout: FC<Props> = ({ location, title, children }) => {
"div",
{ className: classes.root },
h(
MuiThemeProvider,
ThemeProvider,
{
theme: darkMode ? themeDark : themeLight,
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/popular.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// run fastest if it's built into the static bundle, so there it goes.
import { createElement as h } from "react";
import { Link } from "gatsby";
import { Typography } from "@material-ui/core";
import { Typography } from "@mui/material";

// TODO: Load from graphql
const popularPosts = [
Expand Down
2 changes: 1 addition & 1 deletion src/components/seo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FC, createElement as h } from "react";
import PropTypes from "prop-types";
import Helmet from "react-helmet";
import { useStaticQuery, graphql } from "gatsby";
import { useTheme } from "@material-ui/core/styles";
import { useTheme } from "@mui/styles";

interface MetaDescription {
content: string;
Expand Down
5 changes: 2 additions & 3 deletions src/components/tag-chips.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { FC, createElement as h } from "react";
import { Chip, Theme } from "@material-ui/core";
import { makeStyles } from "@material-ui/core/styles";
import { Chip, Theme } from "@mui/material";
import { makeStyles } from "@mui/styles";
import { Link, navigate } from "gatsby";
import Image, { GatsbyImageProps } from "gatsby-image";

interface Props {
tags: ReadonlyArray<string>;
Expand Down
6 changes: 2 additions & 4 deletions src/pages/blogtemplate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@ import {
ChangeEvent,
} from "react";
import { graphql } from "gatsby";
import {
makeStyles,
} from "@material-ui/core/styles";
import { makeStyles } from "@mui/styles";
import slugify from "slugify";
import Layout from "../components/layout";
import SEO from "../components/seo";

const useStyles = makeStyles({
root: {
"& label": { paddingTop: "0.2rem" },
}
},
});

interface Data {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/brand.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FC, Fragment, createElement as h, useState } from "react";
import { graphql } from "gatsby";
import { useTheme } from "@material-ui/core";
import { useTheme } from "@mui/material";
import Layout from "../components/layout";
import SEO from "../components/seo";

Expand Down
11 changes: 5 additions & 6 deletions src/pages/tags.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FC, createElement as h, useMemo, useState } from "react";
import { Button, ButtonGroup, Typography } from "@material-ui/core";
import { ArrowDropDown, ArrowDropUp } from "@material-ui/icons";
import { Button, ButtonGroup, Typography } from "@mui/material";
import { ArrowDropDown, ArrowDropUp } from "@mui/icons-material";
import { Link, graphql } from "gatsby";
import Bio from "../components/bio";
import Layout from "../components/layout";
Expand Down Expand Up @@ -40,7 +40,8 @@ const byTag = (rev?: boolean) => (a: Tag, b: Tag) =>
(rev ? -1 : 1) * a.tag.localeCompare(b.tag);

// TODO: this should be built in somewhere
const formatTagLink = (tag: string): string => tag.replace(/ /g, "-").replace(/#/g, "");
const formatTagLink = (tag: string): string =>
tag.replace(/ /g, "-").replace(/#/g, "");

const notAuthor = ({ tag }: Tag): boolean => !authors.has(tag);

Expand All @@ -58,9 +59,7 @@ const TagsTemplate: FC<Props> = ({
const sortedTags = useMemo(() => {
switch (sortBy) {
case "total":
return tags
.filter(notAuthor)
.sort(byTotalCount(rev));
return tags.filter(notAuthor).sort(byTotalCount(rev));
case "tag":
default: {
return tags.filter(notAuthor).sort(byTag(rev));
Expand Down
4 changes: 1 addition & 3 deletions src/templates/author-bio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ export const pageQuery = graphql`
bio
image {
childImageSharp {
fluid(maxWidth: 640, maxHeight: 640) {
...GatsbyImageSharpFluid
}
gatsbyImageData(layout: FIXED)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/templates/blog-list.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC, createElement as h } from "react";
import { makeStyles } from "@material-ui/core";
import { makeStyles } from "@mui/styles";
import { Link, graphql } from "gatsby";
import Bio from "../components/bio";
import Layout from "../components/layout";
Expand Down
8 changes: 3 additions & 5 deletions src/templates/blog-post.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC, createElement as h } from "react";
import { makeStyles } from "@material-ui/core";
import { makeStyles } from "@mui/styles";
import { Link, graphql } from "gatsby";
import { Helmet } from "react-helmet";

Expand All @@ -11,7 +11,7 @@ import Popular from "../components/popular";
import TagChips from "../components/tag-chips";
import { scale } from "../utils/typography";
import { authors } from "../utils/filters";
import { GatsbyImageProps } from "gatsby-image";
import { GatsbyImageProps } from "gatsby-plugin-image";
import HubspotForm from "../components/hubspotForm";

const useStyles = makeStyles(theme => ({
Expand Down Expand Up @@ -221,9 +221,7 @@ export const pageQuery = graphql`
bio
image {
childImageSharp {
fluid(maxWidth: 320, maxHeight: 320) {
...GatsbyImageSharpFluid
}
gatsbyImageData(layout: FIXED)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/templates/tag-list.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC, createElement as h } from "react";
import { Typography } from "@material-ui/core";
import { Typography } from "@mui/material";
import { Link, graphql } from "gatsby";
import Bio from "../components/bio";
import Layout from "../components/layout";
Expand Down
Loading