Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* upgrade next: `npx @next/codemod@canary upgrade latest`
* fix markdown types also by upgrading packages
* change TS target to fix some regex issues ("u"/"s" flag supported when targetting ES2018+). next builds to ES5 anyway
* upgrade some packages and fix errors
* non-major version upgrade of most deps
* downgrade eslint back to 8
* fix eslint
* migrate to next.config.ts
* rework Marquee without SCSS module styles
* upgrade also `typed-scss-modules` to 8
* fix usage of firstRender
---------
Co-authored-by: matushl <[email protected]>- Loading branch information
1 parent
c98409f
commit a2cf3c6
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| import type {NextConfig} from 'next' | ||
|
|
||
| const nextConfig: NextConfig = { | ||
| // docs: https://nextjs.org/docs/api-reference/next.config.js/redirects | ||
| async redirects() { | ||
| return [ | ||
|
|
@@ -24,7 +25,10 @@ module.exports = { | |
| images: { | ||
| remotePatterns: [ | ||
| { | ||
| // TODO: neviem, preco to krici, treba overit, ci funguju obrazky pri ulohach | ||
| // @ts-ignore | ||
|
Check warning on line 29 in next.config.ts
|
||
| protocol: process.env.NEXT_PUBLIC_BE_PROTOCOL, | ||
| // @ts-ignore | ||
|
Check warning on line 31 in next.config.ts
|
||
| hostname: process.env.NEXT_PUBLIC_BE_HOSTNAME, | ||
| port: process.env.NEXT_PUBLIC_BE_PORT, | ||
| pathname: '/media/**', | ||
|
|
@@ -40,7 +44,7 @@ module.exports = { | |
| // https://react-svgr.com/docs/next/ | ||
| webpack(config) { | ||
| // Grab the existing rule that handles SVG imports | ||
| const fileLoaderRule = config.module.rules.find((rule: any) => rule.test?.test?.('.svg')) | ||
|
|
||
| config.module.rules.push( | ||
| // Reapply the existing rule, but only for svg imports ending in ?url | ||
|
|
@@ -63,4 +67,17 @@ module.exports = { | |
|
|
||
| return config | ||
| }, | ||
| experimental: { | ||
| turbo: { | ||
| rules: { | ||
| '*.svg': { | ||
| loaders: ['@svgr/webpack'], | ||
| as: '*.js', | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| // eslint-disable-next-line import/no-default-export | ||
| export default nextConfig | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| "node": ">=16.0.0" | ||
| }, | ||
| "scripts": { | ||
| "dev": "next dev --turbopack", | ||
| "start": "next start", | ||
| "build": "next build", | ||
| "lint": "eslint .", | ||
|
|
@@ -16,66 +16,70 @@ | |
| "css-types:watch": "yarn css-types --watch" | ||
| }, | ||
| "dependencies": { | ||
| "@emotion/react": "^11.13.5", | ||
| "@emotion/styled": "^11.13.5", | ||
| "@mui/icons-material": "^5.16.7", | ||
| "@mui/material": "^5.16.7", | ||
| "@tanstack/react-query": "5.61.0", | ||
| "@tanstack/react-query-devtools": "5.61.0", | ||
| "@testing-library/jest-dom": "^5.17.0", | ||
| "@testing-library/react": "^14.3.1", | ||
| "@testing-library/user-event": "^14.5.2", | ||
| "axios": "^1.7.7", | ||
| "clsx": "^2.1.1", | ||
| "katex": "^0.16.11", | ||
| "luxon": "^3.5.0", | ||
| "mathjax-full": "^3.2.2", | ||
| "mathjax-react": "^2.0.1", | ||
| "next": "15.0.3", | ||
| "react": "19.0.0-rc-66855b96-20241106", | ||
| "react-admin": "^4.16.20", | ||
| "react-cookie": "^4.1.1", | ||
| "react-dom": "19.0.0-rc-66855b96-20241106", | ||
| "react-dropzone": "^14.3.5", | ||
| "react-hook-form": "^7.53.2", | ||
| "react-markdown": "^9.0.1", | ||
| "rehype-katex": "^7.0.1", | ||
| "remark-gfm": "^4.0.0", | ||
| "remark-math": "^6.0.0", | ||
| "typescript": "^5.7.2", | ||
| "unstated-next": "^1.1.0", | ||
| "usehooks-ts": "^3.1.0" | ||
| }, | ||
| "devDependencies": { | ||
| "@svgr/webpack": "^8.1.0", | ||
| "@testing-library/dom": "^9.3.4", | ||
| "@types/jest": "^29.5.14", | ||
| "@types/katex": "^0.16.7", | ||
| "@types/luxon": "^3.4.2", | ||
| "@types/node": "^20.17.7", | ||
| "@types/react": "^19.0.0-rc.1", | ||
| "@types/react-dom": "^19.0.0-rc.1", | ||
| "@types/react-router-dom": "^5.3.3", | ||
| "@typescript-eslint/eslint-plugin": "^8.15.0", | ||
| "@typescript-eslint/parser": "^8.15.0", | ||
| "confusing-browser-globals": "^1.0.11", | ||
| "eslint": "^8.57.1", | ||
| "eslint-config-next": "15.0.3", | ||
| "eslint-config-prettier": "^9.1.0", | ||
| "eslint-plugin-eslint-comments": "^3.2.0", | ||
| "eslint-plugin-filenames": "^1.3.2", | ||
| "eslint-plugin-import": "^2.31.0", | ||
| "eslint-plugin-jest": "^28.9.0", | ||
| "eslint-plugin-no-secrets": "^1.1.2", | ||
| "eslint-plugin-node": "^11.1.0", | ||
| "eslint-plugin-prettier": "^5.2.1", | ||
| "eslint-plugin-promise": "^7.1.0", | ||
| "eslint-plugin-security": "^3.0.1", | ||
| "eslint-plugin-simple-import-sort": "^12.1.1", | ||
| "eslint-plugin-unicorn": "^56.0.1", | ||
| "prettier": "^3.3.3", | ||
| "sass": "^1.81.0", | ||
| "typed-scss-modules": "^8.0.1" | ||
| }, | ||
| "packageManager": "[email protected]", | ||
| "resolutions": { | ||
| "@types/react": "npm:[email protected]", | ||
| "@types/react-dom": "npm:[email protected]" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,9 +19,9 @@ export const MyEditActions: FC = () => { | |
| return ( | ||
| <TopToolbar> | ||
| {/* the `to` prop was omitted from ShowButton in recent RA version, but it's still working | ||
| and RA doesn't provide better way to do this | ||
| TODO: try again after RA upgrade */} | ||
| {/* @ts-ignore */} | ||
|
Check warning on line 24 in src/components/Admin/custom/MyEditActions.tsx
|
||
| <ShowButton to={to} /> | ||
| <ListButton label="Back to list" /> | ||
| </TopToolbar> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.