From 22965ef52b6d096c6455fe698a64c12cb2b2855e Mon Sep 17 00:00:00 2001 From: samithaf Date: Wed, 25 Oct 2023 21:15:18 +1100 Subject: [PATCH 1/2] updated keystatic core and next.js to latest stable --- apps/site/package.json | 4 +- pnpm-lock.yaml | 179 +++++++++++++++-------------------------- 2 files changed, 68 insertions(+), 115 deletions(-) diff --git a/apps/site/package.json b/apps/site/package.json index aa28b3fbe..1780c60e7 100644 --- a/apps/site/package.json +++ b/apps/site/package.json @@ -10,14 +10,14 @@ "check-types": "tsc --noemit --emitDeclarationOnly false" }, "dependencies": { - "@keystatic/core": "^0.1.4", + "@keystatic/core": "^0.1.7", "@keystatic/next": "^1.0.1", "@westpac/ui": "workspace:~", "clipboard-copy": "~4.0.1", "clsx": "^1.2.1", "framer-motion": "~10.12.16", "lodash.throttle": "~4.1.1", - "next": "^13.5.2", + "next": "^13.5.6", "prism-react-renderer": "~2.0.6", "prismjs": "~1.29.0", "react": "^18.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1e10f32cc..2e112e073 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,11 +33,11 @@ importers: apps/site: dependencies: '@keystatic/core': - specifier: ^0.1.4 - version: 0.1.7(next@13.5.2)(react-dom@18.2.0)(react@18.2.0) + specifier: ^0.1.7 + version: 0.1.7(next@13.5.6)(react-dom@18.2.0)(react@18.2.0) '@keystatic/next': specifier: ^1.0.1 - version: 1.0.1(@keystatic/core@0.1.7)(next@13.5.2)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.1(@keystatic/core@0.1.7)(next@13.5.6)(react-dom@18.2.0)(react@18.2.0) '@westpac/ui': specifier: workspace:~ version: link:../../packages/ui @@ -54,8 +54,8 @@ importers: specifier: ~4.1.1 version: 4.1.1 next: - specifier: ^13.5.2 - version: 13.5.2(@babel/core@7.0.0)(react-dom@18.2.0)(react@18.2.0) + specifier: ^13.5.6 + version: 13.5.6(@babel/core@7.0.0)(react-dom@18.2.0)(react@18.2.0) prism-react-renderer: specifier: ~2.0.6 version: 2.0.6(react@18.2.0) @@ -374,13 +374,13 @@ importers: version: 3.1.0(tailwindcss@3.3.2) ts-node: specifier: ~10.9.1 - version: 10.9.1(@swc/core@1.3.35)(@types/node@20.8.8)(typescript@5.1.6) + version: 10.9.1(@swc/core@1.3.35)(@types/node@17.0.12)(typescript@5.1.6) typescript: specifier: ^5.1.6 version: 5.1.6 vite: specifier: ^4.3.4 - version: 4.3.4(@types/node@20.8.8)(less@4.2.0) + version: 4.3.4(@types/node@17.0.12)(less@4.2.0) vitest: specifier: ^0.30.1 version: 0.30.1(jsdom@22.0.0)(less@4.2.0) @@ -3645,7 +3645,7 @@ packages: magic-string: 0.27.0 react-docgen-typescript: 2.2.2(typescript@5.1.6) typescript: 5.1.6 - vite: 4.3.4(@types/node@20.8.8)(less@4.2.0) + vite: 4.3.4(@types/node@17.0.12)(less@4.2.0) dev: true /@jridgewell/gen-mapping@0.3.3: @@ -3704,7 +3704,7 @@ packages: /@juggle/resize-observer@3.4.0: resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==} - /@keystar/ui@0.3.3(next@13.5.2)(react-dom@18.2.0)(react@18.2.0): + /@keystar/ui@0.3.3(next@13.5.6)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-ejd/swhxhcEldeEXJqg82g8DzjWdpVAET+UwbfxVG3dUe/1ZmE9M/nYP+X4POPJL5PdrUkNZpjMtrHZOAQKV6A==} peerDependencies: next: '13' @@ -3781,7 +3781,7 @@ packages: '@react-types/breadcrumbs': 3.7.1(react@18.2.0) '@react-types/button': 3.9.0(react@18.2.0) '@react-types/calendar': 3.4.1(react@18.2.0) - '@react-types/combobox': 3.8.1(react@18.2.0) + '@react-types/combobox': 3.7.0(react@18.2.0) '@react-types/datepicker': 3.6.1(react@18.2.0) '@react-types/grid': 3.2.2(react@18.2.0) '@react-types/menu': 3.9.5(react@18.2.0) @@ -3795,13 +3795,13 @@ packages: '@react-types/tabs': 3.3.3(react@18.2.0) emery: 1.4.2 facepaint: 1.2.1 - next: 13.5.2(@babel/core@7.0.0)(react-dom@18.2.0)(react@18.2.0) + next: 13.5.6(@babel/core@7.0.0)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@keystatic/core@0.1.7(next@13.5.2)(react-dom@18.2.0)(react@18.2.0): + /@keystatic/core@0.1.7(next@13.5.6)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-YJe9gDmVBeHiFqUjXUBpnWGMVmODxm+f4YgOBNrB3P5ghJ+g3ZRWf6f13VoBVTYlMObJxyf2GmrEOag3qt38Cg==} peerDependencies: react: ^18.2.0 @@ -3813,7 +3813,7 @@ packages: '@emotion/weak-memoize': 0.3.1 '@floating-ui/react': 0.24.8(react-dom@18.2.0)(react@18.2.0) '@internationalized/string': 3.1.1 - '@keystar/ui': 0.3.3(next@13.5.2)(react-dom@18.2.0)(react@18.2.0) + '@keystar/ui': 0.3.3(next@13.5.6)(react-dom@18.2.0)(react@18.2.0) '@markdoc/markdoc': 0.3.4(@types/react@18.2.28)(react@18.2.0) '@react-aria/focus': 3.14.3(react@18.2.0) '@react-aria/i18n': 3.8.4(react@18.2.0) @@ -3831,7 +3831,7 @@ packages: '@ts-gql/tag': 0.7.0(graphql@16.8.1) '@types/node': 16.11.13 '@types/react': 18.2.28 - '@types/react-dom': 18.2.1 + '@types/react-dom': 18.2.7 '@urql/core': 4.1.4(graphql@16.8.1) '@urql/exchange-auth': 2.1.6(graphql@16.8.1) '@urql/exchange-graphcache': 6.3.3(graphql@16.8.1) @@ -3875,7 +3875,7 @@ packages: - supports-color dev: false - /@keystatic/next@1.0.1(@keystatic/core@0.1.7)(next@13.5.2)(react-dom@18.2.0)(react@18.2.0): + /@keystatic/next@1.0.1(@keystatic/core@0.1.7)(next@13.5.6)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-FQtm3q1VkAypP3oBVhyMqN50uLubhHMeiTZ+Mso+GoOlvkUmV+RcRG/b+sNkl98vUz1Eh4r8EwVmFNXVtqBXdw==} peerDependencies: '@keystatic/core': '*' @@ -3884,10 +3884,10 @@ packages: react-dom: ^18.2.0 dependencies: '@babel/runtime': 7.23.2 - '@keystatic/core': 0.1.7(next@13.5.2)(react-dom@18.2.0)(react@18.2.0) + '@keystatic/core': 0.1.7(next@13.5.6)(react-dom@18.2.0)(react@18.2.0) '@types/react': 18.2.28 chokidar: 3.5.3 - next: 13.5.2(@babel/core@7.0.0)(react-dom@18.2.0)(react@18.2.0) + next: 13.5.6(@babel/core@7.0.0)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) server-only: 0.0.1 @@ -3963,8 +3963,8 @@ packages: tar-fs: 2.1.1 dev: true - /@next/env@13.5.2: - resolution: {integrity: sha512-dUseBIQVax+XtdJPzhwww4GetTjlkRSsXeQnisIJWBaHsnxYcN2RGzsPHi58D6qnkATjnhuAtQTJmR1hKYQQPg==} + /@next/env@13.5.6: + resolution: {integrity: sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==} dev: false /@next/eslint-plugin-next@13.1.1: @@ -3979,8 +3979,8 @@ packages: glob: 7.1.7 dev: false - /@next/swc-darwin-arm64@13.5.2: - resolution: {integrity: sha512-7eAyunAWq6yFwdSQliWMmGhObPpHTesiKxMw4DWVxhm5yLotBj8FCR4PXGkpRP2tf8QhaWuVba+/fyAYggqfQg==} + /@next/swc-darwin-arm64@13.5.6: + resolution: {integrity: sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -3988,8 +3988,8 @@ packages: dev: false optional: true - /@next/swc-darwin-x64@13.5.2: - resolution: {integrity: sha512-WxXYWE7zF1ch8rrNh5xbIWzhMVas6Vbw+9BCSyZvu7gZC5EEiyZNJsafsC89qlaSA7BnmsDXVWQmc+s1feSYbQ==} + /@next/swc-darwin-x64@13.5.6: + resolution: {integrity: sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -3997,8 +3997,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-gnu@13.5.2: - resolution: {integrity: sha512-URSwhRYrbj/4MSBjLlefPTK3/tvg95TTm6mRaiZWBB6Za3hpHKi8vSdnCMw5D2aP6k0sQQIEG6Pzcfwm+C5vrg==} + /@next/swc-linux-arm64-gnu@13.5.6: + resolution: {integrity: sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -4006,8 +4006,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-musl@13.5.2: - resolution: {integrity: sha512-HefiwAdIygFyNmyVsQeiJp+j8vPKpIRYDlmTlF9/tLdcd3qEL/UEBswa1M7cvO8nHcr27ZTKXz5m7dkd56/Esg==} + /@next/swc-linux-arm64-musl@13.5.6: + resolution: {integrity: sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -4015,8 +4015,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-gnu@13.5.2: - resolution: {integrity: sha512-htGVVroW0tdHgMYwKWkxWvVoG2RlAdDXRO1RQxYDvOBQsaV0nZsgKkw0EJJJ3urTYnwKskn/MXm305cOgRxD2w==} + /@next/swc-linux-x64-gnu@13.5.6: + resolution: {integrity: sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -4024,8 +4024,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-musl@13.5.2: - resolution: {integrity: sha512-UBD333GxbHVGi7VDJPPDD1bKnx30gn2clifNJbla7vo5nmBV+x5adyARg05RiT9amIpda6yzAEEUu+s774ldkw==} + /@next/swc-linux-x64-musl@13.5.6: + resolution: {integrity: sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -4033,8 +4033,8 @@ packages: dev: false optional: true - /@next/swc-win32-arm64-msvc@13.5.2: - resolution: {integrity: sha512-Em9ApaSFIQnWXRT3K6iFnr9uBXymixLc65Xw4eNt7glgH0eiXpg+QhjmgI2BFyc7k4ZIjglfukt9saNpEyolWA==} + /@next/swc-win32-arm64-msvc@13.5.6: + resolution: {integrity: sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -4042,8 +4042,8 @@ packages: dev: false optional: true - /@next/swc-win32-ia32-msvc@13.5.2: - resolution: {integrity: sha512-TBACBvvNYU+87X0yklSuAseqdpua8m/P79P0SG1fWUvWDDA14jASIg7kr86AuY5qix47nZLEJ5WWS0L20jAUNw==} + /@next/swc-win32-ia32-msvc@13.5.6: + resolution: {integrity: sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -4051,8 +4051,8 @@ packages: dev: false optional: true - /@next/swc-win32-x64-msvc@13.5.2: - resolution: {integrity: sha512-LfTHt+hTL8w7F9hnB3H4nRasCzLD/fP+h4/GUVBTxrkMJOnh/7OZ0XbYDKO/uuWwryJS9kZjhxcruBiYwc5UDw==} + /@next/swc-win32-x64-msvc@13.5.6: + resolution: {integrity: sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -5251,7 +5251,7 @@ packages: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: '@react-aria/focus': 3.14.3(react@18.2.0) - '@react-aria/utils': 3.21.1(react@18.2.0) + '@react-aria/utils': 3.18.0(react@18.2.0) '@react-types/shared': 3.18.1(react@18.2.0) '@swc/helpers': 0.5.3 react: 18.2.0 @@ -5941,7 +5941,7 @@ packages: '@react-aria/i18n': 3.8.4(react@18.2.0) '@react-aria/interactions': 3.19.1(react@18.2.0) '@react-aria/landmark': 3.0.0-beta.2(react@18.2.0) - '@react-aria/utils': 3.21.1(react@18.2.0) + '@react-aria/utils': 3.18.0(react@18.2.0) '@react-stately/toast': 3.0.0-beta.1(react@18.2.0) '@react-types/button': 3.9.0(react@18.2.0) '@react-types/shared': 3.18.1(react@18.2.0) @@ -6323,7 +6323,7 @@ packages: '@react-stately/selection': 3.13.4(react@18.2.0) '@react-types/grid': 3.2.1(react@18.2.0) '@react-types/shared': 3.21.0(react@18.2.0) - '@swc/helpers': 0.5.1 + '@swc/helpers': 0.5.3 react: 18.2.0 dev: false @@ -7953,7 +7953,7 @@ packages: remark-slug: 6.1.0 rollup: 3.26.2 typescript: 5.1.6 - vite: 4.3.4(@types/node@20.8.8)(less@4.2.0) + vite: 4.3.4(@types/node@17.0.12)(less@4.2.0) transitivePeerDependencies: - supports-color dev: true @@ -8606,7 +8606,7 @@ packages: react: 18.2.0 react-docgen: 6.0.0-alpha.3 react-dom: 18.2.0(react@18.2.0) - vite: 4.3.4(@types/node@20.8.8)(less@4.2.0) + vite: 4.3.4(@types/node@17.0.12)(less@4.2.0) transitivePeerDependencies: - '@preact/preset-vite' - supports-color @@ -9520,7 +9520,6 @@ packages: /@types/node@17.0.12: resolution: {integrity: sha512-4YpbAsnJXWYK/fpTVFlMIcUIho2AYCi4wg5aNPrG1ng7fn/1/RZfCIpRCiBX+12RVa34RluilnvCqD+g3KiSiA==} - dev: true /@types/node@20.6.4: resolution: {integrity: sha512-nU6d9MPY0NBUMiE/nXd2IIoC4OLvsLpwAjheoAeuzgvDZA1Cb10QYg+91AF6zQiKWRN5i1m07x6sMe0niBznoQ==} @@ -9530,6 +9529,7 @@ packages: resolution: {integrity: sha512-YRsdVxq6OaLfmR9Hy816IMp33xOBjfyOgUd77ehqg96CFywxAPbDbXvAsuN2KVg2HOT8Eh6uAfU+l4WffwPVrQ==} dependencies: undici-types: 5.25.3 + dev: true /@types/normalize-package-data@2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -9576,12 +9576,12 @@ packages: resolution: {integrity: sha512-8QZEV9+Kwy7tXFmjJrp3XUKQSs9LTnE0KnoUb0YCguWBiNW0Yfb2iBMYZ08WPg35IR6P3Z0s00B15SwZnO26+w==} dependencies: '@types/react': 18.2.28 + dev: true /@types/react-dom@18.2.7: resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==} dependencies: '@types/react': 18.2.28 - dev: true /@types/react@18.2.28: resolution: {integrity: sha512-ad4aa/RaaJS3hyGz0BGegdnSRXQBkd1CCYDCdNjBPg90UUpLgo+WlJqb9fMYUxtehmzF3PJaTWqRZjko6BRzBg==} @@ -9919,7 +9919,7 @@ packages: vite: ^4 dependencies: '@swc/core': 1.3.68 - vite: 4.3.4(@types/node@20.8.8)(less@4.2.0) + vite: 4.3.4(@types/node@17.0.12)(less@4.2.0) transitivePeerDependencies: - '@swc/helpers' dev: true @@ -9935,7 +9935,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.22.8) magic-string: 0.27.0 react-refresh: 0.14.0 - vite: 4.3.4(@types/node@20.8.8)(less@4.2.0) + vite: 4.3.4(@types/node@17.0.12)(less@4.2.0) transitivePeerDependencies: - supports-color dev: true @@ -10907,10 +10907,10 @@ packages: /caniuse-lite@1.0.30001515: resolution: {integrity: sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==} + dev: true /caniuse-lite@1.0.30001547: resolution: {integrity: sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==} - dev: true /capital-case@1.0.4: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} @@ -14230,7 +14230,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.8.8 + '@types/node': 17.0.12 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true @@ -15148,8 +15148,8 @@ packages: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} dev: true - /next@13.5.2(@babel/core@7.0.0)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-vog4UhUaMYAzeqfiAAmgB/QWLW7p01/sg+2vn6bqc/CxHFYizMzLv6gjxKzl31EVFkfl/F+GbxlKizlkTE9RdA==} + /next@13.5.6(@babel/core@7.0.0)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==} engines: {node: '>=16.14.0'} hasBin: true peerDependencies: @@ -15163,26 +15163,25 @@ packages: sass: optional: true dependencies: - '@next/env': 13.5.2 + '@next/env': 13.5.6 '@swc/helpers': 0.5.2 busboy: 1.6.0 - caniuse-lite: 1.0.30001515 - postcss: 8.4.14 + caniuse-lite: 1.0.30001547 + postcss: 8.4.31 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) styled-jsx: 5.1.1(@babel/core@7.0.0)(react@18.2.0) watchpack: 2.4.0 - zod: 3.21.4 optionalDependencies: - '@next/swc-darwin-arm64': 13.5.2 - '@next/swc-darwin-x64': 13.5.2 - '@next/swc-linux-arm64-gnu': 13.5.2 - '@next/swc-linux-arm64-musl': 13.5.2 - '@next/swc-linux-x64-gnu': 13.5.2 - '@next/swc-linux-x64-musl': 13.5.2 - '@next/swc-win32-arm64-msvc': 13.5.2 - '@next/swc-win32-ia32-msvc': 13.5.2 - '@next/swc-win32-x64-msvc': 13.5.2 + '@next/swc-darwin-arm64': 13.5.6 + '@next/swc-darwin-x64': 13.5.6 + '@next/swc-linux-arm64-gnu': 13.5.6 + '@next/swc-linux-arm64-musl': 13.5.6 + '@next/swc-linux-x64-gnu': 13.5.6 + '@next/swc-linux-x64-musl': 13.5.6 + '@next/swc-win32-arm64-msvc': 13.5.6 + '@next/swc-win32-ia32-msvc': 13.5.6 + '@next/swc-win32-x64-msvc': 13.5.6 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros @@ -15893,7 +15892,7 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.24 - ts-node: 10.9.1(@swc/core@1.3.35)(@types/node@20.8.8)(typescript@5.1.6) + ts-node: 10.9.1(@swc/core@1.3.35)(@types/node@17.0.12)(typescript@5.1.6) yaml: 2.3.1 /postcss-loader@7.3.3(postcss@8.4.24)(webpack@5.89.0): @@ -15992,15 +15991,6 @@ packages: /postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - /postcss@8.4.14: - resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.6 - picocolors: 1.0.0 - source-map-js: 1.0.2 - dev: false - /postcss@8.4.24: resolution: {integrity: sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==} engines: {node: ^10 || ^12 || >=14} @@ -18004,7 +17994,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /ts-node@10.9.1(@swc/core@1.3.35)(@types/node@20.8.8)(typescript@5.1.6): + /ts-node@10.9.1(@swc/core@1.3.35)(@types/node@17.0.12)(typescript@5.1.6): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -18024,7 +18014,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.8.8 + '@types/node': 17.0.12 acorn: 8.10.0 acorn-walk: 8.2.0 arg: 4.1.3 @@ -18242,6 +18232,7 @@ packages: /undici-types@5.25.3: resolution: {integrity: sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==} + dev: true /unfetch@4.2.0: resolution: {integrity: sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==} @@ -18571,40 +18562,6 @@ packages: fsevents: 2.3.3 dev: true - /vite@4.3.4(@types/node@20.8.8)(less@4.2.0): - resolution: {integrity: sha512-f90aqGBoxSFxWph2b39ae2uHAxm5jFBBdnfueNxZAT1FTpM13ccFQExCaKbR2xFW5atowjleRniQ7onjJ22QEg==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 20.8.8 - esbuild: 0.17.19 - less: 4.2.0 - postcss: 8.4.24 - rollup: 3.26.2 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /vitest@0.30.1(jsdom@22.0.0)(less@4.2.0): resolution: {integrity: sha512-y35WTrSTlTxfMLttgQk4rHcaDkbHQwDP++SNwPb+7H8yb13Q3cu2EixrtHzF27iZ8v0XCciSsLg00RkPAzB/aA==} engines: {node: '>=v14.18.0'} @@ -19074,10 +19031,6 @@ packages: engines: {node: '>=12.20'} dev: true - /zod@3.21.4: - resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==} - dev: false - /zod@3.22.4: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false From c61516993b3ee000ad7e75fd7e705d3f30b22304 Mon Sep 17 00:00:00 2001 From: samithaf Date: Wed, 25 Oct 2023 21:30:22 +1100 Subject: [PATCH 2/2] use article as a string instead of an array of string --- apps/site/src/app/articles/[...article]/page.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/site/src/app/articles/[...article]/page.tsx b/apps/site/src/app/articles/[...article]/page.tsx index 32f0f05e0..946921b03 100644 --- a/apps/site/src/app/articles/[...article]/page.tsx +++ b/apps/site/src/app/articles/[...article]/page.tsx @@ -8,10 +8,9 @@ export function generateMetadata({ params }: { params: { article: string } }) { return { title: formatComponentSlug(article[article.length - 1]) }; } -export default async function ArticleServerPage({ params }: { params: { article: string[] } }) { +export default async function ArticleServerPage({ params }: { params: { article: string } }) { const { article: articleParam } = params; - console.log(`articleParam.join('/')`, articleParam.join('/')); - const article = await reader.collections.articles.readOrThrow(articleParam.join('/')); + const article = await reader.collections.articles.readOrThrow(articleParam); const [articleContent, author] = await Promise.all([ article.content(),