Skip to content

Commit

Permalink
Merge pull request #7092 from mantinedev/node-22.11
Browse files Browse the repository at this point in the history
Migrate to Node 22.11, update dependencies
  • Loading branch information
rtivital authored Nov 7, 2024
2 parents fbcee92 + 64ff2a1 commit 7f99f67
Show file tree
Hide file tree
Showing 20 changed files with 3,798 additions and 6,823 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.1.0
v22.11.0
6 changes: 5 additions & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ export default {
{
test: /\.css$/,
sideEffects: true,
use: ['style-loader', 'css-loader', 'postcss-loader'],
use: [
'style-loader',
{ loader: 'css-loader', options: { modules: { namedExport: false } } },
'postcss-loader',
],
},
],
},
Expand Down
10 changes: 5 additions & 5 deletions apps/help.mantine.dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@
"@mdx-js/react": "^3.0.0",
"@next/mdx": "^14.0.2",
"@tabler/icons-react": "^3.3.0",
"dayjs": "^1.11.10",
"dayjs": "^1.11.13",
"fuse.js": "7.0.0",
"next": "14.2.12",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-imask": "^7.1.3",
"react-imask": "^7.6.1",
"remark-slug": "^7.0.1",
"shiki": "^1.1.7"
},
"devDependencies": {
"@mdx-js/loader": "^3.0.0",
"@types/mdx": "2.0.10",
"@types/node": "^20.9.0",
"@types/react": "18.3.1",
"@types/react-dom": "18.2.15",
"typescript": "5.3.3"
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"typescript": "5.6.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export const h = (order: 1 | 2 | 3 | 4 | 5 | 6) => (props: any) => (
);

function getLanguage(children: any) {
// @ts-ignore
const matches = (children.props.className || '').match(/language-(?<lang>.*)/);
return matches && matches.groups && matches.groups.lang ? matches.groups.lang : 'tsx';
}
Expand Down
50 changes: 25 additions & 25 deletions apps/mantine.dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@docs/demos": "workspace:*",
"@docs/styles-api": "workspace:*",
"@floating-ui/react": "^0.26.9",
"@floating-ui/react": "^0.26.27",
"@hello-pangea/dnd": "^16.3.0",
"@mantine/carousel": "workspace:*",
"@mantine/charts": "workspace:*",
Expand All @@ -40,46 +40,46 @@
"@mdx-js/react": "^3.0.0",
"@next/mdx": "^14.0.2",
"@tabler/icons-react": "^3.3.0",
"@tiptap/core": "^2.2.1",
"@tiptap/extension-code-block": "^2.2.1",
"@tiptap/extension-code-block-lowlight": "^2.2.1",
"@tiptap/extension-color": "^2.2.1",
"@tiptap/extension-highlight": "^2.2.1",
"@tiptap/extension-link": "^2.2.1",
"@tiptap/extension-placeholder": "^2.2.1",
"@tiptap/extension-subscript": "^2.2.1",
"@tiptap/extension-superscript": "^2.2.1",
"@tiptap/extension-task-item": "^2.2.1",
"@tiptap/extension-task-list": "^2.2.1",
"@tiptap/extension-text-align": "^2.2.1",
"@tiptap/extension-text-style": "^2.2.1",
"@tiptap/extension-underline": "^2.2.1",
"@tiptap/pm": "^2.2.1",
"@tiptap/react": "^2.2.1",
"@tiptap/starter-kit": "^2.2.1",
"@tiptap/core": "^2.9.1",
"@tiptap/extension-code-block": "^2.9.1",
"@tiptap/extension-code-block-lowlight": "^2.9.1",
"@tiptap/extension-color": "^2.9.1",
"@tiptap/extension-highlight": "^2.9.1",
"@tiptap/extension-link": "^2.9.1",
"@tiptap/extension-placeholder": "^2.9.1",
"@tiptap/extension-subscript": "^2.9.1",
"@tiptap/extension-superscript": "^2.9.1",
"@tiptap/extension-task-item": "^2.9.1",
"@tiptap/extension-task-list": "^2.9.1",
"@tiptap/extension-text-align": "^2.9.1",
"@tiptap/extension-text-style": "^2.9.1",
"@tiptap/extension-underline": "^2.9.1",
"@tiptap/pm": "^2.9.1",
"@tiptap/react": "^2.9.1",
"@tiptap/starter-kit": "^2.9.1",
"@types/node": "^20.9.0",
"@types/react": "18.3.1",
"@types/react": "18.3.12",
"chroma-js": ">=2.4.2",
"dayjs": "^1.11.10",
"dayjs": "^1.11.13",
"embla-carousel": "^7.1.0",
"embla-carousel-autoplay": "^7.1.0",
"embla-carousel-react": "^7.1.0",
"github-slugger": "^2.0.0",
"highlight.js": "^11.9.0",
"highlight.js": "^11.10.0",
"lowlight": "^3.1.0",
"next": "14.2.12",
"next-sitemap": "^4.2.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-dropzone-esm": "15.0.1",
"react-number-format": "^5.3.1",
"recharts": "^2.10.3",
"react-number-format": "^5.4.2",
"recharts": "^2.13.3",
"remark-slug": "^7.0.1",
"shiki": "^1.1.7",
"typescript": "5.3.3"
"typescript": "5.6.3"
},
"devDependencies": {
"@types/chroma-js": "^2.4.3",
"@types/chroma-js": "^2.4.4",
"@types/github-slugger": "^2.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ interface PreProps {
}

function getLanguage(children: any) {
// @ts-ignore
const matches = (children.props.className || '').match(/language-(?<lang>.*)/);
const matchedLanguage =
matches && matches.groups && matches.groups.lang ? matches.groups.lang : 'tsx';
Expand Down
2 changes: 1 addition & 1 deletion apps/mantine.dev/src/pages/_document.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ export default function Document() {
);
}

const stylesServer = createEmotionServer(emotionCache);
const stylesServer = createEmotionServer(emotionCache as any);

Document.getInitialProps = createGetInitialProps(NextDocument, stylesServer);
24 changes: 5 additions & 19 deletions apps/mantine.dev/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
Expand All @@ -20,20 +16,10 @@
"incremental": true,
"baseUrl": ".",
"paths": {
"@/*": [
"./src/*"
],
"@/layout": [
"./src/components/MdxLayout"
]
"@/*": ["./src/*"],
"@/layout": ["./src/components/MdxLayout"]
}
},
"include": [
"next-env.d.ts",
"**/*.ts",
"**/*.tsx"
],
"exclude": [
"node_modules"
]
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
}
Loading

0 comments on commit 7f99f67

Please sign in to comment.