From c46eb67974f1bc2f065e0aa853963868d1d1bd93 Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Mon, 22 May 2023 14:29:11 +0200 Subject: [PATCH] fix: workaround for missing hoisted file --- package.json | 7 ++++- pnpm-lock.yaml | 51 +++++++++++++++++++------------- src/components/base/Header.astro | 10 +++---- src/{assets => utils}/splash.ts | 0 4 files changed, 42 insertions(+), 26 deletions(-) rename src/{assets => utils}/splash.ts (100%) diff --git a/package.json b/package.json index d93b8ca..80bc5cd 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.0", + "astro": "^2.5.1", "astro-pagefind": "^1.1.0", "dayjs": "^1.11.7", "leaflet": "^1.9.4", @@ -38,5 +38,10 @@ "@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 b102b5a..6ccc95f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,18 +1,21 @@ lockfileVersion: '6.0' +overrides: + rollup: 3.21.8 + dependencies: '@astrojs/mdx': specifier: ^0.19.2 - version: 0.19.2(astro@2.5.0)(rollup@3.22.0) + version: 0.19.2(astro@2.5.1)(rollup@3.22.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.0 - version: 2.5.0(sass@1.62.1) + specifier: ^2.5.1 + version: 2.5.1(sass@1.62.1) astro-pagefind: specifier: ^1.1.0 - version: 1.1.0(astro@2.5.0) + version: 1.1.0(astro@2.5.1) dayjs: specifier: ^1.11.7 version: 1.11.7 @@ -115,13 +118,13 @@ packages: vscode-uri: 3.0.7 dev: false - /@astrojs/markdown-remark@2.2.1(astro@2.5.0): + /@astrojs/markdown-remark@2.2.1(astro@2.5.1): resolution: {integrity: sha512-VF0HRv4GpC1XEMLnsKf6jth7JSmlt9qpqP0josQgA2eSpCIAC/Et+y94mgdBIZVBYH/yFnMoIxgKVe93xfO2GA==} peerDependencies: astro: ^2.5.0 dependencies: '@astrojs/prism': 2.1.2 - astro: 2.5.0(sass@1.62.1) + astro: 2.5.1(sass@1.62.1) github-slugger: 1.5.0 import-meta-resolve: 2.2.2 rehype-raw: 6.1.1 @@ -138,11 +141,11 @@ packages: - supports-color dev: false - /@astrojs/mdx@0.19.2(astro@2.5.0)(rollup@3.22.0): + /@astrojs/mdx@0.19.2(astro@2.5.1)(rollup@3.22.0): resolution: {integrity: sha512-xWI2TK2QvCFXhyadjVtidcOj7qHda2Fv3tUilhacFXF28vye/COluMirqgxEESMlUsV+8LI39f8P6ERxXADSmg==} engines: {node: '>=16.12.0'} dependencies: - '@astrojs/markdown-remark': 2.2.1(astro@2.5.0) + '@astrojs/markdown-remark': 2.2.1(astro@2.5.1) '@astrojs/prism': 2.1.2 '@mdx-js/mdx': 2.3.0 '@mdx-js/rollup': 2.3.0(rollup@3.22.0) @@ -1017,26 +1020,26 @@ packages: resolution: {integrity: sha512-I1jXZMjAgCMmxT4qxXfPXa6SthSoE8h6gkSI9BGGNv8mP8G/v0blc+qFnZu6K42vTOiuME596QaLO0TP3Lk0xg==} dev: false - /astring@1.8.4: - resolution: {integrity: sha512-97a+l2LBU3Op3bBQEff79i/E4jMD2ZLFD8rHx9B6mXyB2uQwhJQYfiDqUwtfjF4QA1F2qs//N6Cw8LetMbQjcw==} + /astring@1.8.5: + resolution: {integrity: sha512-TuBbdn7jWVzf8dmFGTaRpW8qgANtWLi1qJLnkfGO5uVf6jf9f/F4B1H35tnOI+qVYZo3p3i8WZlbZOuPAE0wEA==} hasBin: true dev: false - /astro-pagefind@1.1.0(astro@2.5.0): + /astro-pagefind@1.1.0(astro@2.5.1): resolution: {integrity: sha512-cW/F6IOX/F4FewQggwgjyndtv2yt23o2QOSWpPavlHnG0HbJvhcPiAT315nAqHS81xGmSyQw0YNJdTEcgGIlfg==} peerDependencies: astro: ^2.0.4 dependencies: '@pagefind/default-ui': 0.12.0 - astro: 2.5.0(sass@1.62.1) + astro: 2.5.1(sass@1.62.1) pagefind: 0.12.0 sirv: 2.0.3 transitivePeerDependencies: - supports-color dev: false - /astro@2.5.0(sass@1.62.1): - resolution: {integrity: sha512-dZZuK2vEpfinbVALthUW31NOVUFPobgyi0+2PR3FH3diy6X9HBw1PLbS5wRsWOKaEXRbzxBkXc39Rbm0yRzKaA==} + /astro@2.5.1(sass@1.62.1): + resolution: {integrity: sha512-tOVlDWxxE8VBGoolW0AS0kUo7ynAMjfOPKK0XyqprAtcN7pvYZ29gLG6RJTitDhzzP3HDt+Vecg9PuUOtHrITg==} engines: {node: '>=16.12.0', npm: '>=6.14.0'} hasBin: true peerDependencies: @@ -1047,7 +1050,7 @@ packages: dependencies: '@astrojs/compiler': 1.4.2 '@astrojs/language-server': 1.0.5 - '@astrojs/markdown-remark': 2.2.1(astro@2.5.0) + '@astrojs/markdown-remark': 2.2.1(astro@2.5.1) '@astrojs/telemetry': 2.1.1 '@astrojs/webapi': 2.1.1 '@babel/core': 7.21.8 @@ -1191,7 +1194,7 @@ packages: dependencies: caniuse-lite: 1.0.30001488 electron-to-chromium: 1.4.402 - node-releases: 2.0.10 + node-releases: 2.0.11 update-browserslist-db: 1.0.11(browserslist@4.21.5) dev: false @@ -1551,7 +1554,7 @@ packages: resolution: {integrity: sha512-IzU74r1PK5IMMGZXUVZbmiu4A1uhiPgW5hm1GjcOfr4ZzHaMPpLNJjR7HjXiIOzi25nZDrgFTobHTkV5Q6ITjA==} dependencies: '@types/estree-jsx': 1.0.0 - astring: 1.8.4 + astring: 1.8.5 source-map: 0.7.4 dev: false @@ -2848,8 +2851,8 @@ packages: lodash: 4.17.21 dev: false - /node-releases@2.0.10: - resolution: {integrity: sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==} + /node-releases@2.0.11: + resolution: {integrity: sha512-+M0PwXeU80kRohZ3aT4J/OnR+l9/KD2nVLNNoRgFtnf+umQVFdGBAO2N8+nCnEi0xlh/Wk3zOGC+vNNx+uM79Q==} dev: false /normalize-path@3.0.0: @@ -3290,6 +3293,14 @@ 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==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} @@ -3803,7 +3814,7 @@ packages: dependencies: esbuild: 0.17.19 postcss: 8.4.23 - rollup: 3.22.0 + rollup: 3.21.8 sass: 1.62.1 optionalDependencies: fsevents: 2.3.2 diff --git a/src/components/base/Header.astro b/src/components/base/Header.astro index ee39bc2..bf31fc0 100644 --- a/src/components/base/Header.astro +++ b/src/components/base/Header.astro @@ -77,9 +77,9 @@ const menu: MenuItem[] = [ ))} - - + + diff --git a/src/assets/splash.ts b/src/utils/splash.ts similarity index 100% rename from src/assets/splash.ts rename to src/utils/splash.ts