From eeb6883e8950a30f009d75914dbb9bb466526c5f Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Sat, 7 Oct 2023 09:49:03 +0200 Subject: [PATCH] fix(deps): poluted lockfile with git merge messages --- package.json | 4 - pnpm-lock.yaml | 224 +++++++++++++++++++++++-------------------------- 2 files changed, 106 insertions(+), 122 deletions(-) diff --git a/package.json b/package.json index 66768e7..d33aaff 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,7 @@ "@tailwindcss/typography": "^0.5.8", "@vercel/analytics": "1.0.1", "clsx": "^1.2.1", -<<<<<<< Updated upstream - "next": "13.4.4", -======= "next": "13.5.4", ->>>>>>> Stashed changes "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f189e33..0060439 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,13 +27,8 @@ importers: specifier: ^1.2.1 version: 1.2.1 next: -<<<<<<< Updated upstream - specifier: 13.4.4 - version: 13.4.4(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) -======= specifier: 13.5.4 version: 13.5.4(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0) ->>>>>>> Stashed changes react: specifier: 18.2.0 version: 18.2.0 @@ -119,7 +114,7 @@ importers: version: 18.0.9 autoprefixer: specifier: ^10 - version: 10.4.13(postcss@8.4.24) + version: 10.4.13(postcss@8.4.31) eslint: specifier: ^8 version: 8.41.0 @@ -128,10 +123,10 @@ importers: version: 13.5.4(eslint@8.41.0)(typescript@5.1.3) postcss: specifier: ^8 - version: 8.4.24 + version: 8.4.31 tailwindcss: specifier: ^3 - version: 3.2.4(postcss@8.4.24) + version: 3.2.4(postcss@8.4.31) typescript: specifier: ^5 version: 5.1.3 @@ -157,13 +152,8 @@ importers: specifier: ^1.2.1 version: 1.2.1 next: -<<<<<<< Updated upstream - specifier: 13.4.4 - version: 13.4.4(@babel/core@7.22.1)(react-dom@18.2.0)(react@18.2.0) -======= specifier: 13.5.4 version: 13.5.4(@babel/core@7.22.1)(react-dom@18.2.0)(react@18.2.0) ->>>>>>> Stashed changes react: specifier: 18.2.0 version: 18.2.0 @@ -942,13 +932,8 @@ packages: react: 18.2.0 dev: false -<<<<<<< Updated upstream - /@next/env@13.4.4: - resolution: {integrity: sha512-q/y7VZj/9YpgzDe64Zi6rY1xPizx80JjlU2BTevlajtaE3w1LqweH1gGgxou2N7hdFosXHjGrI4OUvtFXXhGLg==} -======= /@next/env@13.5.4: resolution: {integrity: sha512-LGegJkMvRNw90WWphGJ3RMHMVplYcOfRWf2Be3td3sUa+1AaxmsYyANsA+znrGCBjXJNi4XAQlSoEfUxs/4kIQ==} ->>>>>>> Stashed changes dev: false /@next/eslint-plugin-next@13.0.4: @@ -974,13 +959,8 @@ packages: source-map: 0.7.4 dev: false -<<<<<<< Updated upstream - /@next/swc-darwin-arm64@13.4.4: - resolution: {integrity: sha512-xfjgXvp4KalNUKZMHmsFxr1Ug+aGmmO6NWP0uoh4G3WFqP/mJ1xxfww0gMOeMeSq/Jyr5k7DvoZ2Pv+XOITTtw==} -======= /@next/swc-darwin-arm64@13.5.4: resolution: {integrity: sha512-Df8SHuXgF1p+aonBMcDPEsaahNo2TCwuie7VXED4FVyECvdXfRT9unapm54NssV9tF3OQFKBFOdlje4T43VO0w==} ->>>>>>> Stashed changes engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -988,13 +968,8 @@ packages: dev: false optional: true -<<<<<<< Updated upstream - /@next/swc-darwin-x64@13.4.4: - resolution: {integrity: sha512-ZY9Ti1hkIwJsxGus3nlubIkvYyB0gNOYxKrfsOrLEqD0I2iCX8D7w8v6QQZ2H+dDl6UT29oeEUdDUNGk4UEpfg==} -======= /@next/swc-darwin-x64@13.5.4: resolution: {integrity: sha512-siPuUwO45PnNRMeZnSa8n/Lye5ZX93IJom9wQRB5DEOdFrw0JjOMu1GINB8jAEdwa7Vdyn1oJ2xGNaQpdQQ9Pw==} ->>>>>>> Stashed changes engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -1002,13 +977,8 @@ packages: dev: false optional: true -<<<<<<< Updated upstream - /@next/swc-linux-arm64-gnu@13.4.4: - resolution: {integrity: sha512-+KZnDeMShYkpkqAvGCEDeqYTRADJXc6SY1jWXz+Uo6qWQO/Jd9CoyhTJwRSxvQA16MoYzvILkGaDqirkRNctyA==} -======= /@next/swc-linux-arm64-gnu@13.5.4: resolution: {integrity: sha512-l/k/fvRP/zmB2jkFMfefmFkyZbDkYW0mRM/LB+tH5u9pB98WsHXC0WvDHlGCYp3CH/jlkJPL7gN8nkTQVrQ/2w==} ->>>>>>> Stashed changes engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -1016,13 +986,8 @@ packages: dev: false optional: true -<<<<<<< Updated upstream - /@next/swc-linux-arm64-musl@13.4.4: - resolution: {integrity: sha512-evC1twrny2XDT4uOftoubZvW3EG0zs0ZxMwEtu/dDGVRO5n5pT48S8qqEIBGBUZYu/Xx4zzpOkIxx1vpWdE+9A==} -======= /@next/swc-linux-arm64-musl@13.5.4: resolution: {integrity: sha512-YYGb7SlLkI+XqfQa8VPErljb7k9nUnhhRrVaOdfJNCaQnHBcvbT7cx/UjDQLdleJcfyg1Hkn5YSSIeVfjgmkTg==} ->>>>>>> Stashed changes engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -1030,13 +995,8 @@ packages: dev: false optional: true -<<<<<<< Updated upstream - /@next/swc-linux-x64-gnu@13.4.4: - resolution: {integrity: sha512-PX706XcCHr2FfkyhP2lpf+pX/tUvq6/ke7JYnnr0ykNdEMo+sb7cC/o91gnURh4sPYSiZJhsF2gbIqg9rciOHQ==} -======= /@next/swc-linux-x64-gnu@13.5.4: resolution: {integrity: sha512-uE61vyUSClnCH18YHjA8tE1prr/PBFlBFhxBZis4XBRJoR+txAky5d7gGNUIbQ8sZZ7LVkSVgm/5Fc7mwXmRAg==} ->>>>>>> Stashed changes engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1044,13 +1004,8 @@ packages: dev: false optional: true -<<<<<<< Updated upstream - /@next/swc-linux-x64-musl@13.4.4: - resolution: {integrity: sha512-TKUUx3Ftd95JlHV6XagEnqpT204Y+IsEa3awaYIjayn0MOGjgKZMZibqarK3B1FsMSPaieJf2FEAcu9z0yT5aA==} -======= /@next/swc-linux-x64-musl@13.5.4: resolution: {integrity: sha512-qVEKFYML/GvJSy9CfYqAdUexA6M5AklYcQCW+8JECmkQHGoPxCf04iMh7CPR7wkHyWWK+XLt4Ja7hhsPJtSnhg==} ->>>>>>> Stashed changes engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1058,13 +1013,8 @@ packages: dev: false optional: true -<<<<<<< Updated upstream - /@next/swc-win32-arm64-msvc@13.4.4: - resolution: {integrity: sha512-FP8AadgSq4+HPtim7WBkCMGbhr5vh9FePXiWx9+YOdjwdQocwoCK5ZVC3OW8oh3TWth6iJ0AXJ/yQ1q1cwSZ3A==} -======= /@next/swc-win32-arm64-msvc@13.5.4: resolution: {integrity: sha512-mDSQfqxAlfpeZOLPxLymZkX0hYF3juN57W6vFHTvwKlnHfmh12Pt7hPIRLYIShk8uYRsKPtMTth/EzpwRI+u8w==} ->>>>>>> Stashed changes engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -1072,13 +1022,8 @@ packages: dev: false optional: true -<<<<<<< Updated upstream - /@next/swc-win32-ia32-msvc@13.4.4: - resolution: {integrity: sha512-3WekVmtuA2MCdcAOrgrI+PuFiFURtSyyrN1I3UPtS0ckR2HtLqyqmS334Eulf15g1/bdwMteePdK363X/Y9JMg==} -======= /@next/swc-win32-ia32-msvc@13.5.4: resolution: {integrity: sha512-aoqAT2XIekIWoriwzOmGFAvTtVY5O7JjV21giozBTP5c6uZhpvTWRbmHXbmsjZqY4HnEZQRXWkSAppsIBweKqw==} ->>>>>>> Stashed changes engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -1086,13 +1031,8 @@ packages: dev: false optional: true -<<<<<<< Updated upstream - /@next/swc-win32-x64-msvc@13.4.4: - resolution: {integrity: sha512-AHRITu/CrlQ+qzoqQtEMfaTu7GHaQ6bziQln/pVWpOYC1wU+Mq6VQQFlsDtMCnDztPZtppAXdvvbNS7pcfRzlw==} -======= /@next/swc-win32-x64-msvc@13.5.4: resolution: {integrity: sha512-cyRvlAxwlddlqeB9xtPSfNSCRy8BOa4wtMo0IuI9P7Y0XT2qpDrpFKRyZ7kUngZis59mPVla5k8X1oOJ8RxDYg==} ->>>>>>> Stashed changes engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -1277,10 +1217,10 @@ packages: /@types/node@18.11.17: resolution: {integrity: sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng==} - dev: true /@types/node@20.8.3: resolution: {integrity: sha512-jxiZQFpb+NlH5kjW49vXxvxTjeeqlbsnTAdBTKpzEdPs9itay7MscYXz3Fo9VYFEsfQ6LJFitHad3faerLAjCw==} + dev: true /@types/prop-types@15.7.5: resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} @@ -1805,6 +1745,22 @@ packages: postcss-value-parser: 4.2.0 dev: true + /autoprefixer@10.4.13(postcss@8.4.31): + resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==} + engines: {node: ^10 || ^12 || >=14} + hasBin: true + peerDependencies: + postcss: ^8.1.0 + dependencies: + browserslist: 4.21.7 + caniuse-lite: 1.0.30001492 + fraction.js: 4.2.0 + normalize-range: 0.1.2 + picocolors: 1.0.0 + postcss: 8.4.31 + postcss-value-parser: 4.2.0 + dev: true + /available-typed-arrays@1.0.5: resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} engines: {node: '>= 0.4'} @@ -3721,7 +3677,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.8.3 + '@types/node': 18.11.17 merge-stream: 2.0.0 supports-color: 8.1.1 dev: false @@ -4387,15 +4343,9 @@ packages: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} dev: false -<<<<<<< Updated upstream - /next@13.4.4(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-C5S0ysM0Ily9McL4Jb48nOQHT1BukOWI59uC3X/xCMlYIh9rJZCv7nzG92J6e1cOBqQbKovlpgvHWFmz4eKKEA==} - engines: {node: '>=16.8.0'} -======= /next@13.5.4(@babel/core@7.20.2)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-+93un5S779gho8y9ASQhb/bTkQF17FNQOtXLKAj3lsNgltEcF0C5PMLLncDmH+8X1EnJH1kbqAERa29nRXqhjA==} engines: {node: '>=16.14.0'} ->>>>>>> Stashed changes hasBin: true peerDependencies: '@opentelemetry/api': ^1.1.0 @@ -4408,32 +4358,14 @@ packages: sass: optional: true dependencies: -<<<<<<< Updated upstream - '@next/env': 13.4.4 - '@swc/helpers': 0.5.1 -======= '@next/env': 13.5.4 '@swc/helpers': 0.5.2 ->>>>>>> Stashed changes busboy: 1.6.0 caniuse-lite: 1.0.30001492 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.20.2)(react@18.2.0) -<<<<<<< Updated upstream - zod: 3.21.4 - optionalDependencies: - '@next/swc-darwin-arm64': 13.4.4 - '@next/swc-darwin-x64': 13.4.4 - '@next/swc-linux-arm64-gnu': 13.4.4 - '@next/swc-linux-arm64-musl': 13.4.4 - '@next/swc-linux-x64-gnu': 13.4.4 - '@next/swc-linux-x64-musl': 13.4.4 - '@next/swc-win32-arm64-msvc': 13.4.4 - '@next/swc-win32-ia32-msvc': 13.4.4 - '@next/swc-win32-x64-msvc': 13.4.4 -======= watchpack: 2.4.0 optionalDependencies: '@next/swc-darwin-arm64': 13.5.4 @@ -4445,21 +4377,14 @@ packages: '@next/swc-win32-arm64-msvc': 13.5.4 '@next/swc-win32-ia32-msvc': 13.5.4 '@next/swc-win32-x64-msvc': 13.5.4 ->>>>>>> Stashed changes transitivePeerDependencies: - '@babel/core' - babel-plugin-macros dev: false -<<<<<<< Updated upstream - /next@13.4.4(@babel/core@7.22.1)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-C5S0ysM0Ily9McL4Jb48nOQHT1BukOWI59uC3X/xCMlYIh9rJZCv7nzG92J6e1cOBqQbKovlpgvHWFmz4eKKEA==} - engines: {node: '>=16.8.0'} -======= /next@13.5.4(@babel/core@7.22.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-+93un5S779gho8y9ASQhb/bTkQF17FNQOtXLKAj3lsNgltEcF0C5PMLLncDmH+8X1EnJH1kbqAERa29nRXqhjA==} engines: {node: '>=16.14.0'} ->>>>>>> Stashed changes hasBin: true peerDependencies: '@opentelemetry/api': ^1.1.0 @@ -4472,32 +4397,14 @@ packages: sass: optional: true dependencies: -<<<<<<< Updated upstream - '@next/env': 13.4.4 - '@swc/helpers': 0.5.1 -======= '@next/env': 13.5.4 '@swc/helpers': 0.5.2 ->>>>>>> Stashed changes busboy: 1.6.0 caniuse-lite: 1.0.30001492 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.22.1)(react@18.2.0) -<<<<<<< Updated upstream - zod: 3.21.4 - optionalDependencies: - '@next/swc-darwin-arm64': 13.4.4 - '@next/swc-darwin-x64': 13.4.4 - '@next/swc-linux-arm64-gnu': 13.4.4 - '@next/swc-linux-arm64-musl': 13.4.4 - '@next/swc-linux-x64-gnu': 13.4.4 - '@next/swc-linux-x64-musl': 13.4.4 - '@next/swc-win32-arm64-msvc': 13.4.4 - '@next/swc-win32-ia32-msvc': 13.4.4 - '@next/swc-win32-x64-msvc': 13.4.4 -======= watchpack: 2.4.0 optionalDependencies: '@next/swc-darwin-arm64': 13.5.4 @@ -4509,7 +4416,6 @@ packages: '@next/swc-win32-arm64-msvc': 13.5.4 '@next/swc-win32-ia32-msvc': 13.5.4 '@next/swc-win32-x64-msvc': 13.5.4 ->>>>>>> Stashed changes transitivePeerDependencies: - '@babel/core' - babel-plugin-macros @@ -4768,7 +4674,19 @@ packages: postcss: 8.4.24 postcss-value-parser: 4.2.0 read-cache: 1.0.0 - resolve: 1.22.1 + resolve: 1.22.6 + dev: true + + /postcss-import@14.1.0(postcss@8.4.31): + resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} + engines: {node: '>=10.0.0'} + peerDependencies: + postcss: ^8.0.0 + dependencies: + postcss: 8.4.31 + postcss-value-parser: 4.2.0 + read-cache: 1.0.0 + resolve: 1.22.6 dev: true /postcss-js@4.0.0(postcss@8.4.19): @@ -4790,6 +4708,16 @@ packages: postcss: 8.4.24 dev: true + /postcss-js@4.0.0(postcss@8.4.31): + resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==} + engines: {node: ^12 || ^14 || >= 16} + peerDependencies: + postcss: ^8.3.3 + dependencies: + camelcase-css: 2.0.1 + postcss: 8.4.31 + dev: true + /postcss-load-config@3.1.4(postcss@8.4.19): resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} engines: {node: '>= 10'} @@ -4823,6 +4751,23 @@ packages: yaml: 1.10.2 dev: true + /postcss-load-config@3.1.4(postcss@8.4.31): + resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} + engines: {node: '>= 10'} + peerDependencies: + postcss: '>=8.0.9' + ts-node: '>=9.0.0' + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + dependencies: + lilconfig: 2.0.6 + postcss: 8.4.31 + yaml: 1.10.2 + dev: true + /postcss-nested@6.0.0(postcss@8.4.19): resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==} engines: {node: '>=12.0'} @@ -4842,6 +4787,16 @@ packages: postcss-selector-parser: 6.0.11 dev: true + /postcss-nested@6.0.0(postcss@8.4.31): + resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==} + engines: {node: '>=12.0'} + peerDependencies: + postcss: ^8.2.14 + dependencies: + postcss: 8.4.31 + postcss-selector-parser: 6.0.11 + dev: true + /postcss-selector-parser@6.0.10: resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} engines: {node: '>=4'} @@ -4884,7 +4839,6 @@ packages: nanoid: 3.3.6 picocolors: 1.0.0 source-map-js: 1.0.2 - dev: false /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} @@ -5571,7 +5525,41 @@ packages: postcss-selector-parser: 6.0.11 postcss-value-parser: 4.2.0 quick-lru: 5.1.1 - resolve: 1.22.1 + resolve: 1.22.6 + transitivePeerDependencies: + - ts-node + dev: true + + /tailwindcss@3.2.4(postcss@8.4.31): + resolution: {integrity: sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==} + engines: {node: '>=12.13.0'} + hasBin: true + peerDependencies: + postcss: ^8.0.9 + dependencies: + arg: 5.0.2 + chokidar: 3.5.3 + color-name: 1.1.4 + detective: 5.2.1 + didyoumean: 1.2.2 + dlv: 1.1.3 + fast-glob: 3.2.12 + glob-parent: 6.0.2 + is-glob: 4.0.3 + lilconfig: 2.0.6 + micromatch: 4.0.5 + normalize-path: 3.0.0 + object-hash: 3.0.0 + picocolors: 1.0.0 + postcss: 8.4.31 + postcss-import: 14.1.0(postcss@8.4.31) + postcss-js: 4.0.0(postcss@8.4.31) + postcss-load-config: 3.1.4(postcss@8.4.31) + postcss-nested: 6.0.0(postcss@8.4.31) + postcss-selector-parser: 6.0.11 + postcss-value-parser: 4.2.0 + quick-lru: 5.1.1 + resolve: 1.22.6 transitivePeerDependencies: - ts-node dev: true