Skip to content

Commit

Permalink
dep upgrades, @rdub/next-base, nj-crashes redirect
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-williams committed Mar 9, 2024
1 parent 41ff9ba commit 4a5c73b
Show file tree
Hide file tree
Showing 11 changed files with 2,445 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ghp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
persist-credentials: false
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 19
cache: 'npm'
cache-dependency-path: yarn.lock
- run: npm install
Expand Down
8 changes: 3 additions & 5 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ const {
} = require('@vanilla-extract/next-plugin');
const withVanillaExtract = createVanillaExtractPlugin();

const createTranspileModulesPlugin = require("next-transpile-modules");
const withTranspileModules = createTranspileModulesPlugin(["next-utils"]);

// const basePath = "/"

/** @type {import('next').NextConfig} */
Expand All @@ -21,6 +18,7 @@ const nextConfig = {
images: {
unoptimized: true,
},
output: "export",
}

const withMDX = require('@next/mdx')({
Expand All @@ -35,9 +33,9 @@ const withMDX = require('@next/mdx')({
providerImportSource: "@mdx-js/react",
},
})
module.exports = withTranspileModules(withVanillaExtract(withMDX({
module.exports = withVanillaExtract(withMDX({
...nextConfig,
trailingSlash: true,
// Append the default value with md extensions
pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
})))
}))
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
"dev": "next dev",
"build": "next build",
"export": "next build && next export",
"gha-export": "next build && next export && touch out/.nojekyll && cp CNAME out/"
"gha-export": "next build && npm run write-redirects && touch out/.nojekyll && cp CNAME out/",
"write-redirects": "write-redirects.js"
},
"dependencies": {
"next": "13.0.5",
"next-utils": "https://gitpkg.now.sh/runsascoded/next-utils/dist?648b5cd",
"@rdub/next-base": "^0.1.0",
"next": "^14",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-parallax": "^3.5.1"
Expand All @@ -21,6 +22,6 @@
"@types/react-dom": "18.0.9",
"eslint": "8.28.0",
"eslint-config-next": "13.0.5",
"typescript": "4.9.3"
"typescript": "^5"
}
}
2 changes: 1 addition & 1 deletion pages/404.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styles from "../styles/Home.module.css";
import {Head} from "next-utils/head";
import {Head} from "@rdub/next-base/head";
import index from "./index.module.css";
import React from "react";
import {Socials, socials, url} from "../src/socials"
Expand Down
6 changes: 3 additions & 3 deletions pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, {Fragment, ReactNode} from "react"
import type {NextPage} from 'next'
import {Head} from 'next-utils/head'
import A from "next-utils/a"
import {Head} from '@rdub/next-base/head'
import A from "@rdub/next-base/a"
import styles from '../styles/Home.module.css'
import css from "./index.module.css"
import {Parallax} from "react-parallax";
import YouTubeEmbed from "next-utils/youtube";
import YouTubeEmbed from "@rdub/next-base/youtube";
import {Socials} from "../src/socials";

const DefaultSocialWidth = 30
Expand Down
2 changes: 1 addition & 1 deletion pages/jc-ewr.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Head} from "next-utils/head";
import {Head} from "@rdub/next-base/head";

export default function Home() {
return <div className={"container"}>
Expand Down
2 changes: 1 addition & 1 deletion pages/nj-fatal-crashes/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Head} from "next-utils/head";
import {Head} from "@rdub/next-base/head";

function Home() {
const title = "NJ Traffic Crash Data"
Expand Down
Loading

0 comments on commit 4a5c73b

Please sign in to comment.