diff --git a/package.json b/package.json
index ae67a2e..021ad6c 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
"@astrojs/markdoc": "^0.1.1",
"@astrojs/mdx": "^0.19.0",
"@astrojs/solid-js": "^2.1.0",
- "astro": "^2.3.1",
+ "astro": "^2.3.2",
"dayjs": "^1.11.7",
"leaflet": "^1.9.3",
"leaflet.markercluster": "^1.5.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bf25803..35966a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3,16 +3,16 @@ lockfileVersion: '6.0'
dependencies:
'@astrojs/markdoc':
specifier: ^0.1.1
- version: 0.1.1(astro@2.3.1)
+ version: 0.1.1(astro@2.3.2)
'@astrojs/mdx':
specifier: ^0.19.0
- version: 0.19.0(astro@2.3.1)(rollup@3.21.0)
+ version: 0.19.0(astro@2.3.2)(rollup@3.21.0)
'@astrojs/solid-js':
specifier: ^2.1.0
- version: 2.1.0(@babel/core@7.21.4)(solid-js@1.7.3)
+ version: 2.1.0(@babel/core@7.21.5)(solid-js@1.7.3)
astro:
- specifier: ^2.3.1
- version: 2.3.1(sass@1.62.1)
+ specifier: ^2.3.2
+ version: 2.3.2(sass@1.62.1)
dayjs:
specifier: ^1.11.7
version: 1.11.7
@@ -121,14 +121,14 @@ packages:
vscode-uri: 3.0.7
dev: false
- /@astrojs/markdoc@0.1.1(astro@2.3.1):
+ /@astrojs/markdoc@0.1.1(astro@2.3.2):
resolution: {integrity: sha512-NJgMTZWTCcL+4qmDim/wi53Mc6X7hk12hyI3JHWW7oiWVchdrvbdvG5i3c2bmT73+bMtG8XOEt2vvapQRixAKw==}
engines: {node: '>=16.12.0'}
peerDependencies:
astro: ^2.2.0
dependencies:
'@markdoc/markdoc': 0.2.2
- astro: 2.3.1(sass@1.62.1)
+ astro: 2.3.2(sass@1.62.1)
esbuild: 0.17.18
gray-matter: 4.0.3
kleur: 4.1.5
@@ -138,13 +138,13 @@ packages:
- react
dev: false
- /@astrojs/markdown-remark@2.1.4(astro@2.3.1):
+ /@astrojs/markdown-remark@2.1.4(astro@2.3.2):
resolution: {integrity: sha512-z5diCcFo2xkBAJ11KySAIKpZZkULZmzUvWsZ2VWIOrR6QrEgEfVl5jTpgPSedx4m+xUPuemlUviOotGB7ItNsQ==}
peerDependencies:
astro: ^2.3.0
dependencies:
'@astrojs/prism': 2.1.1
- astro: 2.3.1(sass@1.62.1)
+ astro: 2.3.2(sass@1.62.1)
github-slugger: 1.5.0
import-meta-resolve: 2.2.2
rehype-raw: 6.1.1
@@ -161,11 +161,11 @@ packages:
- supports-color
dev: false
- /@astrojs/mdx@0.19.0(astro@2.3.1)(rollup@3.21.0):
+ /@astrojs/mdx@0.19.0(astro@2.3.2)(rollup@3.21.0):
resolution: {integrity: sha512-McFpMV+npinIEKnY5t9hsdzLd76g78GgIRUPxem2OeXPNB8xr2pNS28GeU0+6Pn5STnB+sgcyyeqXLgzauOlMQ==}
engines: {node: '>=16.12.0'}
dependencies:
- '@astrojs/markdown-remark': 2.1.4(astro@2.3.1)
+ '@astrojs/markdown-remark': 2.1.4(astro@2.3.2)
'@astrojs/prism': 2.1.1
'@mdx-js/mdx': 2.3.0
'@mdx-js/rollup': 2.3.0(rollup@3.21.0)
@@ -196,15 +196,15 @@ packages:
prismjs: 1.29.0
dev: false
- /@astrojs/solid-js@2.1.0(@babel/core@7.21.4)(solid-js@1.7.3):
+ /@astrojs/solid-js@2.1.0(@babel/core@7.21.5)(solid-js@1.7.3):
resolution: {integrity: sha512-p07DP9NRWJPjtF+CzPZ9lzOMkoyw6wSs3S6g3OZUxR+DVQy3VIXXDqCcnZZVJI34VakkHuViZaoNNkBW/9I54w==}
engines: {node: '>=16.12.0'}
peerDependencies:
solid-js: ^1.4.3
dependencies:
- babel-preset-solid: 1.7.3(@babel/core@7.21.4)
+ babel-preset-solid: 1.7.3(@babel/core@7.21.5)
solid-js: 1.7.3
- vitefu: 0.2.4(vite@4.3.2)
+ vitefu: 0.2.4(vite@4.3.3)
transitivePeerDependencies:
- '@babel/core'
- vite
@@ -239,25 +239,25 @@ packages:
'@babel/highlight': 7.18.6
dev: false
- /@babel/compat-data@7.21.4:
- resolution: {integrity: sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==}
+ /@babel/compat-data@7.21.5:
+ resolution: {integrity: sha512-M+XAiQ7GzQ3FDPf0KOLkugzptnIypt0X0ma0wmlTKPR3IchgNFdx2JXxZdvd18JY5s7QkaFD/qyX0dsMpog/Ug==}
engines: {node: '>=6.9.0'}
dev: false
- /@babel/core@7.21.4:
- resolution: {integrity: sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==}
+ /@babel/core@7.21.5:
+ resolution: {integrity: sha512-9M398B/QH5DlfCOTKDZT1ozXr0x8uBEeFd+dJraGUZGiaNpGCDVGCc14hZexsMblw3XxltJ+6kSvogp9J+5a9g==}
engines: {node: '>=6.9.0'}
dependencies:
'@ampproject/remapping': 2.2.1
'@babel/code-frame': 7.21.4
- '@babel/generator': 7.21.4
- '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.4)
- '@babel/helper-module-transforms': 7.21.2
- '@babel/helpers': 7.21.0
- '@babel/parser': 7.21.4
+ '@babel/generator': 7.21.5
+ '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.5)
+ '@babel/helper-module-transforms': 7.21.5
+ '@babel/helpers': 7.21.5
+ '@babel/parser': 7.21.5
'@babel/template': 7.20.7
- '@babel/traverse': 7.21.4
- '@babel/types': 7.21.4
+ '@babel/traverse': 7.21.5
+ '@babel/types': 7.21.5
convert-source-map: 1.9.0
debug: 4.3.4
gensync: 1.0.0-beta.2
@@ -267,11 +267,11 @@ packages:
- supports-color
dev: false
- /@babel/generator@7.21.4:
- resolution: {integrity: sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==}
+ /@babel/generator@7.21.5:
+ resolution: {integrity: sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==}
engines: {node: '>=6.9.0'}
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
'@jridgewell/gen-mapping': 0.3.3
'@jridgewell/trace-mapping': 0.3.18
jsesc: 2.5.2
@@ -281,25 +281,25 @@ packages:
resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
engines: {node: '>=6.9.0'}
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
- /@babel/helper-compilation-targets@7.21.4(@babel/core@7.21.4):
- resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==}
+ /@babel/helper-compilation-targets@7.21.5(@babel/core@7.21.5):
+ resolution: {integrity: sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0
dependencies:
- '@babel/compat-data': 7.21.4
- '@babel/core': 7.21.4
+ '@babel/compat-data': 7.21.5
+ '@babel/core': 7.21.5
'@babel/helper-validator-option': 7.21.0
browserslist: 4.21.5
lru-cache: 5.1.1
semver: 6.3.0
dev: false
- /@babel/helper-environment-visitor@7.18.9:
- resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
+ /@babel/helper-environment-visitor@7.21.5:
+ resolution: {integrity: sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==}
engines: {node: '>=6.9.0'}
dev: false
@@ -308,67 +308,67 @@ packages:
engines: {node: '>=6.9.0'}
dependencies:
'@babel/template': 7.20.7
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
/@babel/helper-hoist-variables@7.18.6:
resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
engines: {node: '>=6.9.0'}
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
/@babel/helper-module-imports@7.18.6:
resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
engines: {node: '>=6.9.0'}
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
/@babel/helper-module-imports@7.21.4:
resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==}
engines: {node: '>=6.9.0'}
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
- /@babel/helper-module-transforms@7.21.2:
- resolution: {integrity: sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==}
+ /@babel/helper-module-transforms@7.21.5:
+ resolution: {integrity: sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==}
engines: {node: '>=6.9.0'}
dependencies:
- '@babel/helper-environment-visitor': 7.18.9
+ '@babel/helper-environment-visitor': 7.21.5
'@babel/helper-module-imports': 7.21.4
- '@babel/helper-simple-access': 7.20.2
+ '@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/traverse': 7.21.4
- '@babel/types': 7.21.4
+ '@babel/traverse': 7.21.5
+ '@babel/types': 7.21.5
transitivePeerDependencies:
- supports-color
dev: false
- /@babel/helper-plugin-utils@7.20.2:
- resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
+ /@babel/helper-plugin-utils@7.21.5:
+ resolution: {integrity: sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==}
engines: {node: '>=6.9.0'}
dev: false
- /@babel/helper-simple-access@7.20.2:
- resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==}
+ /@babel/helper-simple-access@7.21.5:
+ resolution: {integrity: sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==}
engines: {node: '>=6.9.0'}
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
/@babel/helper-split-export-declaration@7.18.6:
resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
engines: {node: '>=6.9.0'}
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
- /@babel/helper-string-parser@7.19.4:
- resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
+ /@babel/helper-string-parser@7.21.5:
+ resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==}
engines: {node: '>=6.9.0'}
dev: false
@@ -382,13 +382,13 @@ packages:
engines: {node: '>=6.9.0'}
dev: false
- /@babel/helpers@7.21.0:
- resolution: {integrity: sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==}
+ /@babel/helpers@7.21.5:
+ resolution: {integrity: sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==}
engines: {node: '>=6.9.0'}
dependencies:
'@babel/template': 7.20.7
- '@babel/traverse': 7.21.4
- '@babel/types': 7.21.4
+ '@babel/traverse': 7.21.5
+ '@babel/types': 7.21.5
transitivePeerDependencies:
- supports-color
dev: false
@@ -402,36 +402,36 @@ packages:
js-tokens: 4.0.0
dev: false
- /@babel/parser@7.21.4:
- resolution: {integrity: sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==}
+ /@babel/parser@7.21.5:
+ resolution: {integrity: sha512-J+IxH2IsxV4HbnTrSWgMAQj0UEo61hDA4Ny8h8PCX0MLXiibqHbqIOVneqdocemSBc22VpBKxt4J6FQzy9HarQ==}
engines: {node: '>=6.0.0'}
hasBin: true
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
- /@babel/plugin-syntax-jsx@7.21.4(@babel/core@7.21.4):
+ /@babel/plugin-syntax-jsx@7.21.4(@babel/core@7.21.5):
resolution: {integrity: sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0-0
dependencies:
- '@babel/core': 7.21.4
- '@babel/helper-plugin-utils': 7.20.2
+ '@babel/core': 7.21.5
+ '@babel/helper-plugin-utils': 7.21.5
dev: false
- /@babel/plugin-transform-react-jsx@7.21.0(@babel/core@7.21.4):
- resolution: {integrity: sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg==}
+ /@babel/plugin-transform-react-jsx@7.21.5(@babel/core@7.21.5):
+ resolution: {integrity: sha512-ELdlq61FpoEkHO6gFRpfj0kUgSwQTGoaEU8eMRoS8Dv3v6e7BjEAj5WMtIBRdHUeAioMhKP5HyxNzNnP+heKbA==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0-0
dependencies:
- '@babel/core': 7.21.4
+ '@babel/core': 7.21.5
'@babel/helper-annotate-as-pure': 7.18.6
'@babel/helper-module-imports': 7.21.4
- '@babel/helper-plugin-utils': 7.20.2
- '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.21.4)
- '@babel/types': 7.21.4
+ '@babel/helper-plugin-utils': 7.21.5
+ '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.21.5)
+ '@babel/types': 7.21.5
dev: false
/@babel/template@7.20.7:
@@ -439,33 +439,33 @@ packages:
engines: {node: '>=6.9.0'}
dependencies:
'@babel/code-frame': 7.21.4
- '@babel/parser': 7.21.4
- '@babel/types': 7.21.4
+ '@babel/parser': 7.21.5
+ '@babel/types': 7.21.5
dev: false
- /@babel/traverse@7.21.4:
- resolution: {integrity: sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==}
+ /@babel/traverse@7.21.5:
+ resolution: {integrity: sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==}
engines: {node: '>=6.9.0'}
dependencies:
'@babel/code-frame': 7.21.4
- '@babel/generator': 7.21.4
- '@babel/helper-environment-visitor': 7.18.9
+ '@babel/generator': 7.21.5
+ '@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.4
- '@babel/types': 7.21.4
+ '@babel/parser': 7.21.5
+ '@babel/types': 7.21.5
debug: 4.3.4
globals: 11.12.0
transitivePeerDependencies:
- supports-color
dev: false
- /@babel/types@7.21.4:
- resolution: {integrity: sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==}
+ /@babel/types@7.21.5:
+ resolution: {integrity: sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==}
engines: {node: '>=6.9.0'}
dependencies:
- '@babel/helper-string-parser': 7.19.4
+ '@babel/helper-string-parser': 7.21.5
'@babel/helper-validator-identifier': 7.19.1
to-fast-properties: 2.0.0
dev: false
@@ -741,7 +741,7 @@ packages:
resolution: {integrity: sha512-jLuwRlz8DQfQNiUCJR50Y09CGPq3fLtmtUQfVrj79E0JWu3dvsVcxVIcfhR5h0iXu+/z++zDrYeiJqifRynJkA==}
dependencies:
'@types/estree-jsx': 1.0.0
- '@types/mdx': 2.0.4
+ '@types/mdx': 2.0.5
estree-util-build-jsx: 2.2.2
estree-util-is-identifier-name: 2.1.0
estree-util-to-js: 1.2.0
@@ -832,30 +832,30 @@ packages:
/@types/babel__core@7.20.0:
resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
dependencies:
- '@babel/parser': 7.21.4
- '@babel/types': 7.21.4
+ '@babel/parser': 7.21.5
+ '@babel/types': 7.21.5
'@types/babel__generator': 7.6.4
'@types/babel__template': 7.4.1
- '@types/babel__traverse': 7.18.4
+ '@types/babel__traverse': 7.18.5
dev: false
/@types/babel__generator@7.6.4:
resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
/@types/babel__template@7.4.1:
resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
dependencies:
- '@babel/parser': 7.21.4
- '@babel/types': 7.21.4
+ '@babel/parser': 7.21.5
+ '@babel/types': 7.21.5
dev: false
- /@types/babel__traverse@7.18.4:
- resolution: {integrity: sha512-TLG7CsGZZmX9aDF78UuJxnNTfQyRUFU0OYIVyIblr0/wd/HvsIo8wmuB90CszeD2MtLLAE9Tt4cWvk+KVkyGIw==}
+ /@types/babel__traverse@7.18.5:
+ resolution: {integrity: sha512-enCvTL8m/EHS/zIvJno9nE+ndYPh1/oNFzRYRmtUqJICG2VnCSBzMLW5VN2KCQU91f23tsNKR8v7VJJQMatl7Q==}
dependencies:
- '@babel/types': 7.21.4
+ '@babel/types': 7.21.5
dev: false
/@types/debug@4.1.7:
@@ -937,8 +937,8 @@ packages:
dev: false
optional: true
- /@types/mdx@2.0.4:
- resolution: {integrity: sha512-qCYrNdpKwN6YO6FVnx+ulfqifKlE3lQGsNhvDaW9Oxzyob/cRLBJWow8GHBBD4NxQ7BVvtsATgLsX0vZAWmtrg==}
+ /@types/mdx@2.0.5:
+ resolution: {integrity: sha512-76CqzuD6Q7LC+AtbPqrvD9AqsN0k8bsYo2bM2J8pmNldP1aIPAbzUQ7QbobyXL4eLr1wK5x8FZFe8eF/ubRuBg==}
dev: false
/@types/ms@0.7.31:
@@ -1055,8 +1055,8 @@ packages:
hasBin: true
dev: false
- /astro@2.3.1(sass@1.62.1):
- resolution: {integrity: sha512-At0ig9qAL9u2HfGV+LmaFFTPQQ904iB9wkefKo52LF3oEsXFmt7RVUN++gnKN0YIYvWjr4P8S9UtU7zyN1U5Fw==}
+ /astro@2.3.2(sass@1.62.1):
+ resolution: {integrity: sha512-8nv7KG3LpKRh1/2fpOkfXvhvzgYKPYrwztnvjdASaUCT1E9j8Vdsagc11b8M+IbLkR8HwDAn/qDV4KvB3AW9nQ==}
engines: {node: '>=16.12.0', npm: '>=6.14.0'}
hasBin: true
peerDependencies:
@@ -1067,15 +1067,15 @@ packages:
dependencies:
'@astrojs/compiler': 1.3.2
'@astrojs/language-server': 0.28.3
- '@astrojs/markdown-remark': 2.1.4(astro@2.3.1)
+ '@astrojs/markdown-remark': 2.1.4(astro@2.3.2)
'@astrojs/telemetry': 2.1.0
'@astrojs/webapi': 2.1.0
- '@babel/core': 7.21.4
- '@babel/generator': 7.21.4
- '@babel/parser': 7.21.4
- '@babel/plugin-transform-react-jsx': 7.21.0(@babel/core@7.21.4)
- '@babel/traverse': 7.21.4
- '@babel/types': 7.21.4
+ '@babel/core': 7.21.5
+ '@babel/generator': 7.21.5
+ '@babel/parser': 7.21.5
+ '@babel/plugin-transform-react-jsx': 7.21.5(@babel/core@7.21.5)
+ '@babel/traverse': 7.21.5
+ '@babel/types': 7.21.5
'@types/babel__core': 7.20.0
'@types/yargs-parser': 21.0.0
acorn: 8.8.2
@@ -1114,8 +1114,8 @@ packages:
typescript: 5.0.4
unist-util-visit: 4.1.2
vfile: 5.3.7
- vite: 4.3.2(sass@1.62.1)
- vitefu: 0.2.4(vite@4.3.2)
+ vite: 4.3.3(sass@1.62.1)
+ vitefu: 0.2.4(vite@4.3.3)
yargs-parser: 21.1.1
zod: 3.21.4
transitivePeerDependencies:
@@ -1128,26 +1128,26 @@ packages:
- terser
dev: false
- /babel-plugin-jsx-dom-expressions@0.36.10(@babel/core@7.21.4):
+ /babel-plugin-jsx-dom-expressions@0.36.10(@babel/core@7.21.5):
resolution: {integrity: sha512-QA2k/14WGw+RgcGGnEuLWwnu4em6CGhjeXtjvgOYyFHYS2a+CzPeaVQHDOlfuiBcjq/3hWMspHMIMnPEOIzdBg==}
peerDependencies:
'@babel/core': ^7.20.12
dependencies:
- '@babel/core': 7.21.4
+ '@babel/core': 7.21.5
'@babel/helper-module-imports': 7.18.6
- '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.21.4)
- '@babel/types': 7.21.4
+ '@babel/plugin-syntax-jsx': 7.21.4(@babel/core@7.21.5)
+ '@babel/types': 7.21.5
html-entities: 2.3.3
validate-html-nesting: 1.2.2
dev: false
- /babel-preset-solid@1.7.3(@babel/core@7.21.4):
+ /babel-preset-solid@1.7.3(@babel/core@7.21.5):
resolution: {integrity: sha512-HOdyrij99zo+CBrmtDxSexBAl54vCBCfBoyueLBvcfVniaEXNd4ftKqSN6XQcLvFfCY28UFO+DHaigXzWKOfzg==}
peerDependencies:
'@babel/core': ^7.0.0
dependencies:
- '@babel/core': 7.21.4
- babel-plugin-jsx-dom-expressions: 0.36.10(@babel/core@7.21.4)
+ '@babel/core': 7.21.5
+ babel-plugin-jsx-dom-expressions: 0.36.10(@babel/core@7.21.5)
dev: false
/bail@2.0.2:
@@ -1200,7 +1200,7 @@ packages:
hasBin: true
dependencies:
caniuse-lite: 1.0.30001481
- electron-to-chromium: 1.4.372
+ electron-to-chromium: 1.4.377
node-releases: 2.0.10
update-browserslist-db: 1.0.11(browserslist@4.21.5)
dev: false
@@ -1474,8 +1474,8 @@ packages:
resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
dev: false
- /electron-to-chromium@1.4.372:
- resolution: {integrity: sha512-MrlFq/j+TYHOjeWsWGYfzevc25HNeJdsF6qaLFrqBTRWZQtWkb1myq/Q2veLWezVaa5OcSZ99CFwTT4aF4Mung==}
+ /electron-to-chromium@1.4.377:
+ resolution: {integrity: sha512-H3BYG6DW5Z+l0xcfXaicJGxrpA4kMlCxnN71+iNX+dBLkRMOdVJqFJiAmbNZZKA1zISpRg17JR03qGifXNsJtw==}
dev: false
/emmet@2.4.2:
@@ -2093,8 +2093,8 @@ packages:
resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
dev: false
- /katex@0.16.6:
- resolution: {integrity: sha512-XVB7X8jEogjJ+OY+a9JdE+VOk9i7znela0HP6WaDbpB4sUh8ghrG0Ccluu2MA2tcJbFAViBC9aVXus2UvkEr8A==}
+ /katex@0.16.7:
+ resolution: {integrity: sha512-Xk9C6oGKRwJTfqfIbtr0Kes9OSv6IFsuhFGc7tW4urlpMJtuh+7YhzU6YEG9n8gmWKcMAFzkp7nr+r69kV0zrA==}
hasBin: true
dependencies:
commander: 8.3.0
@@ -2518,7 +2518,7 @@ packages:
resolution: {integrity: sha512-WH+fJkveMvM3ZN+deb/jT3UW623x8xO9ycfJNDC+UQXX+V72RO6hT9KqxA7c8XFwozAFJ7tufOeG+x/CVSXHUw==}
dependencies:
'@types/katex': 0.16.0
- katex: 0.16.6
+ katex: 0.16.7
micromark-factory-space: 1.0.0
micromark-util-character: 1.1.0
micromark-util-symbol: 1.0.1
@@ -3074,7 +3074,7 @@ packages:
'@types/katex': 0.14.0
hast-util-from-html-isomorphic: 1.0.0
hast-util-to-text: 3.1.2
- katex: 0.16.6
+ katex: 0.16.7
unist-util-visit: 4.1.2
dev: false
@@ -3712,8 +3712,8 @@ packages:
vfile-message: 3.1.4
dev: false
- /vite@4.3.2(sass@1.62.1):
- resolution: {integrity: sha512-9R53Mf+TBoXCYejcL+qFbZde+eZveQLDYd9XgULILLC1a5ZwPaqgmdVpL8/uvw2BM/1TzetWjglwm+3RO+xTyw==}
+ /vite@4.3.3(sass@1.62.1):
+ resolution: {integrity: sha512-MwFlLBO4udZXd+VBcezo3u8mC77YQk+ik+fbc0GZWGgzfbPP+8Kf0fldhARqvSYmtIWoAJ5BXPClUbMTlqFxrA==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
@@ -3745,7 +3745,7 @@ packages:
fsevents: 2.3.2
dev: false
- /vitefu@0.2.4(vite@4.3.2):
+ /vitefu@0.2.4(vite@4.3.3):
resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==}
peerDependencies:
vite: ^3.0.0 || ^4.0.0
@@ -3753,7 +3753,7 @@ packages:
vite:
optional: true
dependencies:
- vite: 4.3.2(sass@1.62.1)
+ vite: 4.3.3(sass@1.62.1)
dev: false
/vscode-css-languageservice@6.2.5:
diff --git a/src/components/markdown/lyrics/transform.ts b/src/components/markdown/lyrics/transform.ts
index a530ea9..c8af163 100644
--- a/src/components/markdown/lyrics/transform.ts
+++ b/src/components/markdown/lyrics/transform.ts
@@ -28,18 +28,20 @@ function toStack(html: string): Stack {
const nodes = root.childNodes as HTMLElement[];
nodes.reduce((lang, node) => {
- switch (node.rawTagName) {
- case 'h1': {
- return node.text;
- }
- case 'ul': {
- createVerse(stack, lang);
- const lines = extractLines(node.childNodes);
- stack[lang].at(-1)!.push(...lines);
- return lang;
- }
+ const tag = node.rawTagName;
+
+ // Change language context
+ if (tag.match(/h\d/))
+ return node.text;
+
+ // Parse list as verse
+ if (tag === 'ul') {
+ createVerse(stack, lang);
+ const lines = extractLines(node.childNodes);
+ stack[lang].at(-1)!.push(...lines);
}
- return lang;
+
+ return lang;
}, '');
return stack;
diff --git a/src/pages/songs/[...slug].astro b/src/pages/songs/[...slug].astro
index b196181..ac72471 100644
--- a/src/pages/songs/[...slug].astro
+++ b/src/pages/songs/[...slug].astro
@@ -40,22 +40,31 @@ const other = Object.keys(song.data.album)
-