From f80dd7f0e75467779a8ce88d9e20a93a3ea73514 Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Wed, 17 Jan 2024 12:40:15 +0100 Subject: [PATCH] fix(deps): migrate to next 14 Signed-off-by: Tilman Vatteroth --- frontend/package.json | 6 +- frontend/src/app/(editor)/layout.tsx | 10 +- yarn.lock | 163 +++++++++++++-------------- 3 files changed, 88 insertions(+), 91 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 9cf333e89..e7fafc1a0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -99,7 +99,7 @@ "markdown-it-sub": "2.0.0", "markdown-it-sup": "2.0.0", "mermaid": "10.6.1", - "next": "13.4.19", + "next": "14.0.4", "picocolors": "1.0.0", "react": "18.2.0", "react-bootstrap": "2.9.1", @@ -126,7 +126,7 @@ "yjs": "13.6.10" }, "devDependencies": { - "@next/bundle-analyzer": "13.4.19", + "@next/bundle-analyzer": "14.0.4", "@testing-library/cypress": "10.0.1", "@testing-library/dom": "9.3.3", "@testing-library/jest-dom": "6.1.5", @@ -156,7 +156,7 @@ "cypress-fill-command": "1.0.2", "dotenv-cli": "7.3.0", "eslint": "8.55.0", - "eslint-config-next": "13.5.6", + "eslint-config-next": "14.0.4", "eslint-config-prettier": "9.1.0", "eslint-plugin-chai-friendly": "0.7.2", "eslint-plugin-cypress": "2.15.1", diff --git a/frontend/src/app/(editor)/layout.tsx b/frontend/src/app/(editor)/layout.tsx index 6b5f6bd11..5540470f4 100644 --- a/frontend/src/app/(editor)/layout.tsx +++ b/frontend/src/app/(editor)/layout.tsx @@ -13,7 +13,7 @@ import { UiNotificationBoundary } from '../../components/notifications/ui-notifi import { StoreProvider } from '../../redux/store-provider' import { baseUrlFromEnvExtractor } from '../../utils/base-url-from-env-extractor' import { configureLuxon } from '../../utils/configure-luxon' -import type { Metadata } from 'next' +import type { Metadata, Viewport } from 'next' import type { PropsWithChildren } from 'react' import React from 'react' import { getConfig } from '../../api/config' @@ -64,13 +64,17 @@ export default async function RootLayout({ children, appBar }: RootLayoutProps) } export const metadata: Metadata = { - themeColor: '#b51f08', applicationName: 'HedgeDoc', appleWebApp: { title: 'HedgeDoc' }, description: 'HedgeDoc - Ideas grow better together', - viewport: 'width=device-width, initial-scale=1', title: 'HedgeDoc', manifest: '/icons/site.webmanifest' } + +export const viewport: Viewport = { + themeColor: '#b51f08', + width: 'device-width', + initialScale: 1 +} diff --git a/yarn.lock b/yarn.lock index dac0121e9..bdee3087f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2440,7 +2440,7 @@ __metadata: "@hedgedoc/html-to-react": "workspace:html-to-react" "@hedgedoc/markdown-it-plugins": "workspace:markdown-it-plugins" "@mrdrogdrog/optional": "npm:1.2.1" - "@next/bundle-analyzer": "npm:13.4.19" + "@next/bundle-analyzer": "npm:14.0.4" "@orama/orama": "npm:2.0.0-beta.12" "@react-hook/resize-observer": "npm:1.2.6" "@redux-devtools/core": "npm:3.13.3" @@ -2490,7 +2490,7 @@ __metadata: emoji-picker-element: "npm:1.18.4" emoji-picker-element-data: "npm:1.5.0" eslint: "npm:8.55.0" - eslint-config-next: "npm:13.5.6" + eslint-config-next: "npm:14.0.4" eslint-config-prettier: "npm:9.1.0" eslint-plugin-chai-friendly: "npm:0.7.2" eslint-plugin-cypress: "npm:2.15.1" @@ -2527,7 +2527,7 @@ __metadata: markdown-it-sub: "npm:2.0.0" markdown-it-sup: "npm:2.0.0" mermaid: "npm:10.6.1" - next: "npm:13.4.19" + next: "npm:14.0.4" picocolors: "npm:1.0.0" prettier: "npm:3.1.0" react: "npm:18.2.0" @@ -3622,90 +3622,90 @@ __metadata: languageName: node linkType: hard -"@next/bundle-analyzer@npm:13.4.19": - version: 13.4.19 - resolution: "@next/bundle-analyzer@npm:13.4.19" +"@next/bundle-analyzer@npm:14.0.4": + version: 14.0.4 + resolution: "@next/bundle-analyzer@npm:14.0.4" dependencies: webpack-bundle-analyzer: "npm:4.7.0" - checksum: dff9ed36e5e1fd0ae579ecb498e01c54f0aa0b560bfd0ef9d012dd018ba2726cf4ce33d3e3d74d88a9936924a087b0c424d6a03826a02a45e85e753f9d4cef14 + checksum: 5c45e2e49b5e87612e9cc4362a9b8ed71571fa1498d3014b01e0c84c97a809678044d4ba7301752d1e28eba23a20ca5c7e28b1f9636d49024ba4da75c7a1e057 languageName: node linkType: hard -"@next/env@npm:13.4.19": - version: 13.4.19 - resolution: "@next/env@npm:13.4.19" - checksum: 0d9cb76fedcde6f8116c5f029d999cccaf929c9eb8c55daf1d38ae223a80113abae28834e537b26b81731d84ed14fd5231301b2126cd7d9097a7e175dd79bf59 +"@next/env@npm:14.0.4": + version: 14.0.4 + resolution: "@next/env@npm:14.0.4" + checksum: 59b893d30aea0556379a24f6e4eac830677feb149bd8416b72383ea2600ce194fa22a79b2dd86e0b295c4a8f0702e461f48edaff1ac9173eddef42a4cce7fd98 languageName: node linkType: hard -"@next/eslint-plugin-next@npm:13.5.6": - version: 13.5.6 - resolution: "@next/eslint-plugin-next@npm:13.5.6" +"@next/eslint-plugin-next@npm:14.0.4": + version: 14.0.4 + resolution: "@next/eslint-plugin-next@npm:14.0.4" dependencies: glob: "npm:7.1.7" - checksum: c357c4b8b7b67c22e552e4979e7d2c71a21423ccf18ed3928402aa5a84a8d683e0bbcde4acc092a493f933033fffbb882a00ae075e190c2488ed3fb774d3a2be + checksum: 0e93cb704efdedbe20978c4ffa4856f818cebd91255db859bd88ff1b1f206e92ee61a22b047db87b32cd2f544e3ee0e31ac41f877e1c9a0a7a3b6096513f3376 languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:13.4.19": - version: 13.4.19 - resolution: "@next/swc-darwin-arm64@npm:13.4.19" +"@next/swc-darwin-arm64@npm:14.0.4": + version: 14.0.4 + resolution: "@next/swc-darwin-arm64@npm:14.0.4" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-x64@npm:13.4.19": - version: 13.4.19 - resolution: "@next/swc-darwin-x64@npm:13.4.19" +"@next/swc-darwin-x64@npm:14.0.4": + version: 14.0.4 + resolution: "@next/swc-darwin-x64@npm:14.0.4" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@next/swc-linux-arm64-gnu@npm:13.4.19": - version: 13.4.19 - resolution: "@next/swc-linux-arm64-gnu@npm:13.4.19" +"@next/swc-linux-arm64-gnu@npm:14.0.4": + version: 14.0.4 + resolution: "@next/swc-linux-arm64-gnu@npm:14.0.4" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:13.4.19": - version: 13.4.19 - resolution: "@next/swc-linux-arm64-musl@npm:13.4.19" +"@next/swc-linux-arm64-musl@npm:14.0.4": + version: 14.0.4 + resolution: "@next/swc-linux-arm64-musl@npm:14.0.4" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:13.4.19": - version: 13.4.19 - resolution: "@next/swc-linux-x64-gnu@npm:13.4.19" +"@next/swc-linux-x64-gnu@npm:14.0.4": + version: 14.0.4 + resolution: "@next/swc-linux-x64-gnu@npm:14.0.4" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:13.4.19": - version: 13.4.19 - resolution: "@next/swc-linux-x64-musl@npm:13.4.19" +"@next/swc-linux-x64-musl@npm:14.0.4": + version: 14.0.4 + resolution: "@next/swc-linux-x64-musl@npm:14.0.4" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:13.4.19": - version: 13.4.19 - resolution: "@next/swc-win32-arm64-msvc@npm:13.4.19" +"@next/swc-win32-arm64-msvc@npm:14.0.4": + version: 14.0.4 + resolution: "@next/swc-win32-arm64-msvc@npm:14.0.4" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@next/swc-win32-ia32-msvc@npm:13.4.19": - version: 13.4.19 - resolution: "@next/swc-win32-ia32-msvc@npm:13.4.19" +"@next/swc-win32-ia32-msvc@npm:14.0.4": + version: 14.0.4 + resolution: "@next/swc-win32-ia32-msvc@npm:14.0.4" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:13.4.19": - version: 13.4.19 - resolution: "@next/swc-win32-x64-msvc@npm:13.4.19" +"@next/swc-win32-x64-msvc@npm:14.0.4": + version: 14.0.4 + resolution: "@next/swc-win32-x64-msvc@npm:14.0.4" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -4175,12 +4175,12 @@ __metadata: languageName: node linkType: hard -"@swc/helpers@npm:0.5.1": - version: 0.5.1 - resolution: "@swc/helpers@npm:0.5.1" +"@swc/helpers@npm:0.5.2": + version: 0.5.2 + resolution: "@swc/helpers@npm:0.5.2" dependencies: tslib: "npm:^2.4.0" - checksum: 2e2272c8278351670e1daf27cc634ace793afb378dcc85be2800d30a7b4d3afad37707371ead2a6d96662fa30294da678d66cdc4dc7f3e698bd8e111235c60fc + checksum: b6fa49bcf6c00571d0eb7837b163f8609960d4d77538160585e27ed167361e9776bd6e5eb9646ffac2fb4d43c58df9ca50dab9d96ab097e6591bc82a75fd1164 languageName: node linkType: hard @@ -9096,11 +9096,11 @@ __metadata: languageName: node linkType: hard -"eslint-config-next@npm:13.5.6": - version: 13.5.6 - resolution: "eslint-config-next@npm:13.5.6" +"eslint-config-next@npm:14.0.4": + version: 14.0.4 + resolution: "eslint-config-next@npm:14.0.4" dependencies: - "@next/eslint-plugin-next": "npm:13.5.6" + "@next/eslint-plugin-next": "npm:14.0.4" "@rushstack/eslint-patch": "npm:^1.3.3" "@typescript-eslint/parser": "npm:^5.4.2 || ^6.0.0" eslint-import-resolver-node: "npm:^0.3.6" @@ -9115,7 +9115,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 819d3be8007ae062217857669c1ef616f7e30ce358ec044483f235f4246c02b38de740010cfd8e0deacf7cc323f5de9a7ccb1e3271c851d205841eff894c4729 + checksum: 39cc217b52288583cbb1b894e12a3e69a689b4b697609863b35937c381a5b2873cfa14a48a68d9fd3cb3b236e5f6f8ac16ecaeb3499fa1c3b4e12d2a62cb3c4e languageName: node linkType: hard @@ -10539,7 +10539,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 @@ -13732,12 +13732,12 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.3.4": - version: 3.3.6 - resolution: "nanoid@npm:3.3.6" +"nanoid@npm:^3.3.6": + version: 3.3.7 + resolution: "nanoid@npm:3.3.7" bin: nanoid: bin/nanoid.cjs - checksum: 606b355960d0fcbe3d27924c4c52ef7d47d3b57208808ece73279420d91469b01ec1dce10fae512b6d4a8c5a5432b352b228336a8b2202a6ea68e67fa348e2ee + checksum: e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3 languageName: node linkType: hard @@ -13769,27 +13769,27 @@ __metadata: languageName: node linkType: hard -"next@npm:13.4.19": - version: 13.4.19 - resolution: "next@npm:13.4.19" +"next@npm:14.0.4": + version: 14.0.4 + resolution: "next@npm:14.0.4" dependencies: - "@next/env": "npm:13.4.19" - "@next/swc-darwin-arm64": "npm:13.4.19" - "@next/swc-darwin-x64": "npm:13.4.19" - "@next/swc-linux-arm64-gnu": "npm:13.4.19" - "@next/swc-linux-arm64-musl": "npm:13.4.19" - "@next/swc-linux-x64-gnu": "npm:13.4.19" - "@next/swc-linux-x64-musl": "npm:13.4.19" - "@next/swc-win32-arm64-msvc": "npm:13.4.19" - "@next/swc-win32-ia32-msvc": "npm:13.4.19" - "@next/swc-win32-x64-msvc": "npm:13.4.19" - "@swc/helpers": "npm:0.5.1" + "@next/env": "npm:14.0.4" + "@next/swc-darwin-arm64": "npm:14.0.4" + "@next/swc-darwin-x64": "npm:14.0.4" + "@next/swc-linux-arm64-gnu": "npm:14.0.4" + "@next/swc-linux-arm64-musl": "npm:14.0.4" + "@next/swc-linux-x64-gnu": "npm:14.0.4" + "@next/swc-linux-x64-musl": "npm:14.0.4" + "@next/swc-win32-arm64-msvc": "npm:14.0.4" + "@next/swc-win32-ia32-msvc": "npm:14.0.4" + "@next/swc-win32-x64-msvc": "npm:14.0.4" + "@swc/helpers": "npm:0.5.2" busboy: "npm:1.6.0" caniuse-lite: "npm:^1.0.30001406" - postcss: "npm:8.4.14" + graceful-fs: "npm:^4.2.11" + postcss: "npm:8.4.31" styled-jsx: "npm:5.1.1" watchpack: "npm:2.4.0" - zod: "npm:3.21.4" peerDependencies: "@opentelemetry/api": ^1.1.0 react: ^18.2.0 @@ -13821,7 +13821,7 @@ __metadata: optional: true bin: next: dist/bin/next - checksum: 557fd15a52220f003ec88a79f51de41c5bb9cda5294944985f31ce45e75f98dd3caf902896d8419d96cc81596976671e953391b1eb3707757d261e362a242310 + checksum: e6c829fd473d8c3605b2b62d15e1bf41e9d90cf59a2c213b4adeadff2846999bc9a653ffef18f6aa13cc9f5d6de02469c222acf5a4184901a4690a4504bd468f languageName: node linkType: hard @@ -14684,14 +14684,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.14": - version: 8.4.14 - resolution: "postcss@npm:8.4.14" +"postcss@npm:8.4.31": + version: 8.4.31 + resolution: "postcss@npm:8.4.31" dependencies: - nanoid: "npm:^3.3.4" + nanoid: "npm:^3.3.6" picocolors: "npm:^1.0.0" source-map-js: "npm:^1.0.2" - checksum: 2a4cfa28e2f1bfd358313501f7771bd596e494487c7b735c492e2f8b1faf493d24fcb43e2e6ad825863fc65a77abb949ca8f228602ae46a022f02dc812c4ac8b + checksum: 748b82e6e5fc34034dcf2ae88ea3d11fd09f69b6c50ecdd3b4a875cfc7cdca435c958b211e2cb52355422ab6fccb7d8f2f2923161d7a1b281029e4a913d59acf languageName: node linkType: hard @@ -19017,10 +19017,3 @@ __metadata: checksum: dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f languageName: node linkType: hard - -"zod@npm:3.21.4": - version: 3.21.4 - resolution: "zod@npm:3.21.4" - checksum: 161e8cf7aea38a99244d65da4a9477d9d966f6a533e503feaa20ff7968a9691065c38c6f1eab5cbbdc8374142fff4a05c9cacb8479803ab50ab6a6ca80e5d624 - languageName: node - linkType: hard