Skip to content
This repository has been archived by the owner on Oct 26, 2024. It is now read-only.

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35 from cyf/renovate/major-nextjs-monorepo
Browse files Browse the repository at this point in the history
chore(deps): update nextjs monorepo to v14 (major)
kjxbyz authored Oct 27, 2023
2 parents d2ffb43 + 4988692 commit aa772e5
Showing 11 changed files with 73 additions and 71 deletions.
1 change: 0 additions & 1 deletion app/app/[lng]/[type]/page.tsx
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@ export async function generateMetadata({
params.lng === "en" ? "Blog" : "博客"
} - 童话镇里一枝花, 人美歌甜陈一发.`,
metadataBase: new URL("https://chenyifaer.com"),
themeColor: "#FFF",
icons: {
icon: "/logo.jpg",
},
1 change: 0 additions & 1 deletion app/app/[lng]/layout.tsx
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ export async function generateMetadata({
params.lng === "en" ? "FaForever" : "FaForever"
} - 童话镇里一枝花, 人美歌甜陈一发.`,
metadataBase: new URL("https://chenyifaer.com"),
themeColor: "#FFF",
icons: {
icon: "/logo.jpg",
},
2 changes: 1 addition & 1 deletion app/app/[lng]/opengraph-image.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @next/next/no-img-element */
import { ImageResponse } from "next/server";
import { ImageResponse } from "next/og";

export const runtime = "edge";
export const alt = "Precedent - Building blocks for your Next.js project";
3 changes: 3 additions & 0 deletions app/next.config.js
Original file line number Diff line number Diff line change
@@ -15,6 +15,9 @@ const nextConfig = {
"vercel.com",
],
},
experimental: {
webpackBuildWorker: true,
},
env: {
GIT_COMMIT_SHA:
process.env.GIT_COMMIT_SHA || process.env.VERCEL_GIT_COMMIT_SHA,
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
"framer-motion": "^10.16.4",
"leva": "0.9.35",
"ms": "^2.1.3",
"next": "13.5.6",
"next": "14.0.0",
"next-contentlayer": "^0.3.4",
"next-intl": "^2.21.0",
"next-themes": "^0.2.1",
@@ -47,7 +47,7 @@
"@types/react-dom": "^18.2.14",
"autoprefixer": "^10.4.16",
"eslint": "^8.52.0",
"eslint-config-next": "13.5.6",
"eslint-config-next": "14.0.0",
"postcss": "^8.4.31",
"prettier": "^3.0.3",
"prettier-plugin-tailwindcss": "^0.5.6",
1 change: 0 additions & 1 deletion docs/app/[lng]/[type]/page.tsx
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@ export async function generateMetadata({
params.lng === "en" ? "Blog" : "博客"
} - 童话镇里一枝花, 人美歌甜陈一发.`,
metadataBase: new URL("https://chenyifaer.com"),
themeColor: "#FFF",
icons: {
icon: "/faforever/logo.jpg",
},
1 change: 0 additions & 1 deletion docs/app/[lng]/layout.tsx
Original file line number Diff line number Diff line change
@@ -30,7 +30,6 @@ export async function generateMetadata({
params.lng === "en" ? "FaForever" : "FaForever"
} - 童话镇里一枝花, 人美歌甜陈一发.`,
metadataBase: new URL("https://chenyifaer.com"),
themeColor: "#FFF",
icons: {
icon: "/faforever/logo.jpg",
},
2 changes: 1 addition & 1 deletion docs/app/[lng]/opengraph-image.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @next/next/no-img-element */
import { ImageResponse } from "next/server";
import { ImageResponse } from "next/og";

export const runtime = "edge";
export const alt = "Precedent - Building blocks for your Next.js project";
3 changes: 3 additions & 0 deletions docs/next.config.js
Original file line number Diff line number Diff line change
@@ -14,6 +14,9 @@ const nextConfig = {
],
unoptimized: true,
},
experimental: {
webpackBuildWorker: true,
},
env: {
VERCEL_GIT_COMMIT_SHA: process.env.VERCEL_GIT_COMMIT_SHA,
NEXT_PUBLIC_GOOGLE_ID: process.env.NEXT_PUBLIC_GOOGLE_ID,
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
"i18next-browser-languagedetector": "^7.1.0",
"i18next-resources-to-backend": "^1.1.4",
"ms": "^2.1.3",
"next": "13.5.6",
"next": "14.0.0",
"next-contentlayer": "^0.3.4",
"next-themes": "^0.2.1",
"nextjs-toploader": "^1.5.3",
@@ -50,7 +50,7 @@
"@types/react-dom": "18.2.14",
"autoprefixer": "^10.4.16",
"eslint": "8.52.0",
"eslint-config-next": "13.5.6",
"eslint-config-next": "14.0.0",
"postcss": "^8.4.31",
"prettier": "^3.0.3",
"prettier-plugin-tailwindcss": "^0.5.6",
122 changes: 61 additions & 61 deletions pnpm-lock.yaml

1 comment on commit aa772e5

@vercel
Copy link

@vercel vercel bot commented on aa772e5 Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.