From 5bf62b31a74a7c2ada1b884ab3c8f0e49d326178 Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Mon, 22 May 2023 16:08:24 +0200 Subject: [PATCH] fix: remove workaround for missing hoisted file --- package.json | 7 +-- pnpm-lock.yaml | 117 ++++++++++++++++++++++--------------------------- 2 files changed, 54 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index 80bc5cd..1b87393 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/mdx": "^0.19.2", "@astrojs/solid-js": "^2.2.0", - "astro": "^2.5.1", + "astro": "^2.5.2", "astro-pagefind": "^1.1.0", "dayjs": "^1.11.7", "leaflet": "^1.9.4", @@ -38,10 +38,5 @@ "@types/unist": "^2.0.6", "pagefind": "^0.12.0", "sass": "^1.62.1" - }, - "pnpm": { - "overrides": { - "rollup": "3.21.8" - } } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6ccc95f..642807f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,21 +1,18 @@ lockfileVersion: '6.0' -overrides: - rollup: 3.21.8 - dependencies: '@astrojs/mdx': specifier: ^0.19.2 - version: 0.19.2(astro@2.5.1)(rollup@3.22.0) + version: 0.19.2(astro@2.5.2)(rollup@3.23.0) '@astrojs/solid-js': specifier: ^2.2.0 version: 2.2.0(@babel/core@7.21.8)(solid-js@1.7.5) astro: - specifier: ^2.5.1 - version: 2.5.1(sass@1.62.1) + specifier: ^2.5.2 + version: 2.5.2(sass@1.62.1) astro-pagefind: specifier: ^1.1.0 - version: 1.1.0(astro@2.5.1) + version: 1.1.0(astro@2.5.2) dayjs: specifier: ^1.11.7 version: 1.11.7 @@ -118,13 +115,13 @@ packages: vscode-uri: 3.0.7 dev: false - /@astrojs/markdown-remark@2.2.1(astro@2.5.1): + /@astrojs/markdown-remark@2.2.1(astro@2.5.2): resolution: {integrity: sha512-VF0HRv4GpC1XEMLnsKf6jth7JSmlt9qpqP0josQgA2eSpCIAC/Et+y94mgdBIZVBYH/yFnMoIxgKVe93xfO2GA==} peerDependencies: astro: ^2.5.0 dependencies: '@astrojs/prism': 2.1.2 - astro: 2.5.1(sass@1.62.1) + astro: 2.5.2(sass@1.62.1) github-slugger: 1.5.0 import-meta-resolve: 2.2.2 rehype-raw: 6.1.1 @@ -141,14 +138,14 @@ packages: - supports-color dev: false - /@astrojs/mdx@0.19.2(astro@2.5.1)(rollup@3.22.0): + /@astrojs/mdx@0.19.2(astro@2.5.2)(rollup@3.23.0): resolution: {integrity: sha512-xWI2TK2QvCFXhyadjVtidcOj7qHda2Fv3tUilhacFXF28vye/COluMirqgxEESMlUsV+8LI39f8P6ERxXADSmg==} engines: {node: '>=16.12.0'} dependencies: - '@astrojs/markdown-remark': 2.2.1(astro@2.5.1) + '@astrojs/markdown-remark': 2.2.1(astro@2.5.2) '@astrojs/prism': 2.1.2 '@mdx-js/mdx': 2.3.0 - '@mdx-js/rollup': 2.3.0(rollup@3.22.0) + '@mdx-js/rollup': 2.3.0(rollup@3.23.0) acorn: 8.8.2 es-module-lexer: 1.2.1 estree-util-visit: 1.2.1 @@ -219,8 +216,8 @@ packages: '@babel/highlight': 7.18.6 dev: false - /@babel/compat-data@7.21.7: - resolution: {integrity: sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==} + /@babel/compat-data@7.21.9: + resolution: {integrity: sha512-FUGed8kfhyWvbYug/Un/VPJD41rDIgoVVcR+FuzhzOYyRz5uED+Gd3SLZml0Uw2l2aHFb7ZgdW5mGA3G2cCCnQ==} engines: {node: '>=6.9.0'} dev: false @@ -230,12 +227,12 @@ packages: dependencies: '@ampproject/remapping': 2.2.1 '@babel/code-frame': 7.21.4 - '@babel/generator': 7.21.5 + '@babel/generator': 7.21.9 '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) '@babel/helper-module-transforms': 7.21.5 '@babel/helpers': 7.21.5 - '@babel/parser': 7.21.8 - '@babel/template': 7.20.7 + '@babel/parser': 7.21.9 + '@babel/template': 7.21.9 '@babel/traverse': 7.21.5 '@babel/types': 7.21.5 convert-source-map: 1.9.0 @@ -247,8 +244,8 @@ packages: - supports-color dev: false - /@babel/generator@7.21.5: - resolution: {integrity: sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==} + /@babel/generator@7.21.9: + resolution: {integrity: sha512-F3fZga2uv09wFdEjEQIJxXALXfz0+JaOb7SabvVMmjHxeVTuGW8wgE8Vp1Hd7O+zMTYtcfEISGRzPkeiaPPsvg==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.21.5 @@ -270,7 +267,7 @@ packages: peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/compat-data': 7.21.7 + '@babel/compat-data': 7.21.9 '@babel/core': 7.21.8 '@babel/helper-validator-option': 7.21.0 browserslist: 4.21.5 @@ -287,7 +284,7 @@ packages: resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.20.7 + '@babel/template': 7.21.9 '@babel/types': 7.21.5 dev: false @@ -321,7 +318,7 @@ packages: '@babel/helper-simple-access': 7.21.5 '@babel/helper-split-export-declaration': 7.18.6 '@babel/helper-validator-identifier': 7.19.1 - '@babel/template': 7.20.7 + '@babel/template': 7.21.9 '@babel/traverse': 7.21.5 '@babel/types': 7.21.5 transitivePeerDependencies: @@ -366,7 +363,7 @@ packages: resolution: {integrity: sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.20.7 + '@babel/template': 7.21.9 '@babel/traverse': 7.21.5 '@babel/types': 7.21.5 transitivePeerDependencies: @@ -382,8 +379,8 @@ packages: js-tokens: 4.0.0 dev: false - /@babel/parser@7.21.8: - resolution: {integrity: sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==} + /@babel/parser@7.21.9: + resolution: {integrity: sha512-q5PNg/Bi1OpGgx5jYlvWZwAorZepEudDMCLtj967aeS7WMont7dUZI46M2XwcIQqvUlMxWfdLFu4S/qSxeUu5g==} engines: {node: '>=6.0.0'} hasBin: true dependencies: @@ -414,12 +411,12 @@ packages: '@babel/types': 7.21.5 dev: false - /@babel/template@7.20.7: - resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==} + /@babel/template@7.21.9: + resolution: {integrity: sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.21.4 - '@babel/parser': 7.21.8 + '@babel/parser': 7.21.9 '@babel/types': 7.21.5 dev: false @@ -428,12 +425,12 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.21.4 - '@babel/generator': 7.21.5 + '@babel/generator': 7.21.9 '@babel/helper-environment-visitor': 7.21.5 '@babel/helper-function-name': 7.21.0 '@babel/helper-hoist-variables': 7.18.6 '@babel/helper-split-export-declaration': 7.18.6 - '@babel/parser': 7.21.8 + '@babel/parser': 7.21.9 '@babel/types': 7.21.5 debug: 4.3.4 globals: 11.12.0 @@ -711,7 +708,7 @@ packages: estree-util-is-identifier-name: 2.1.0 estree-util-to-js: 1.2.0 estree-walker: 3.0.3 - hast-util-to-estree: 2.3.2 + hast-util-to-estree: 2.3.3 markdown-extensions: 1.1.1 periscopic: 3.1.0 remark-mdx: 2.3.0 @@ -726,14 +723,14 @@ packages: - supports-color dev: false - /@mdx-js/rollup@2.3.0(rollup@3.22.0): + /@mdx-js/rollup@2.3.0(rollup@3.23.0): resolution: {integrity: sha512-wLvRfJS/M4UmdqTd+WoaySEE7q4BIejYf1xAHXYvtT1du/1Tl/z2450Gg2+Hu7fh05KwRRiehiTP9Yc/Dtn0fA==} peerDependencies: rollup: '>=2' dependencies: '@mdx-js/mdx': 2.3.0 - '@rollup/pluginutils': 5.0.2(rollup@3.22.0) - rollup: 3.22.0 + '@rollup/pluginutils': 5.0.2(rollup@3.23.0) + rollup: 3.23.0 source-map: 0.7.4 vfile: 5.3.7 transitivePeerDependencies: @@ -781,7 +778,7 @@ packages: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: false - /@rollup/pluginutils@5.0.2(rollup@3.22.0): + /@rollup/pluginutils@5.0.2(rollup@3.23.0): resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -793,7 +790,7 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.22.0 + rollup: 3.23.0 dev: false /@types/acorn@4.0.6: @@ -805,7 +802,7 @@ packages: /@types/babel__core@7.20.0: resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==} dependencies: - '@babel/parser': 7.21.8 + '@babel/parser': 7.21.9 '@babel/types': 7.21.5 '@types/babel__generator': 7.6.4 '@types/babel__template': 7.4.1 @@ -821,7 +818,7 @@ packages: /@types/babel__template@7.4.1: resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: - '@babel/parser': 7.21.8 + '@babel/parser': 7.21.9 '@babel/types': 7.21.5 dev: false @@ -1025,21 +1022,21 @@ packages: hasBin: true dev: false - /astro-pagefind@1.1.0(astro@2.5.1): + /astro-pagefind@1.1.0(astro@2.5.2): resolution: {integrity: sha512-cW/F6IOX/F4FewQggwgjyndtv2yt23o2QOSWpPavlHnG0HbJvhcPiAT315nAqHS81xGmSyQw0YNJdTEcgGIlfg==} peerDependencies: astro: ^2.0.4 dependencies: '@pagefind/default-ui': 0.12.0 - astro: 2.5.1(sass@1.62.1) + astro: 2.5.2(sass@1.62.1) pagefind: 0.12.0 sirv: 2.0.3 transitivePeerDependencies: - supports-color dev: false - /astro@2.5.1(sass@1.62.1): - resolution: {integrity: sha512-tOVlDWxxE8VBGoolW0AS0kUo7ynAMjfOPKK0XyqprAtcN7pvYZ29gLG6RJTitDhzzP3HDt+Vecg9PuUOtHrITg==} + /astro@2.5.2(sass@1.62.1): + resolution: {integrity: sha512-d/t9w1//++BXDiqLByYj0Ko+7cMqBnSTsZH85EGn2/FmOQvNRKgDOOHILPoFlmA4+AzWrtyCg9UCZXdlCH6/og==} engines: {node: '>=16.12.0', npm: '>=6.14.0'} hasBin: true peerDependencies: @@ -1050,12 +1047,12 @@ packages: dependencies: '@astrojs/compiler': 1.4.2 '@astrojs/language-server': 1.0.5 - '@astrojs/markdown-remark': 2.2.1(astro@2.5.1) + '@astrojs/markdown-remark': 2.2.1(astro@2.5.2) '@astrojs/telemetry': 2.1.1 '@astrojs/webapi': 2.1.1 '@babel/core': 7.21.8 - '@babel/generator': 7.21.5 - '@babel/parser': 7.21.8 + '@babel/generator': 7.21.9 + '@babel/parser': 7.21.9 '@babel/plugin-transform-react-jsx': 7.21.5(@babel/core@7.21.8) '@babel/traverse': 7.21.5 '@babel/types': 7.21.5 @@ -1069,7 +1066,7 @@ packages: cookie: 0.5.0 debug: 4.3.4 deepmerge-ts: 4.3.0 - devalue: 4.3.1 + devalue: 4.3.2 diff: 5.1.0 es-module-lexer: 1.2.1 esbuild: 0.17.19 @@ -1192,7 +1189,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001488 + caniuse-lite: 1.0.30001489 electron-to-chromium: 1.4.402 node-releases: 2.0.11 update-browserslist-db: 1.0.11(browserslist@4.21.5) @@ -1224,8 +1221,8 @@ packages: engines: {node: '>=10'} dev: false - /caniuse-lite@1.0.30001488: - resolution: {integrity: sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ==} + /caniuse-lite@1.0.30001489: + resolution: {integrity: sha512-x1mgZEXK8jHIfAxm+xgdpHpk50IN3z3q3zP261/WS+uvePxW8izXuCu6AHz0lkuYTlATDehiZ/tNyYBdSQsOUQ==} dev: false /ccount@2.0.1: @@ -1427,8 +1424,8 @@ packages: engines: {node: '>=6'} dev: false - /devalue@4.3.1: - resolution: {integrity: sha512-Kc0TSP9IUU9eg55au5Q3YtqaYI2cgntVpunJV9Exbm9nvlBeTE5p2NqYHfpuXK6+VF2hF5PI+BPFPUti7e2N1g==} + /devalue@4.3.2: + resolution: {integrity: sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==} dev: false /diff@5.1.0: @@ -1841,8 +1838,8 @@ packages: zwitch: 2.0.4 dev: false - /hast-util-to-estree@2.3.2: - resolution: {integrity: sha512-YYDwATNdnvZi3Qi84iatPIl1lWpXba1MeNrNbDfJfVzEBZL8uUmtR7mt7bxKBC8kuAuvb0bkojXYZzsNHyHCLg==} + /hast-util-to-estree@2.3.3: + resolution: {integrity: sha512-ihhPIUPxN0v0w6M5+IiAZZrn0LH2uZomeWwhn7uP7avZC6TE7lIiEh2yBMPr5+zi1aUCXq6VoYRgs2Bw9xmycQ==} dependencies: '@types/estree': 1.0.1 '@types/estree-jsx': 1.0.0 @@ -3293,16 +3290,8 @@ packages: engines: {node: '>=10.0.0'} dev: false - /rollup@3.21.8: - resolution: {integrity: sha512-SSFV2T2fWtQ/vvBip85u2Nr0GNKireabH9d7nXswBg+XSH+jbVDSYptRAEbCEsquhs503rpPA9POYAp0/Jhasw==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - dev: false - - /rollup@3.22.0: - resolution: {integrity: sha512-imsigcWor5Y/dC0rz2q0bBt9PabcL3TORry2hAa6O6BuMvY71bqHyfReAz5qyAqiQATD1m70qdntqBfBQjVWpQ==} + /rollup@3.23.0: + resolution: {integrity: sha512-h31UlwEi7FHihLe1zbk+3Q7z1k/84rb9BSwmBSr/XjOCEaBJ2YyedQDuM0t/kfOS0IxM+vk1/zI9XxYj9V+NJQ==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -3814,7 +3803,7 @@ packages: dependencies: esbuild: 0.17.19 postcss: 8.4.23 - rollup: 3.21.8 + rollup: 3.23.0 sass: 1.62.1 optionalDependencies: fsevents: 2.3.2