From b67df0eadf805c1c9f620542a40db02d1c66e83f Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Sun, 6 Nov 2022 21:22:59 +0100 Subject: [PATCH] fix: revert next 13 update The update causes problems with the emoji picker in the production build Revert "fix: Fix sign-in-button cypress tests" Revert "chore(deps): update nextjs monorepo to v13" Revert "fix: Remove anchor hack from internal-link" Revert "fix: Remove a tag childs from NextJS link components" This reverts commit f2ae04743a8ce6dfc24a7098b1c66574ba9e3659. This reverts commit a7fd14a3 This reverts commit 6d304481570547b217937700ed573198a4da4379. This reverts commit 7f7f020d91b7ccbe1dea7ff012ae5fd5093d050b. Signed-off-by: Tilman Vatteroth --- package.json | 4 +- src/components/common/links/internal-link.tsx | 14 +- src/components/common/redirect.tsx | 5 +- .../editor-page/app-bar/navbar-branding.tsx | 14 +- .../app-bar/read-only-mode-button.tsx | 18 +- .../editor-page/app-bar/slide-mode-button.tsx | 18 +- .../history-card/history-card.tsx | 26 +-- .../history-table/history-table-row.tsx | 6 +- .../navigation/header-bar/header-nav-link.tsx | 6 +- .../navigation/sign-in-button.tsx | 4 +- yarn.lock | 157 +++++++++--------- 11 files changed, 140 insertions(+), 132 deletions(-) diff --git a/package.json b/package.json index 99addca0c..54494cdc8 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "markdown-it-sup": "1.0.0", "markdown-it-toc-done-right": "4.2.0", "mermaid": "9.2.0", - "next": "13.0.2", + "next": "12.3.2", "react": "18.2.0", "react-bootstrap": "2.5.0", "react-bootstrap-typeahead": "6.0.0", @@ -124,7 +124,7 @@ "yjs": "13.5.42" }, "devDependencies": { - "@next/bundle-analyzer": "13.0.2", + "@next/bundle-analyzer": "12.3.2", "@testing-library/cypress": "8.0.3", "@testing-library/dom": "8.19.0", "@testing-library/jest-dom": "5.16.5", diff --git a/src/components/common/links/internal-link.tsx b/src/components/common/links/internal-link.tsx index 190cfc769..f7378209f 100644 --- a/src/components/common/links/internal-link.tsx +++ b/src/components/common/links/internal-link.tsx @@ -31,12 +31,14 @@ export const InternalLink: React.FC = ({ title }) => { return ( - - - -   - - {text} + + + + +   + + {text} + ) } diff --git a/src/components/common/redirect.tsx b/src/components/common/redirect.tsx index 6b616179c..78e550866 100644 --- a/src/components/common/redirect.tsx +++ b/src/components/common/redirect.tsx @@ -32,7 +32,10 @@ export const Redirect: React.FC = ({ to }) => { return ( - Redirecting to {to} + Redirecting to{' '} + + {to} + ) } diff --git a/src/components/editor-page/app-bar/navbar-branding.tsx b/src/components/editor-page/app-bar/navbar-branding.tsx index c4404bcf5..efc10c618 100644 --- a/src/components/editor-page/app-bar/navbar-branding.tsx +++ b/src/components/editor-page/app-bar/navbar-branding.tsx @@ -23,12 +23,14 @@ export const NavbarBranding: React.FC = () => { return ( - - - + + + + + ) diff --git a/src/components/editor-page/app-bar/read-only-mode-button.tsx b/src/components/editor-page/app-bar/read-only-mode-button.tsx index 31eeabfe9..9eb5850a0 100644 --- a/src/components/editor-page/app-bar/read-only-mode-button.tsx +++ b/src/components/editor-page/app-bar/read-only-mode-button.tsx @@ -19,14 +19,16 @@ export const ReadOnlyModeButton: React.FC = () => { const noteIdentifier = useApplicationState((state) => state.noteDetails.primaryAddress) return ( - - + + + + ) } diff --git a/src/components/editor-page/app-bar/slide-mode-button.tsx b/src/components/editor-page/app-bar/slide-mode-button.tsx index 061879c80..657f4538d 100644 --- a/src/components/editor-page/app-bar/slide-mode-button.tsx +++ b/src/components/editor-page/app-bar/slide-mode-button.tsx @@ -19,14 +19,16 @@ export const SlideModeButton: React.FC = () => { const noteIdentifier = useApplicationState((state) => state.noteDetails.primaryAddress) return ( - - + + + + ) } diff --git a/src/components/history-page/history-card/history-card.tsx b/src/components/history-page/history-card/history-card.tsx index 0cdcd0be6..d7f9a57c8 100644 --- a/src/components/history-page/history-card/history-card.tsx +++ b/src/components/history-page/history-card/history-card.tsx @@ -64,20 +64,22 @@ export const HistoryCard: React.FC = (
- -
- - {entryTitle} - -
- +
return ( - - {entryTitle} + + + {entryTitle} + {formatHistoryDate(entry.lastVisitedAt)} diff --git a/src/components/landing-layout/navigation/header-bar/header-nav-link.tsx b/src/components/landing-layout/navigation/header-bar/header-nav-link.tsx index 4736420a7..7eb53f625 100644 --- a/src/components/landing-layout/navigation/header-bar/header-nav-link.tsx +++ b/src/components/landing-layout/navigation/header-bar/header-nav-link.tsx @@ -33,8 +33,10 @@ export const HeaderNavLink: React.FC> = ({ return ( - - {children} + + + {children} + ) diff --git a/src/components/landing-layout/navigation/sign-in-button.tsx b/src/components/landing-layout/navigation/sign-in-button.tsx index 76a9b6d2c..d7d47d8b5 100644 --- a/src/components/landing-layout/navigation/sign-in-button.tsx +++ b/src/components/landing-layout/navigation/sign-in-button.tsx @@ -39,8 +39,8 @@ export const SignInButton: React.FC = ({ variant, ...props }) return ( 0}> - - diff --git a/yarn.lock b/yarn.lock index d13529ab6..964b43622 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1952,7 +1952,7 @@ __metadata: "@hedgedoc/markdown-it-plugins": 1.0.0 "@hedgedoc/realtime": 0.3.0 "@mrdrogdrog/optional": 1.0.0 - "@next/bundle-analyzer": 13.0.2 + "@next/bundle-analyzer": 12.3.2 "@react-hook/resize-observer": 1.2.6 "@redux-devtools/core": 3.13.1 "@reduxjs/toolkit": 1.9.0 @@ -2039,7 +2039,7 @@ __metadata: markdown-it-sup: 1.0.0 markdown-it-toc-done-right: 4.2.0 mermaid: 9.2.0 - next: 13.0.2 + next: 12.3.2 prettier: 2.7.1 react: 18.2.0 react-bootstrap: 2.5.0 @@ -2594,19 +2594,19 @@ __metadata: languageName: node linkType: hard -"@next/bundle-analyzer@npm:13.0.2": - version: 13.0.2 - resolution: "@next/bundle-analyzer@npm:13.0.2" +"@next/bundle-analyzer@npm:12.3.2": + version: 12.3.2 + resolution: "@next/bundle-analyzer@npm:12.3.2" dependencies: webpack-bundle-analyzer: 4.3.0 - checksum: 7aed60d4f2dc349eb2e026c054c32a881607b6c6b328913fc492b9bc5eac8deae3a9cf121bd04f9e3c8edacb794d08e73dc10a4530ecbda81215a9cbb717cad8 + checksum: 21c9f8b3e27fa25481d8a592964570838072c35d3c66eeef60a9903388654927228e226419d266a73c7a6f82e1d8d8479ffeb256e4f23f792a99abc1306319fc languageName: node linkType: hard -"@next/env@npm:13.0.2": - version: 13.0.2 - resolution: "@next/env@npm:13.0.2" - checksum: e84eca92328421d9824a82177b018234b2cd0aa59a482569b7a52b16eaabdafe6343f21bec7d15035cb8ea831929097c7d92c711d295630f6b74a655f9ddcad6 +"@next/env@npm:12.3.2": + version: 12.3.2 + resolution: "@next/env@npm:12.3.2" + checksum: 668aba397427dd5d19563844274ae7425c99db890e36d2262b9d107122a85500634518fdb916562b3c8a298de983183e241717b535d975df4c997baaa4730ddf languageName: node linkType: hard @@ -2619,93 +2619,93 @@ __metadata: languageName: node linkType: hard -"@next/swc-android-arm-eabi@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-android-arm-eabi@npm:13.0.2" +"@next/swc-android-arm-eabi@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-android-arm-eabi@npm:12.3.2" conditions: os=android & cpu=arm languageName: node linkType: hard -"@next/swc-android-arm64@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-android-arm64@npm:13.0.2" +"@next/swc-android-arm64@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-android-arm64@npm:12.3.2" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-darwin-arm64@npm:13.0.2" +"@next/swc-darwin-arm64@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-darwin-arm64@npm:12.3.2" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-x64@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-darwin-x64@npm:13.0.2" +"@next/swc-darwin-x64@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-darwin-x64@npm:12.3.2" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@next/swc-freebsd-x64@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-freebsd-x64@npm:13.0.2" +"@next/swc-freebsd-x64@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-freebsd-x64@npm:12.3.2" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@next/swc-linux-arm-gnueabihf@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-linux-arm-gnueabihf@npm:13.0.2" +"@next/swc-linux-arm-gnueabihf@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-arm-gnueabihf@npm:12.3.2" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@next/swc-linux-arm64-gnu@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-linux-arm64-gnu@npm:13.0.2" +"@next/swc-linux-arm64-gnu@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-arm64-gnu@npm:12.3.2" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-linux-arm64-musl@npm:13.0.2" +"@next/swc-linux-arm64-musl@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-arm64-musl@npm:12.3.2" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-linux-x64-gnu@npm:13.0.2" +"@next/swc-linux-x64-gnu@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-x64-gnu@npm:12.3.2" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-linux-x64-musl@npm:13.0.2" +"@next/swc-linux-x64-musl@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-x64-musl@npm:12.3.2" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-win32-arm64-msvc@npm:13.0.2" +"@next/swc-win32-arm64-msvc@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-win32-arm64-msvc@npm:12.3.2" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@next/swc-win32-ia32-msvc@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-win32-ia32-msvc@npm:13.0.2" +"@next/swc-win32-ia32-msvc@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-win32-ia32-msvc@npm:12.3.2" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:13.0.2": - version: 13.0.2 - resolution: "@next/swc-win32-x64-msvc@npm:13.0.2" +"@next/swc-win32-x64-msvc@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-win32-x64-msvc@npm:12.3.2" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -4845,13 +4845,6 @@ __metadata: languageName: node linkType: hard -"client-only@npm:0.0.1": - version: 0.0.1 - resolution: "client-only@npm:0.0.1" - checksum: 0c16bf660dadb90610553c1d8946a7fdfb81d624adea073b8440b7d795d5b5b08beb3c950c6a2cf16279365a3265158a236876d92bce16423c485c322d7dfaf8 - languageName: node - linkType: hard - "cliui@npm:^7.0.2": version: 7.0.4 resolution: "cliui@npm:7.0.4" @@ -10005,34 +9998,34 @@ __metadata: languageName: node linkType: hard -"next@npm:13.0.2": - version: 13.0.2 - resolution: "next@npm:13.0.2" +"next@npm:12.3.2": + version: 12.3.2 + resolution: "next@npm:12.3.2" dependencies: - "@next/env": 13.0.2 - "@next/swc-android-arm-eabi": 13.0.2 - "@next/swc-android-arm64": 13.0.2 - "@next/swc-darwin-arm64": 13.0.2 - "@next/swc-darwin-x64": 13.0.2 - "@next/swc-freebsd-x64": 13.0.2 - "@next/swc-linux-arm-gnueabihf": 13.0.2 - "@next/swc-linux-arm64-gnu": 13.0.2 - "@next/swc-linux-arm64-musl": 13.0.2 - "@next/swc-linux-x64-gnu": 13.0.2 - "@next/swc-linux-x64-musl": 13.0.2 - "@next/swc-win32-arm64-msvc": 13.0.2 - "@next/swc-win32-ia32-msvc": 13.0.2 - "@next/swc-win32-x64-msvc": 13.0.2 + "@next/env": 12.3.2 + "@next/swc-android-arm-eabi": 12.3.2 + "@next/swc-android-arm64": 12.3.2 + "@next/swc-darwin-arm64": 12.3.2 + "@next/swc-darwin-x64": 12.3.2 + "@next/swc-freebsd-x64": 12.3.2 + "@next/swc-linux-arm-gnueabihf": 12.3.2 + "@next/swc-linux-arm64-gnu": 12.3.2 + "@next/swc-linux-arm64-musl": 12.3.2 + "@next/swc-linux-x64-gnu": 12.3.2 + "@next/swc-linux-x64-musl": 12.3.2 + "@next/swc-win32-arm64-msvc": 12.3.2 + "@next/swc-win32-ia32-msvc": 12.3.2 + "@next/swc-win32-x64-msvc": 12.3.2 "@swc/helpers": 0.4.11 caniuse-lite: ^1.0.30001406 postcss: 8.4.14 - styled-jsx: 5.1.0 + styled-jsx: 5.0.7 use-sync-external-store: 1.2.0 peerDependencies: fibers: ">= 3.1.0" node-sass: ^6.0.0 || ^7.0.0 - react: ^18.2.0 - react-dom: ^18.2.0 + react: ^17.0.2 || ^18.0.0-0 + react-dom: ^17.0.2 || ^18.0.0-0 sass: ^1.3.0 dependenciesMeta: "@next/swc-android-arm-eabi": @@ -10070,7 +10063,7 @@ __metadata: optional: true bin: next: dist/bin/next - checksum: f6fea2ee34a8c490834cbd7688cfb346337a4dc8530282bf50ee94e20277ad66cb00a614c92c07f8b00832795eaa3a10847f10c8d540789b0b1b1f2914a3b239 + checksum: fa2372c3dfaa8c3910ad443a6489ea2578c141e8c819544eb98da6ed6a6c960b2496ac8e9baa4f919bc55c60fd072b85eca5fd2a7073a521364f3247ec09dfa2 languageName: node linkType: hard @@ -11939,11 +11932,9 @@ __metadata: languageName: node linkType: hard -"styled-jsx@npm:5.1.0": - version: 5.1.0 - resolution: "styled-jsx@npm:5.1.0" - dependencies: - client-only: 0.0.1 +"styled-jsx@npm:5.0.7": + version: 5.0.7 + resolution: "styled-jsx@npm:5.0.7" peerDependencies: react: ">= 16.8.0 || 17.x.x || ^18.0.0-0" peerDependenciesMeta: @@ -11951,7 +11942,7 @@ __metadata: optional: true babel-plugin-macros: optional: true - checksum: e5b70476fd9059147dfe35dd912e537e422a7f900cc88f80456c97da495c655598875d64de2199641d627770a7e55ed08be0fd82646bc386791fdb1d0e5af2b1 + checksum: 61959993915f4b1662a682dbbefb3512de9399cf6901969bcadd26ba5441d2b5ca5c1021b233bbd573da2541b41efb45d56c6f618dbc8d88a381ebc62461fefe languageName: node linkType: hard