diff options
| author | Joe Carstairs <65492573+joeacarstairs@users.noreply.github.com> | 2024-10-05 17:27:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-05 17:27:40 +0100 |
| commit | 2febffe5e3036c4b35dff4a8b274f42a7f8fef42 (patch) | |
| tree | 7287800600f340871620631b8431cef37fc58891 | |
| parent | 285023b7c6bac87e049df0d8040ecd8f4a16ae78 (diff) | |
| parent | fdf28cb097596159a002326823f374a64e95c23c (diff) | |
Merge pull request #103 from joeacarstairs/staging
Update prod
94 files changed, 1046 insertions, 1232 deletions
diff --git a/.husky/pre-commit b/.husky/pre-commit index 36af219..36af219 100644..100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit diff --git a/package-lock.json b/package-lock.json index 538efbb..34f0b90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "dotenv": "^16.3.1", "sass": "^1.69.3", "typescript": "^5.2.2", - "vercel": "^34.2.8" + "vercel": "^37.4.2" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^6.2.1", @@ -24,8 +24,8 @@ "eslint-plugin-astro": "^0.28.0", "husky": "^8.0.3", "lint-staged": "^13.2.3", - "prettier": "^3.0.0", - "prettier-plugin-astro": "^0.11.0" + "prettier": "^3.3.3", + "prettier-plugin-astro": "^0.14.1" } }, "node_modules/@ampproject/remapping": { @@ -42,9 +42,9 @@ } }, "node_modules/@astrojs/compiler": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.8.1.tgz", - "integrity": "sha512-NGfPAgU/9rvDEwsXu82RI1AxiivaxtEYBK9saW1f+2fTHUUqCJQ27HYtb2akG2QxCmFikgZ9zk26BEWgiHho1Q==", + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.10.3.tgz", + "integrity": "sha512-bL/O7YBxsFt55YHU021oL+xz+B/9HvGNId3F9xURN16aeqDK9juHGktdkCSXz+U4nqFACq6ZFvWomOzhV+zfPw==", "license": "MIT" }, "node_modules/@astrojs/internal-helpers": { @@ -130,12 +130,12 @@ } }, "node_modules/@astrojs/sitemap": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@astrojs/sitemap/-/sitemap-3.1.6.tgz", - "integrity": "sha512-1Qp2NvAzVImqA6y+LubKi1DVhve/hXXgFvB0szxiipzh7BvtuKe4oJJ9dXSqaubaTkt4nMa6dv6RCCAYeB6xaQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@astrojs/sitemap/-/sitemap-3.2.0.tgz", + "integrity": "sha512-SkrOCL3Z6HxdiXreZ1+aPBWgnBMJ31EgPdcscgQeLqI2Gqk/4EKLuw9q0SqKU9MmHpcPXXtcd0odfCk4barPoA==", "license": "MIT", "dependencies": { - "sitemap": "^7.1.2", + "sitemap": "^8.0.0", "stream-replace-string": "^2.0.0", "zod": "^3.23.8" } @@ -159,12 +159,12 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz", + "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==", "license": "MIT", "dependencies": { - "@babel/highlight": "^7.24.7", + "@babel/highlight": "^7.25.7", "picocolors": "^1.0.0" }, "engines": { @@ -172,30 +172,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz", - "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.7.tgz", + "integrity": "sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz", - "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.7.tgz", + "integrity": "sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==", "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.7", - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helpers": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/template": "^7.24.7", - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7", + "@babel/code-frame": "^7.25.7", + "@babel/generator": "^7.25.7", + "@babel/helper-compilation-targets": "^7.25.7", + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helpers": "^7.25.7", + "@babel/parser": "^7.25.7", + "@babel/template": "^7.25.7", + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -220,41 +220,41 @@ } }, "node_modules/@babel/generator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz", - "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz", + "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==", "license": "MIT", "dependencies": { - "@babel/types": "^7.24.7", + "@babel/types": "^7.25.7", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", - "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz", + "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==", "license": "MIT", "dependencies": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", - "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz", + "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==", "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.24.7", - "@babel/helper-validator-option": "^7.24.7", - "browserslist": "^4.22.2", + "@babel/compat-data": "^7.25.7", + "@babel/helper-validator-option": "^7.25.7", + "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -271,67 +271,29 @@ "semver": "bin/semver.js" } }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", - "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", - "license": "MIT", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", - "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", - "license": "MIT", - "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", - "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", - "license": "MIT", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz", + "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==", "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", - "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz", + "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==", "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7" + "@babel/helper-module-imports": "^7.25.7", + "@babel/helper-simple-access": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -341,86 +303,74 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz", - "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz", + "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", - "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz", + "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==", "license": "MIT", "dependencies": { - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", - "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", + "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", + "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", - "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz", + "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz", - "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz", + "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==", "license": "MIT", "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/template": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz", + "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==", "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", + "@babel/helper-validator-identifier": "^7.25.7", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -430,10 +380,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz", - "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.7.tgz", + "integrity": "sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==", "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.7" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -442,12 +395,12 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz", - "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.7.tgz", + "integrity": "sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -457,16 +410,16 @@ } }, "node_modules/@babel/plugin-transform-react-jsx": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.7.tgz", - "integrity": "sha512-+Dj06GDZEFRYvclU6k4bme55GKBEWUmByM/eoKuqg4zTNQHiApWRhQph5fxQB2wAEFvRzL1tOEj1RJ19wJrhoA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.7.tgz", + "integrity": "sha512-vILAg5nwGlR9EXE8JIOX4NHXd49lrYbN8hnjffDtoULwpL9hUx/N55nqh2qd0q6FyNDfjl9V79ecKGvFbcSA0Q==", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-jsx": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-module-imports": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/plugin-syntax-jsx": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -476,9 +429,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz", - "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", + "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", "dev": true, "license": "MIT", "dependencies": { @@ -489,33 +442,30 @@ } }, "node_modules/@babel/template": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz", - "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz", + "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/code-frame": "^7.25.7", + "@babel/parser": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz", - "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.7", - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-function-name": "^7.24.7", - "@babel/helper-hoist-variables": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/types": "^7.24.7", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz", + "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.25.7", + "@babel/generator": "^7.25.7", + "@babel/parser": "^7.25.7", + "@babel/template": "^7.25.7", + "@babel/types": "^7.25.7", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -524,13 +474,13 @@ } }, "node_modules/@babel/types": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz", - "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.7.tgz", + "integrity": "sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==", "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7", + "@babel/helper-string-parser": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -992,9 +942,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "version": "4.11.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz", + "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==", "dev": true, "license": "MIT", "engines": { @@ -1079,9 +1029,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "dev": true, "license": "MIT", "engines": { @@ -1098,14 +1048,14 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", "deprecated": "Use @eslint/config-array instead", "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", + "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", "minimatch": "^3.0.5" }, @@ -1192,9 +1142,9 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { @@ -1579,9 +1529,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "license": "MIT" }, "node_modules/@types/estree-jsx": { @@ -1667,9 +1617,9 @@ "license": "MIT" }, "node_modules/@types/unist": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz", - "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz", + "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==", "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { @@ -1877,9 +1827,9 @@ "license": "ISC" }, "node_modules/@vercel/build-utils": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.2.2.tgz", - "integrity": "sha512-+Nf/Yk3GeMI47L/g5KYEvsj7yqVkhb6vZqjxavUBRVPSsgJ7fuNVfYvvpFj/Y0BYysEF8XNUxKFuwGROiop/ow==", + "version": "8.4.6", + "resolved": "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.4.6.tgz", + "integrity": "sha512-IsEBgICZ3wxgnJSamlNV3/ChI5XPreq0IdocYBdlRf4TxZPmJdRWwOWpAAgiSpY2e3LTNFOEd7P+CKFfkFHjVA==", "license": "Apache-2.0" }, "node_modules/@vercel/error-utils": { @@ -2086,12 +2036,12 @@ } }, "node_modules/@vercel/gatsby-plugin-vercel-builder": { - "version": "2.0.33", - "resolved": "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.33.tgz", - "integrity": "sha512-fJFRZaQfaaNdun8u/QepzKVrGnTW/9pXls322la5pP5xHAbaWPTTNoFtG/odZUXiv0oNV1qVWnTI4bnqFh6Icw==", + "version": "2.0.50", + "resolved": "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.50.tgz", + "integrity": "sha512-t444vBORSXNeKL4aj2SIpnEa3kC8vFOogWdcp09n8ZapbMTijZE0akF1g46fA36biAKPjumBwpPkmwNExrCWbg==", "dependencies": { "@sinclair/typebox": "0.25.24", - "@vercel/build-utils": "8.2.2", + "@vercel/build-utils": "8.4.6", "@vercel/routing-utils": "3.1.0", "esbuild": "0.14.47", "etag": "1.8.1", @@ -2169,15 +2119,15 @@ } }, "node_modules/@vercel/go": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@vercel/go/-/go-3.1.1.tgz", - "integrity": "sha512-mrzomNYltxkjvtUmaYry5YEyvwTz6c/QQHE5Gr/pPGRIniUiP6T6OFOJ49RBN7e6pRXaNzHPVuidiuBhvHh5+Q==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@vercel/go/-/go-3.1.3.tgz", + "integrity": "sha512-gz4iP02cjRRjbMigk6BA/IG1NpRbjmNQ9EO2fFSi5i14lCuPEdvemgxWM7101rxS4gFNWcIMbArTb3L+YQSHzA==", "license": "Apache-2.0" }, "node_modules/@vercel/hydrogen": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-1.0.2.tgz", - "integrity": "sha512-/Q2MKk1GfOuZAnkE9jQexjtUQqanbY65R+xtJWd9yKIgwcfRI1hxiNH3uXyVM5AvLoY+fxxULkSuxDtUKpkJpQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-1.0.6.tgz", + "integrity": "sha512-CVwoFK3TRmRCS7ncxdaDzMbH5WyqhWplsN54dmJS3TQZ7JLPUtkCK4mmBplyuJvYw3ijW97QOG+5e2U2Ei6ajw==", "license": "Apache-2.0", "dependencies": { "@vercel/static-config": "3.0.0", @@ -2185,18 +2135,18 @@ } }, "node_modules/@vercel/next": { - "version": "4.2.18", - "resolved": "https://registry.npmjs.org/@vercel/next/-/next-4.2.18.tgz", - "integrity": "sha512-sxm2/lHsM7ZuMPMzo5wIGuVe3bEk9GN4sKJcfe2RfI139Vfl++40sQTTDJ44UYixbulRM5FBQ7zwnVFHgwaAIQ==", + "version": "4.3.12", + "resolved": "https://registry.npmjs.org/@vercel/next/-/next-4.3.12.tgz", + "integrity": "sha512-V4kj7Io0a3SyrhNdXtN9T6HZ6+a+xoim1qK2DMOQFOqBUxyCOIaRLJT42v9ruxCIVpYO8ZpkHVtFmyIleRz+xw==", "license": "Apache-2.0", "dependencies": { - "@vercel/nft": "0.27.2" + "@vercel/nft": "0.27.3" } }, "node_modules/@vercel/nft": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.2.tgz", - "integrity": "sha512-7LeioS1yE5hwPpQfD3DdH04tuugKjo5KrJk3yK5kAI3Lh76iSsK/ezoFQfzuT08X3ZASQOd1y9ePjLNI9+TxTQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.3.tgz", + "integrity": "sha512-oySTdDSzUAFDXpsSLk9Q943o+/Yu/+TCFxnehpFQEf/3khi2stMpTHPVNwFdvZq/Z4Ky93lE+MGHpXCRpMkSCA==", "license": "MIT", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.5", @@ -2235,18 +2185,18 @@ } }, "node_modules/@vercel/node": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@vercel/node/-/node-3.2.0.tgz", - "integrity": "sha512-AZ/xcH5/llJ9SHaW5+TLOQmNzMeKgDafAC9fSdPOW8TUkhFLM+D2CPz6OUnRXDnGE21EvTEIqtDY+Z96dnf8Xw==", + "version": "3.2.18", + "resolved": "https://registry.npmjs.org/@vercel/node/-/node-3.2.18.tgz", + "integrity": "sha512-1o/oUNQ3ls4o+7lvyRCq2NwqITgw8+zEaRL7sBRDDISAGy3QxPRUZDabv/Sgq97MrhXYwGTCCTdBT6DsxVEx+w==", "license": "Apache-2.0", "dependencies": { "@edge-runtime/node-utils": "2.3.0", "@edge-runtime/primitives": "4.1.0", "@edge-runtime/vm": "3.2.0", "@types/node": "16.18.11", - "@vercel/build-utils": "8.2.2", + "@vercel/build-utils": "8.4.6", "@vercel/error-utils": "2.0.2", - "@vercel/nft": "0.27.2", + "@vercel/nft": "0.27.3", "@vercel/static-config": "3.0.0", "async-listen": "3.0.0", "cjs-module-lexer": "1.2.3", @@ -2358,20 +2308,22 @@ } }, "node_modules/@vercel/python": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@vercel/python/-/python-4.3.0.tgz", - "integrity": "sha512-tj6ffEh+ligmQoo/ONOg7DNX0VGKJt9FyswyOIIp6lZufs5oGzHAfan4+5QzF/2INxvXobN0aMYgcbFHJ81ZKg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@vercel/python/-/python-4.3.1.tgz", + "integrity": "sha512-pWRApBwUsAQJS8oZ7eKMiaBGbYJO71qw2CZqDFvkTj34FNBZtNIUcWSmqGfJJY5m2pU/9wt8z1CnKIyT9dstog==", "license": "Apache-2.0" }, "node_modules/@vercel/redwood": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.10.tgz", - "integrity": "sha512-vZmjOtiUQOdQHVIRrlPY/pSVuwn5GSuq5ihg530Rq51pYIHf0PSP/BnF6zventlG0bKe53MarxE+mmBUb0LDxw==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.1.5.tgz", + "integrity": "sha512-DeM/yZUabMRMTyPLXtpCOreq3Z6ZZ6+qciY192i28froDO/5ELYhdGCW32iYG/o4Z7rZ8wDUOlRNEINSzi57JQ==", "license": "Apache-2.0", "dependencies": { - "@vercel/nft": "0.27.2", + "@vercel/nft": "0.27.3", "@vercel/routing-utils": "3.1.0", - "semver": "6.3.1" + "@vercel/static-config": "3.0.0", + "semver": "6.3.1", + "ts-morph": "12.0.0" } }, "node_modules/@vercel/redwood/node_modules/semver": { @@ -2384,13 +2336,13 @@ } }, "node_modules/@vercel/remix-builder": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.1.8.tgz", - "integrity": "sha512-8SyVgKwtIGgxb5w2VLt9tilDmOg6k8KFeqUYL2D6i6z4Ju7qT3OVXqpWG7b6a334lkSvkyqvvMPnPLRhNW/sUg==", + "version": "2.2.9", + "resolved": "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.2.9.tgz", + "integrity": "sha512-H40CNhP2iYJYCDeBzN6I9QZg7mETP7jPu6gyRulqWcL1fds+gThegoowIPJKN+HT0mw8ZG99vmyltsRnR4PIZw==", "license": "Apache-2.0", "dependencies": { "@vercel/error-utils": "2.0.2", - "@vercel/nft": "0.27.2", + "@vercel/nft": "0.27.3", "@vercel/static-config": "3.0.0", "ts-morph": "12.0.0" } @@ -2420,13 +2372,13 @@ "license": "Apache-2.0" }, "node_modules/@vercel/static-build": { - "version": "2.5.11", - "resolved": "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.11.tgz", - "integrity": "sha512-CUZInKro8CqNH4ZyNccRSfy8cF4KBklIiGOwWVjjjVQLtIGdC55iVADIHAsCmA5yEJVsjenIi+943/JcR0bw2Q==", + "version": "2.5.28", + "resolved": "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.28.tgz", + "integrity": "sha512-A0ZxNxSk+6ra8eM8zFip0VcgkqYQU8A2UAy5H0RUhkF2Rjn61UCE2xmsLrqHA5lEt4ONlSL1xpDEjZX+GveT5w==", "license": "Apache-2.0", "dependencies": { "@vercel/gatsby-plugin-vercel-analytics": "1.0.11", - "@vercel/gatsby-plugin-vercel-builder": "2.0.33", + "@vercel/gatsby-plugin-vercel-builder": "2.0.50", "@vercel/static-config": "3.0.0", "ts-morph": "12.0.0" } @@ -2471,9 +2423,9 @@ "license": "ISC" }, "node_modules/acorn": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", - "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -2501,9 +2453,9 @@ } }, "node_modules/acorn-walk": { - "version": "8.3.3", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", - "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", "license": "MIT", "dependencies": { "acorn": "^8.11.0" @@ -2639,9 +2591,9 @@ } }, "node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "license": "MIT", "engines": { "node": ">=12" @@ -2734,9 +2686,9 @@ } }, "node_modules/astring": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/astring/-/astring-1.8.6.tgz", - "integrity": "sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/astring/-/astring-1.9.0.tgz", + "integrity": "sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==", "license": "MIT", "bin": { "astring": "bin/astring" @@ -2930,9 +2882,9 @@ "license": "MIT" }, "node_modules/b4a": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", - "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", "license": "Apache-2.0", "optional": true }, @@ -2953,16 +2905,16 @@ "license": "MIT" }, "node_modules/bare-events": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", - "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", + "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", "license": "Apache-2.0", "optional": true }, "node_modules/bare-fs": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz", - "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==", + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.5.tgz", + "integrity": "sha512-SlE9eTxifPDJrT6YgemQ1WGFleevzwY+XAP1Xqgl56HtcrisC2CHCZ2tq6dBpcH2TnNxwUEUGhweo+lrQtYuiw==", "license": "Apache-2.0", "optional": true, "dependencies": { @@ -2972,9 +2924,9 @@ } }, "node_modules/bare-os": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz", - "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz", + "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==", "license": "Apache-2.0", "optional": true }, @@ -2989,13 +2941,14 @@ } }, "node_modules/bare-stream": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz", - "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.3.0.tgz", + "integrity": "sha512-pVRWciewGUeCyKEuRxwv06M079r+fRjAQjBEK2P6OYGrO43O+Z0LrPZZEjlc4mB6C2RpZ9AxJ1s7NLEtOHO6eA==", "license": "Apache-2.0", "optional": true, "dependencies": { - "streamx": "^2.18.0" + "b4a": "^1.6.6", + "streamx": "^2.20.0" } }, "node_modules/base64-js": { @@ -3130,9 +3083,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz", - "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", + "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", "funding": [ { "type": "opencollective", @@ -3149,10 +3102,10 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001629", - "electron-to-chromium": "^1.4.796", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.16" + "caniuse-lite": "^1.0.30001663", + "electron-to-chromium": "^1.5.28", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" }, "bin": { "browserslist": "cli.js" @@ -3226,9 +3179,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001638", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001638.tgz", - "integrity": "sha512-5SuJUJ7cZnhPpeLHaH0c/HPAnAHZvS6ElWyHK9GSIbVOQABLzowiI2pjmpvZ1WEbkyz46iFd4UXlOHR5SqgfMQ==", + "version": "1.0.30001667", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz", + "integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==", "funding": [ { "type": "opencollective", @@ -3956,12 +3909,12 @@ } }, "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -4130,9 +4083,9 @@ } }, "node_modules/dset": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.3.tgz", - "integrity": "sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.4.tgz", + "integrity": "sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==", "license": "MIT", "engines": { "node": ">=4" @@ -4195,15 +4148,15 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.814", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.814.tgz", - "integrity": "sha512-GVulpHjFu1Y9ZvikvbArHmAhZXtm3wHlpjTMcXNGKl4IQ4jMQjlnz8yMQYYqdLHKi/jEL2+CBC2akWVCoIGUdw==", + "version": "1.5.32", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.32.tgz", + "integrity": "sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==", "license": "ISC" }, "node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "license": "MIT" }, "node_modules/end-of-stream": { @@ -4215,18 +4168,6 @@ "once": "^1.4.0" } }, - "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/es-module-lexer": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", @@ -4592,9 +4533,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "license": "MIT", "engines": { "node": ">=6" @@ -4610,17 +4551,18 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -4943,9 +4885,9 @@ } }, "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -5180,9 +5122,9 @@ "license": "MIT" }, "node_modules/fast-xml-parser": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.0.tgz", - "integrity": "sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz", + "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==", "funding": [ { "type": "github", @@ -5911,9 +5853,9 @@ "license": "BSD-3-Clause" }, "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, "license": "MIT", "engines": { @@ -5921,9 +5863,9 @@ } }, "node_modules/immutable": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz", - "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", "license": "MIT" }, "node_modules/import-fresh": { @@ -6060,9 +6002,9 @@ } }, "node_modules/is-core-module": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz", - "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", "license": "MIT", "dependencies": { "hasown": "^2.0.2" @@ -6292,15 +6234,15 @@ } }, "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/json-buffer": { @@ -6527,6 +6469,13 @@ "node": ">=8.6" } }, + "node_modules/lint-staged/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, "node_modules/lint-staged/node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -6693,12 +6642,12 @@ } }, "node_modules/magic-string": { - "version": "0.30.10", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", - "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", + "version": "0.30.11", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", + "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" + "@jridgewell/sourcemap-codec": "^1.5.0" } }, "node_modules/make-dir": { @@ -6766,9 +6715,9 @@ } }, "node_modules/mdast-util-definitions/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", "license": "MIT" }, "node_modules/mdast-util-definitions/node_modules/unist-util-is": { @@ -8004,9 +7953,9 @@ "license": "MIT" }, "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "license": "MIT", "dependencies": { "braces": "^3.0.3", @@ -8126,9 +8075,9 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/nanoid": { @@ -8203,9 +8152,9 @@ } }, "node_modules/node-abi": { - "version": "3.65.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.65.0.tgz", - "integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==", + "version": "3.68.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.68.0.tgz", + "integrity": "sha512-7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A==", "license": "MIT", "optional": true, "dependencies": { @@ -8243,9 +8192,9 @@ } }, "node_modules/node-gyp-build": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz", - "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", + "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", "license": "MIT", "bin": { "node-gyp-build": "bin.js", @@ -8254,9 +8203,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", "license": "MIT" }, "node_modules/nopt": { @@ -8628,9 +8577,9 @@ } }, "node_modules/path-match/node_modules/path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz", + "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==", "license": "MIT", "dependencies": { "isarray": "0.0.1" @@ -8643,9 +8592,9 @@ "license": "MIT" }, "node_modules/path-to-regexp": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz", - "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", "license": "MIT" }, "node_modules/path-type": { @@ -8676,9 +8625,9 @@ } }, "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", "license": "ISC" }, "node_modules/picomatch": { @@ -8780,9 +8729,9 @@ } }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.47", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", + "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", "funding": [ { "type": "opencollective", @@ -8800,17 +8749,17 @@ "license": "MIT", "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" + "picocolors": "^1.1.0", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" } }, "node_modules/postcss-selector-parser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz", - "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", "dev": true, "license": "MIT", "dependencies": { @@ -8916,33 +8865,20 @@ } }, "node_modules/preferred-pm": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/preferred-pm/-/preferred-pm-3.1.3.tgz", - "integrity": "sha512-MkXsENfftWSRpzCzImcp4FRsCc3y1opwB73CfCNWyzMqArju2CrlMHlqB7VexKiPEOjGMbttv1r9fSCn5S610w==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/preferred-pm/-/preferred-pm-3.1.4.tgz", + "integrity": "sha512-lEHd+yEm22jXdCphDrkvIJQU66EuLojPPtvZkpKIkiD+l0DMThF/niqZKJSoU8Vl7iuvtmzyMhir9LdVy5WMnA==", "license": "MIT", "dependencies": { "find-up": "^5.0.0", "find-yarn-workspace-root2": "1.2.16", "path-exists": "^4.0.0", - "which-pm": "2.0.0" + "which-pm": "^2.2.0" }, "engines": { "node": ">=10" } }, - "node_modules/preferred-pm/node_modules/which-pm": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-pm/-/which-pm-2.0.0.tgz", - "integrity": "sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==", - "license": "MIT", - "dependencies": { - "load-yaml-file": "^0.2.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8.15" - } - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -8954,9 +8890,9 @@ } }, "node_modules/prettier": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", - "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "license": "MIT", "bin": { @@ -8970,13 +8906,13 @@ } }, "node_modules/prettier-plugin-astro": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.11.1.tgz", - "integrity": "sha512-28sf624jQz9uP4hkQiRPRVuG1/4XJpnS6DfoXPgeDAeQ+eQ1o21bpioUbxze57y2EN+BCHeEw6x3a1MhM08Liw==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.14.1.tgz", + "integrity": "sha512-RiBETaaP9veVstE4vUwSIcdATj6dKmXljouXc/DDNwBSPTp8FRkLGDSGFClKsAFeeg+13SB0Z1JZvbD76bigJw==", "dev": true, "license": "MIT", "dependencies": { - "@astrojs/compiler": "^1.5.5", + "@astrojs/compiler": "^2.9.1", "prettier": "^3.0.0", "sass-formatter": "^0.7.6" }, @@ -8984,13 +8920,6 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/prettier-plugin-astro/node_modules/@astrojs/compiler": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.8.2.tgz", - "integrity": "sha512-o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw==", - "dev": true, - "license": "MIT" - }, "node_modules/pretty-ms": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", @@ -9071,9 +9000,9 @@ } }, "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", @@ -9371,9 +9300,9 @@ } }, "node_modules/remark-smartypants/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", "license": "MIT" }, "node_modules/remark-smartypants/node_modules/unist-util-is": { @@ -9607,9 +9536,9 @@ } }, "node_modules/rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "license": "MIT", "bin": { "rollup": "dist/bin/rollup" @@ -9701,12 +9630,12 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.77.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz", - "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==", + "version": "1.79.4", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.4.tgz", + "integrity": "sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg==", "license": "MIT", "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", + "chokidar": "^4.0.0", "immutable": "^4.0.0", "source-map-js": ">=0.6.2 <2.0.0" }, @@ -9727,6 +9656,34 @@ "suf-log": "^2.5.3" } }, + "node_modules/sass/node_modules/chokidar": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", + "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", + "license": "MIT", + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass/node_modules/readdirp": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", + "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", + "license": "MIT", + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/sax": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", @@ -9747,9 +9704,9 @@ } }, "node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -9835,6 +9792,7 @@ "version": "0.6.13", "resolved": "https://registry.npmjs.org/shikiji/-/shikiji-0.6.13.tgz", "integrity": "sha512-4T7X39csvhT0p7GDnq9vysWddf2b6BeioiN3Ymhnt3xcy9tXmDcnsEFVxX18Z4YcQgEE/w48dLJ4pPPUcG9KkA==", + "deprecated": "Shikiji is merged back to Shiki v1.0, please migrate over to get the latest updates", "license": "MIT", "dependencies": { "hast-util-to-html": "^9.0.0" @@ -9850,80 +9808,21 @@ } }, "node_modules/shikiji/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", "license": "MIT" }, - "node_modules/shikiji/node_modules/hast-util-from-parse5": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-8.0.1.tgz", - "integrity": "sha512-Er/Iixbc7IEa7r/XLtuG52zoqn/b3Xng/w6aZQ0xGVxzhw5xUFxcRqdPzP6yFi/4HBYRaifaI5fQ1RH8n0ZeOQ==", - "license": "MIT", - "dependencies": { - "@types/hast": "^3.0.0", - "@types/unist": "^3.0.0", - "devlop": "^1.0.0", - "hastscript": "^8.0.0", - "property-information": "^6.0.0", - "vfile": "^6.0.0", - "vfile-location": "^5.0.0", - "web-namespaces": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/shikiji/node_modules/hast-util-parse-selector": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz", - "integrity": "sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==", - "license": "MIT", - "dependencies": { - "@types/hast": "^3.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/shikiji/node_modules/hast-util-raw": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-9.0.4.tgz", - "integrity": "sha512-LHE65TD2YiNsHD3YuXcKPHXPLuYh/gjp12mOfU8jxSrm1f/yJpsb0F/KKljS6U9LJoP0Ux+tCe8iJ2AsPzTdgA==", - "license": "MIT", - "dependencies": { - "@types/hast": "^3.0.0", - "@types/unist": "^3.0.0", - "@ungap/structured-clone": "^1.0.0", - "hast-util-from-parse5": "^8.0.0", - "hast-util-to-parse5": "^8.0.0", - "html-void-elements": "^3.0.0", - "mdast-util-to-hast": "^13.0.0", - "parse5": "^7.0.0", - "unist-util-position": "^5.0.0", - "unist-util-visit": "^5.0.0", - "vfile": "^6.0.0", - "web-namespaces": "^2.0.0", - "zwitch": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/shikiji/node_modules/hast-util-to-html": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.1.tgz", - "integrity": "sha512-hZOofyZANbyWo+9RP75xIDV/gq+OUKx+T46IlwERnKmfpwp81XBFbT9mi26ws+SJchA4RVUQwIBJpqEOBhMzEQ==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.3.tgz", + "integrity": "sha512-M17uBDzMJ9RPCqLMO92gNNUDuBSq10a25SDBI08iCCxmorf4Yy6sYHK57n9WAbRAAaU+DuR4W6GN9K4DFZesYg==", "license": "MIT", "dependencies": { "@types/hast": "^3.0.0", "@types/unist": "^3.0.0", "ccount": "^2.0.0", "comma-separated-tokens": "^2.0.0", - "hast-util-raw": "^9.0.0", "hast-util-whitespace": "^3.0.0", "html-void-elements": "^3.0.0", "mdast-util-to-hast": "^13.0.0", @@ -9937,25 +9836,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/shikiji/node_modules/hast-util-to-parse5": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-8.0.0.tgz", - "integrity": "sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==", - "license": "MIT", - "dependencies": { - "@types/hast": "^3.0.0", - "comma-separated-tokens": "^2.0.0", - "devlop": "^1.0.0", - "property-information": "^6.0.0", - "space-separated-tokens": "^2.0.0", - "web-namespaces": "^2.0.0", - "zwitch": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/shikiji/node_modules/hast-util-whitespace": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz", @@ -9969,23 +9849,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/shikiji/node_modules/hastscript": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-8.0.0.tgz", - "integrity": "sha512-dMOtzCEd3ABUeSIISmrETiKuyydk1w0pa+gE/uormcTpSYuaNJPbX1NU3JLyscSLjwAQM8bWMhhIlnCqnRvDTw==", - "license": "MIT", - "dependencies": { - "@types/hast": "^3.0.0", - "comma-separated-tokens": "^2.0.0", - "hast-util-parse-selector": "^4.0.0", - "property-information": "^6.0.0", - "space-separated-tokens": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/shikiji/node_modules/html-void-elements": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz", @@ -10106,18 +9969,6 @@ ], "license": "MIT" }, - "node_modules/shikiji/node_modules/parse5": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", - "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", - "license": "MIT", - "dependencies": { - "entities": "^4.4.0" - }, - "funding": { - "url": "https://github.com/inikulin/parse5?sponsor=1" - } - }, "node_modules/shikiji/node_modules/unist-util-is": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", @@ -10187,13 +10038,12 @@ } }, "node_modules/shikiji/node_modules/vfile": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz", - "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz", + "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==", "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", - "unist-util-stringify-position": "^4.0.0", "vfile-message": "^4.0.0" }, "funding": { @@ -10201,20 +10051,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/shikiji/node_modules/vfile-location": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.2.tgz", - "integrity": "sha512-NXPYyxyBSH7zB5U6+3uDdd6Nybz6o6/od9rk8bp9H8GR3L+cm/fC0uUTbqBmUTnMCUDslAGBOIKNfvvb+gGlDg==", - "license": "MIT", - "dependencies": { - "@types/unist": "^3.0.0", - "vfile": "^6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/shikiji/node_modules/vfile-message": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz", @@ -10305,9 +10141,9 @@ "license": "MIT" }, "node_modules/sitemap": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.1.2.tgz", - "integrity": "sha512-ARCqzHJ0p4gWt+j7NlU5eDlIO9+Rkr/JhPFZKKQ1l5GCus7rJH4UdrlVAh0xC/gDS/Qir2UMxqYNHtsKr2rpCw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-8.0.0.tgz", + "integrity": "sha512-+AbdxhM9kJsHtruUF39bwS/B0Fytw6Fr1o4ZAIAEqA6cke2xcoO2GleBw9Zw7nRzILVEgz7zBM5GiTJjie1G9A==", "license": "MIT", "dependencies": { "@types/node": "^17.0.5", @@ -10319,8 +10155,8 @@ "sitemap": "dist/cli.js" }, "engines": { - "node": ">=12.0.0", - "npm": ">=5.6.0" + "node": ">=14.0.0", + "npm": ">=6.0.0" } }, "node_modules/slash": { @@ -10373,9 +10209,9 @@ } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -10502,9 +10338,9 @@ } }, "node_modules/streamx": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz", - "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==", + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz", + "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==", "license": "MIT", "optional": true, "dependencies": { @@ -10674,9 +10510,9 @@ } }, "node_modules/synckit": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.0.tgz", - "integrity": "sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", + "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", "dev": true, "license": "MIT", "dependencies": { @@ -10736,9 +10572,9 @@ } }, "node_modules/text-decoder": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz", - "integrity": "sha512-TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.0.tgz", + "integrity": "sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==", "license": "Apache-2.0", "optional": true, "dependencies": { @@ -10920,9 +10756,9 @@ "license": "Apache-2.0" }, "node_modules/tsconfck": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.1.tgz", - "integrity": "sha512-00eoI6WY57SvZEVjm13stEVE90VkEdJAFGgpFLTsZbJyW/LwFQ7uQxJHWpZ2hzSWgCPKc9AnBnNP+0X7o3hAmQ==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.3.tgz", + "integrity": "sha512-ulNZP1SVpRDesxeMLON/LtWM8HIgAJEIVpVVhBM6gsmvQ8+Rh+ZG7FWGvHh7Ah3pRABwVJWklWCr/BTZSv0xnQ==", "license": "MIT", "bin": { "tsconfck": "bin/tsconfck.js" @@ -10940,9 +10776,9 @@ } }, "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", "dev": true, "license": "0BSD" }, @@ -10985,9 +10821,9 @@ } }, "node_modules/typescript": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", - "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", @@ -11195,9 +11031,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", - "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", "funding": [ { "type": "opencollective", @@ -11214,8 +11050,8 @@ ], "license": "MIT", "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" + "escalade": "^3.2.0", + "picocolors": "^1.1.0" }, "bin": { "update-browserslist-db": "cli.js" @@ -11274,22 +11110,22 @@ "license": "MIT" }, "node_modules/vercel": { - "version": "34.2.8", - "resolved": "https://registry.npmjs.org/vercel/-/vercel-34.2.8.tgz", - "integrity": "sha512-wz02u/GdG+XyUd09edvTSzVBaph71qRlbMq8zb23J0lPhCm5RJCXEJJcbakseTiHuuQ1KZyETu74AYKyXDOIRA==", + "version": "37.6.1", + "resolved": "https://registry.npmjs.org/vercel/-/vercel-37.6.1.tgz", + "integrity": "sha512-QU8MabEjeWtNELTT/96C+4JYN01e/6K0yrORU0zh+a0EEP0RLuMFBSUjICEEpe6nc4AtOe9BSOZGlw2uBjDrVw==", "license": "Apache-2.0", "dependencies": { - "@vercel/build-utils": "8.2.2", + "@vercel/build-utils": "8.4.6", "@vercel/fun": "1.1.0", - "@vercel/go": "3.1.1", - "@vercel/hydrogen": "1.0.2", - "@vercel/next": "4.2.18", - "@vercel/node": "3.2.0", - "@vercel/python": "4.3.0", - "@vercel/redwood": "2.0.10", - "@vercel/remix-builder": "2.1.8", + "@vercel/go": "3.1.3", + "@vercel/hydrogen": "1.0.6", + "@vercel/next": "4.3.12", + "@vercel/node": "3.2.18", + "@vercel/python": "4.3.1", + "@vercel/redwood": "2.1.5", + "@vercel/remix-builder": "2.2.9", "@vercel/ruby": "2.1.0", - "@vercel/static-build": "2.5.11", + "@vercel/static-build": "2.5.28", "chokidar": "3.3.1" }, "bin": { @@ -11325,7 +11161,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "deprecated": "\"Please update to latest v2.3 or v2.2\"", "hasInstallScript": true, "license": "MIT", "optional": true, @@ -11393,9 +11228,9 @@ } }, "node_modules/vite": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", - "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.5.tgz", + "integrity": "sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==", "license": "MIT", "dependencies": { "esbuild": "^0.18.10", @@ -12262,9 +12097,9 @@ } }, "node_modules/yocto-queue": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", - "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz", + "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==", "license": "MIT", "engines": { "node": ">=12.20" diff --git a/package.json b/package.json index 1e21397..37d11da 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "dotenv": "^16.3.1", "sass": "^1.69.3", "typescript": "^5.2.2", - "vercel": "^34.2.8" + "vercel": "^37.4.2" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^6.2.1", @@ -39,8 +39,8 @@ "eslint-plugin-astro": "^0.28.0", "husky": "^8.0.3", "lint-staged": "^13.2.3", - "prettier": "^3.0.0", - "prettier-plugin-astro": "^0.11.0" + "prettier": "^3.3.3", + "prettier-plugin-astro": "^0.14.1" }, "lint-staged": { "**/*.{ts,cts,mts,astro,json,md,js,cjs,mjs,html}": [ diff --git a/scss/base/_details.scss b/scss/base/_details.scss index 6d0b1d4..1b46189 100644 --- a/scss/base/_details.scss +++ b/scss/base/_details.scss @@ -1,4 +1,3 @@ details summary { cursor: pointer; } - diff --git a/scss/base/_dl.scss b/scss/base/_dl.scss index 95cc836..2efadf1 100644 --- a/scss/base/_dl.scss +++ b/scss/base/_dl.scss @@ -2,4 +2,4 @@ dt { font-weight: 700; text-decoration: underline; margin-top: 1rem; -}
\ No newline at end of file +} diff --git a/scss/base/_index.scss b/scss/base/_index.scss index 527b4c7..ba0d3f1 100644 --- a/scss/base/_index.scss +++ b/scss/base/_index.scss @@ -6,4 +6,3 @@ @use 'table'; @use 'theme'; @use 'typography'; - diff --git a/scss/base/_list.scss b/scss/base/_list.scss index 2fd402b..d85594e 100644 --- a/scss/base/_list.scss +++ b/scss/base/_list.scss @@ -1,4 +1,4 @@ ol li { list-style-type: decimal; margin-inline-start: --spacing-inline-md; -}
\ No newline at end of file +} diff --git a/scss/base/_paypal-product-buttons.scss b/scss/base/_paypal-product-buttons.scss index 7339ede..5b7afda 100644 --- a/scss/base/_paypal-product-buttons.scss +++ b/scss/base/_paypal-product-buttons.scss @@ -1,4 +1,3 @@ paypal-product-buttons div { margin-block-start: var(--spacing-block-md); } - diff --git a/scss/base/_table.scss b/scss/base/_table.scss index ca4f957..d35abf8 100644 --- a/scss/base/_table.scss +++ b/scss/base/_table.scss @@ -8,7 +8,8 @@ table { } } -thead, th { +thead, +th { border-block-end: var(--border-width) solid var(--text-color); } @@ -20,4 +21,3 @@ thead, th { border-inline-start: calc(var(--border-width) / 2) solid var(--text-color); } } - diff --git a/scss/base/_theme.scss b/scss/base/_theme.scss index c97c788..4f06041 100644 --- a/scss/base/_theme.scss +++ b/scss/base/_theme.scss @@ -1,11 +1,10 @@ :is( - :root, - .dark, - main, - article, - :is(main, article) > section:not(:is(section, header) :is(section, header)) -) { + :root, + .dark, + main, + article, + :is(main, article) > section:not(:is(section, header) :is(section, header)) + ) { color: var(--text-color); background-color: var(--background-color); } - diff --git a/scss/custom-properties/_colours.scss b/scss/custom-properties/_colours.scss index 138a724..c8f31b6 100644 --- a/scss/custom-properties/_colours.scss +++ b/scss/custom-properties/_colours.scss @@ -9,7 +9,8 @@ --special-text-highlight-color: #{colours.$secondary-90}; } -:root, .dark { +:root, +.dark { --text-color: #{colours.$primary-98}; --text-highlight-color: #{colours.$primary-10}; --background-color: #{colours.$primary-10}; @@ -18,6 +19,7 @@ --special-text-highlight-color: #{colours.$secondary-10}; } -:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)):not(.dark *) { - --background-color: #{colours.$primary-95}; +:is(main, article) + > section:nth-child(even):not(:is(section, header) :is(section, header)):not(.dark *) { + --background-color: #{colours.$primary-95}; } diff --git a/scss/custom-properties/_index.lg.scss b/scss/custom-properties/_index.lg.scss index 2a36586..ddccb66 100644 --- a/scss/custom-properties/_index.lg.scss +++ b/scss/custom-properties/_index.lg.scss @@ -1,3 +1,2 @@ @use 'spacing/lg' as *; @use 'typography/lg' as *; - diff --git a/scss/custom-properties/_index.md.scss b/scss/custom-properties/_index.md.scss index 2367952..722f8cf 100644 --- a/scss/custom-properties/_index.md.scss +++ b/scss/custom-properties/_index.md.scss @@ -1,3 +1,2 @@ @use 'spacing/md' as *; @use 'typography/md' as *; - diff --git a/scss/custom-properties/_index.sm.scss b/scss/custom-properties/_index.sm.scss index c1ddffe..d52e81d 100644 --- a/scss/custom-properties/_index.sm.scss +++ b/scss/custom-properties/_index.sm.scss @@ -1,3 +1,2 @@ @use 'spacing/sm' as *; @use 'typography/sm' as *; - diff --git a/scss/custom-properties/_index.xl.scss b/scss/custom-properties/_index.xl.scss index 14c55cf..2ef0612 100644 --- a/scss/custom-properties/_index.xl.scss +++ b/scss/custom-properties/_index.xl.scss @@ -1,3 +1,2 @@ @use 'spacing/xl' as *; @use 'typography/xl' as *; - diff --git a/scss/custom-properties/_index.xs.scss b/scss/custom-properties/_index.xs.scss index 32eb377..e2af99a 100644 --- a/scss/custom-properties/_index.xs.scss +++ b/scss/custom-properties/_index.xs.scss @@ -1,3 +1,2 @@ @use 'spacing/xs' as *; @use 'typography/xs' as *; - diff --git a/scss/custom-properties/_index.xxl.scss b/scss/custom-properties/_index.xxl.scss index 8555eee..1807220 100644 --- a/scss/custom-properties/_index.xxl.scss +++ b/scss/custom-properties/_index.xxl.scss @@ -1,3 +1,2 @@ @use 'spacing/xxl' as *; @use 'typography/xxl' as *; - diff --git a/scss/custom-properties/spacing/_initial.scss b/scss/custom-properties/spacing/_initial.scss index a38388f..d52515c 100644 --- a/scss/custom-properties/spacing/_initial.scss +++ b/scss/custom-properties/spacing/_initial.scss @@ -8,7 +8,7 @@ @include mixins.grid(); --width-prose: calc( - var(--grid-column-width) * var(--grid-prose-column-count) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) + var(--grid-column-width) * var(--grid-prose-column-count) + var(--grid-gutter-width) * + (var(--grid-prose-column-count) - 1) ); } diff --git a/scss/custom-properties/spacing/_mixins.scss b/scss/custom-properties/spacing/_mixins.scss index 4e35ee7..3008b14 100644 --- a/scss/custom-properties/spacing/_mixins.scss +++ b/scss/custom-properties/spacing/_mixins.scss @@ -3,12 +3,36 @@ @use '../../values/spacing' as spacing-values; @mixin spacing($breakpoint: initial) { - --spacing-inline-lg: #{spacing-values.spacing($direction: inline, $size: lg, $breakpoint: $breakpoint)}; - --spacing-inline-md: #{spacing-values.spacing($direction: inline, $size: md, $breakpoint: $breakpoint)}; - --spacing-inline-sm: #{spacing-values.spacing($direction: inline, $size: sm, $breakpoint: $breakpoint)}; - --spacing-block-lg: #{spacing-values.spacing($direction: block, $size: lg, $breakpoint: $breakpoint)}; - --spacing-block-md: #{spacing-values.spacing($direction: block, $size: md, $breakpoint: $breakpoint)}; - --spacing-block-sm: #{spacing-values.spacing($direction: block, $size: sm, $breakpoint: $breakpoint)}; + --spacing-inline-lg: #{spacing-values.spacing( + $direction: inline, + $size: lg, + $breakpoint: $breakpoint + )}; + --spacing-inline-md: #{spacing-values.spacing( + $direction: inline, + $size: md, + $breakpoint: $breakpoint + )}; + --spacing-inline-sm: #{spacing-values.spacing( + $direction: inline, + $size: sm, + $breakpoint: $breakpoint + )}; + --spacing-block-lg: #{spacing-values.spacing( + $direction: block, + $size: lg, + $breakpoint: $breakpoint + )}; + --spacing-block-md: #{spacing-values.spacing( + $direction: block, + $size: md, + $breakpoint: $breakpoint + )}; + --spacing-block-sm: #{spacing-values.spacing( + $direction: block, + $size: sm, + $breakpoint: $breakpoint + )}; } @mixin grid($breakpoint: initial) { diff --git a/scss/custom-properties/typography/_initial.scss b/scss/custom-properties/typography/_initial.scss index c9d95da..a81fd2a 100644 --- a/scss/custom-properties/typography/_initial.scss +++ b/scss/custom-properties/typography/_initial.scss @@ -6,36 +6,10 @@ @include mixins.font-sizes(); --border-width: #{typography-values.border-width()}; - --font-serif: - Alegreya, - -apple-system-ui-serif, - Iowan Old Style, - Apple Garamond, - Baskerville, - Sitka, "Sitka Display", "Sitka Heading", "Sitka Text", - Times New Roman, - Droid Serif, - Times, - Source Serif Pro, - serif, - Apple Color Emoji, - Segoe UI Emoji, - Segoe UI Symbol; + --font-serif: Alegreya, -apple-system-ui-serif, Iowan Old Style, Apple Garamond, Baskerville, + Sitka, 'Sitka Display', 'Sitka Heading', 'Sitka Text', Times New Roman, Droid Serif, Times, + Source Serif Pro, serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol; - --font-sans-serif: - 'Alegreya Sans', - Lato, - -apple-system, - BlinkMacSystemFont, - avenir next, - avenir, - segoe ui, - helvetica neue, - helvetica, - Cantarell, - Ubuntu, - roboto, - noto, - arial, - sans-serif; + --font-sans-serif: 'Alegreya Sans', Lato, -apple-system, BlinkMacSystemFont, avenir next, avenir, + segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif; } diff --git a/scss/custom-properties/typography/_lg.scss b/scss/custom-properties/typography/_lg.scss index 30a3019..ff1a645 100644 --- a/scss/custom-properties/typography/_lg.scss +++ b/scss/custom-properties/typography/_lg.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(lg); --border-width: #{typography-values.border-width(lg)}; } - diff --git a/scss/custom-properties/typography/_md.scss b/scss/custom-properties/typography/_md.scss index df49bdd..5b0752f 100644 --- a/scss/custom-properties/typography/_md.scss +++ b/scss/custom-properties/typography/_md.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(md); --border-width: #{typography-values.border-width(md)}; } - diff --git a/scss/custom-properties/typography/_mixins.scss b/scss/custom-properties/typography/_mixins.scss index a370356..a23b8f6 100644 --- a/scss/custom-properties/typography/_mixins.scss +++ b/scss/custom-properties/typography/_mixins.scss @@ -9,4 +9,3 @@ --font-size-5: #{typography-values.font-size('5', $breakpoint)}; --font-size-6: #{typography-values.font-size('6', $breakpoint)}; } - diff --git a/scss/custom-properties/typography/_sm.scss b/scss/custom-properties/typography/_sm.scss index e1c3585..7f70eb8 100644 --- a/scss/custom-properties/typography/_sm.scss +++ b/scss/custom-properties/typography/_sm.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(sm); --border-width: #{typography-values.border-width(sm)}; } - diff --git a/scss/custom-properties/typography/_xl.scss b/scss/custom-properties/typography/_xl.scss index 0ddba99..f378dac 100644 --- a/scss/custom-properties/typography/_xl.scss +++ b/scss/custom-properties/typography/_xl.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(xl); --border-width: #{typography-values.border-width(xl)}; } - diff --git a/scss/custom-properties/typography/_xs.scss b/scss/custom-properties/typography/_xs.scss index 44d8bbb..31ff2f1 100644 --- a/scss/custom-properties/typography/_xs.scss +++ b/scss/custom-properties/typography/_xs.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(xs); --border-width: #{typography-values.border-width(xs)}; } - diff --git a/scss/custom-properties/typography/_xxl.scss b/scss/custom-properties/typography/_xxl.scss index 1a777dc..59db477 100644 --- a/scss/custom-properties/typography/_xxl.scss +++ b/scss/custom-properties/typography/_xxl.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(xxl); --border-width: #{typography-values.border-width(xxl)}; } - diff --git a/scss/index.lg.scss b/scss/index.lg.scss index 622262f..05a4e52 100644 --- a/scss/index.lg.scss +++ b/scss/index.lg.scss @@ -1,3 +1,2 @@ @use 'modules/index.lg' as *; @use 'custom-properties/index.lg' as *; - diff --git a/scss/index.md.scss b/scss/index.md.scss index e7f1fbd..18434c2 100644 --- a/scss/index.md.scss +++ b/scss/index.md.scss @@ -1,4 +1,3 @@ @use 'layout/index.md' as *; @use 'modules/index.md' as *; @use 'custom-properties/index.md' as *; - diff --git a/scss/index.scss b/scss/index.scss index b8e2334..20cd6df 100644 --- a/scss/index.scss +++ b/scss/index.scss @@ -4,4 +4,3 @@ @use 'modules/index' as *; @use 'custom-properties/index' as *; @use 'utils' as *; - diff --git a/scss/index.sm.scss b/scss/index.sm.scss index 0ea47c9..d5f02d2 100644 --- a/scss/index.sm.scss +++ b/scss/index.sm.scss @@ -1,3 +1,2 @@ @use 'modules/index.sm' as *; @use 'custom-properties/index.sm' as *; - diff --git a/scss/index.xl.scss b/scss/index.xl.scss index e692c09..877995a 100644 --- a/scss/index.xl.scss +++ b/scss/index.xl.scss @@ -1,3 +1,2 @@ @use 'modules/index.xl' as *; @use 'custom-properties/index.xl' as *; - diff --git a/scss/index.xs.scss b/scss/index.xs.scss index 78bc9bf..1ec64a9 100644 --- a/scss/index.xs.scss +++ b/scss/index.xs.scss @@ -1,4 +1,3 @@ @use 'layout/index.xs' as *; @use 'modules/index.xs' as *; @use 'custom-properties/index.xs' as *; - diff --git a/scss/index.xxl.scss b/scss/index.xxl.scss index 67ec408..af36a5c 100644 --- a/scss/index.xxl.scss +++ b/scss/index.xxl.scss @@ -1,2 +1 @@ @use 'custom-properties/index.xxl' as *; - diff --git a/scss/layout/_grid.md.scss b/scss/layout/_grid.md.scss index f0c8478..0b83a0c 100644 --- a/scss/layout/_grid.md.scss +++ b/scss/layout/_grid.md.scss @@ -1,8 +1,8 @@ :is( - header, - footer, - nav, - :is(main, article) > section:not(:is(section, header) :is(section, header)) -) { + header, + footer, + nav, + :is(main, article) > section:not(:is(section, header) :is(section, header)) + ) { padding-inline: var(--grid-padding); -}
\ No newline at end of file +} diff --git a/scss/layout/_grid.scss b/scss/layout/_grid.scss index 25cdd95..2e2baf4 100644 --- a/scss/layout/_grid.scss +++ b/scss/layout/_grid.scss @@ -1,9 +1,9 @@ :is( - header, - footer, - nav, - :is(main, article) > section:not(:is(section, header) :is(section, header)) -):not(.section--full-width) { + header, + footer, + nav, + :is(main, article) > section:not(:is(section, header) :is(section, header)) + ):not(.section--full-width) { padding-inline: calc(var(--grid-padding) + 0.5 * (100vw - var(--grid-total-width))); } diff --git a/scss/layout/_grid.xs.scss b/scss/layout/_grid.xs.scss index e7c6d1a..dbd1c9f 100644 --- a/scss/layout/_grid.xs.scss +++ b/scss/layout/_grid.xs.scss @@ -8,48 +8,48 @@ .grid-span-1.grid-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-column-count) - 1) + - var(--grid-gutter-width) * (var(--grid-column-count) - 1) + var(--grid-column-width) * (var(--grid-column-count) - 1) + var(--grid-gutter-width) * + (var(--grid-column-count) - 1) ); margin-inline-end: 0; } .grid-span-2.grid-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-column-count) - 2) + - var(--grid-gutter-width) * (var(--grid-column-count) - 2) + var(--grid-column-width) * (var(--grid-column-count) - 2) + var(--grid-gutter-width) * + (var(--grid-column-count) - 2) ); margin-inline-end: 0; } .grid-span-3.grid-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-column-count) - 3) + - var(--grid-gutter-width) * (var(--grid-column-count) - 3) + var(--grid-column-width) * (var(--grid-column-count) - 3) + var(--grid-gutter-width) * + (var(--grid-column-count) - 3) ); margin-inline-end: 0; } .grid-span-1.grid-prose-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-prose-column-count) - 1) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) + var(--grid-column-width) * (var(--grid-prose-column-count) - 1) + var(--grid-gutter-width) * + (var(--grid-prose-column-count) - 1) ); margin-inline-end: 0; } .grid-span-2.grid-prose-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-prose-column-count) - 2) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 2) + var(--grid-column-width) * (var(--grid-prose-column-count) - 2) + var(--grid-gutter-width) * + (var(--grid-prose-column-count) - 2) ); margin-inline-end: 0; } .grid-span-3.grid-prose-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-prose-column-count) - 3) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 3) + var(--grid-column-width) * (var(--grid-prose-column-count) - 3) + var(--grid-gutter-width) * + (var(--grid-prose-column-count) - 3) ); margin-inline-end: 0; -}
\ No newline at end of file +} diff --git a/scss/layout/_index.md.scss b/scss/layout/_index.md.scss index c3bd183..f2a0301 100644 --- a/scss/layout/_index.md.scss +++ b/scss/layout/_index.md.scss @@ -1,2 +1 @@ @use 'grid.md'; - diff --git a/scss/layout/_index.scss b/scss/layout/_index.scss index 776613a..0d4371a 100644 --- a/scss/layout/_index.scss +++ b/scss/layout/_index.scss @@ -1,3 +1,2 @@ @use 'grid'; @use 'section-margins'; - diff --git a/scss/layout/_index.xs.scss b/scss/layout/_index.xs.scss index 6e239b4..97fbf3b 100644 --- a/scss/layout/_index.xs.scss +++ b/scss/layout/_index.xs.scss @@ -1,2 +1 @@ @use 'grid.xs'; - diff --git a/scss/modules/_btn.scss b/scss/modules/_btn.scss index 6b5e543..29b3264 100644 --- a/scss/modules/_btn.scss +++ b/scss/modules/_btn.scss @@ -37,4 +37,3 @@ a.btn { color: var(--text-color); text-decoration: none; } - diff --git a/scss/modules/_committee.md.scss b/scss/modules/_committee.md.scss index 83ca252..adaf389 100644 --- a/scss/modules/_committee.md.scss +++ b/scss/modules/_committee.md.scss @@ -13,4 +13,4 @@ .committee__member__text { grid-column: 3 / calc(3 + var(--grid-prose-column-count) - 2); -}
\ No newline at end of file +} diff --git a/scss/modules/_committee.scss b/scss/modules/_committee.scss index f6528a3..efbce3a 100644 --- a/scss/modules/_committee.scss +++ b/scss/modules/_committee.scss @@ -7,14 +7,15 @@ border-top-width: var(--border-width); border-top-style: solid; border-image: linear-gradient( - to right, - transparent 0%, - transparent 19.1%, - var(--text-color) 19.1%, - var(--text-color) 80.9%, - transparent 80.9%, - transparent 100% - ) 1; + to right, + transparent 0%, + transparent 19.1%, + var(--text-color) 19.1%, + var(--text-color) 80.9%, + transparent 80.9%, + transparent 100% + ) + 1; margin-block-start: var(--spacing-block-md); padding-block-start: var(--spacing-block-md); } @@ -34,4 +35,3 @@ display: block; font-weight: lighter; } - diff --git a/scss/modules/_committee.sm.scss b/scss/modules/_committee.sm.scss index a2b2216..2010c04 100644 --- a/scss/modules/_committee.sm.scss +++ b/scss/modules/_committee.sm.scss @@ -2,4 +2,3 @@ text-align: start; margin: 0; } - diff --git a/scss/modules/_committee.xl.scss b/scss/modules/_committee.xl.scss index 94d8429..89fed1f 100644 --- a/scss/modules/_committee.xl.scss +++ b/scss/modules/_committee.xl.scss @@ -12,4 +12,4 @@ .committee__member__text { grid-column: 3 / min(11, calc(var(--grid-column-count) + 1)); -}
\ No newline at end of file +} diff --git a/scss/modules/_committee.xs.scss b/scss/modules/_committee.xs.scss index 5681bc7..c085360 100644 --- a/scss/modules/_committee.xs.scss +++ b/scss/modules/_committee.xs.scss @@ -2,4 +2,3 @@ margin-inline: calc(var(--grid-column-width) + var(--grid-gutter-width)); width: calc(var(--grid-gutter-width) + 2 * var(--grid-column-width)); } - diff --git a/scss/modules/_footer.xs.scss b/scss/modules/_footer.xs.scss index 67cab7f..f51d57c 100644 --- a/scss/modules/_footer.xs.scss +++ b/scss/modules/_footer.xs.scss @@ -4,4 +4,3 @@ footer { gap: var(--grid-gutter-width); align-items: end; } - diff --git a/scss/modules/_index.lg.scss b/scss/modules/_index.lg.scss index 56a6dd8..8bdb4f3 100644 --- a/scss/modules/_index.lg.scss +++ b/scss/modules/_index.lg.scss @@ -1,2 +1 @@ @use 'nav.lg' as *; - diff --git a/scss/modules/_index.md.scss b/scss/modules/_index.md.scss index b426b71..4687331 100644 --- a/scss/modules/_index.md.scss +++ b/scss/modules/_index.md.scss @@ -1,4 +1,3 @@ @use 'committee.md' as *; @use 'nav.md' as *; @use 'schedule.md' as *; - diff --git a/scss/modules/_index.scss b/scss/modules/_index.scss index 822295f..67adcc5 100644 --- a/scss/modules/_index.scss +++ b/scss/modules/_index.scss @@ -9,4 +9,3 @@ @use 'product' as *; @use 'schedule' as *; @use 'skip-to-content' as *; - diff --git a/scss/modules/_index.sm.scss b/scss/modules/_index.sm.scss index ab51eb2..0a318c4 100644 --- a/scss/modules/_index.sm.scss +++ b/scss/modules/_index.sm.scss @@ -1,4 +1,3 @@ @use 'committee.sm' as *; @use 'link-gallery.sm' as *; @use 'nav.sm' as *; - diff --git a/scss/modules/_index.xl.scss b/scss/modules/_index.xl.scss index 17e1d8c..89860ac 100644 --- a/scss/modules/_index.xl.scss +++ b/scss/modules/_index.xl.scss @@ -1,2 +1 @@ @use 'committee.xl' as *; - diff --git a/scss/modules/_index.xs.scss b/scss/modules/_index.xs.scss index ef77c6d..c2bb97e 100644 --- a/scss/modules/_index.xs.scss +++ b/scss/modules/_index.xs.scss @@ -2,4 +2,3 @@ @use 'footer.xs' as *; @use 'link-gallery.xs' as *; @use 'nav.xs' as *; - diff --git a/scss/modules/_link-gallery.scss b/scss/modules/_link-gallery.scss index 0f0c187..b2676bb 100644 --- a/scss/modules/_link-gallery.scss +++ b/scss/modules/_link-gallery.scss @@ -69,4 +69,3 @@ margin-inline-start: 1em; } } - diff --git a/scss/modules/_link-gallery.sm.scss b/scss/modules/_link-gallery.sm.scss index 723dffc..04d5a3c 100644 --- a/scss/modules/_link-gallery.sm.scss +++ b/scss/modules/_link-gallery.sm.scss @@ -1,4 +1,3 @@ .link-gallery { --gallery-item-column-span: 3; } - diff --git a/scss/modules/_link-gallery.xs.scss b/scss/modules/_link-gallery.xs.scss index a8f48ac..cbaf301 100644 --- a/scss/modules/_link-gallery.xs.scss +++ b/scss/modules/_link-gallery.xs.scss @@ -4,9 +4,7 @@ &:not(.link-gallery--splash-first) { grid-auto-rows: calc( - var(--gallery-row-image-height) + - var(--spacing-block-sm) + - var(--gallery-row-title-height) + var(--gallery-row-image-height) + var(--spacing-block-sm) + var(--gallery-row-title-height) ); .link-gallery__title { @@ -43,4 +41,3 @@ text-align: start; } } - diff --git a/scss/modules/_link.scss b/scss/modules/_link.scss index 2f827c4..c4b62e4 100644 --- a/scss/modules/_link.scss +++ b/scss/modules/_link.scss @@ -1,4 +1,5 @@ -a, .link { +a, +.link { color: var(--special-text-color); text-decoration-line: underline; text-decoration-color: var(--special-text-color); @@ -24,4 +25,3 @@ a, .link { border-color: var(--special-text-color); } } - diff --git a/scss/modules/_nav.md.scss b/scss/modules/_nav.md.scss index 7f0f784..4b09cf7 100644 --- a/scss/modules/_nav.md.scss +++ b/scss/modules/_nav.md.scss @@ -23,4 +23,3 @@ .nav__switch-language-link { margin-inline-end: calc(var(--grid-column-width) + var(--grid-gutter-width)); } - diff --git a/scss/modules/_nav.sm.scss b/scss/modules/_nav.sm.scss index 688f947..226df3b 100644 --- a/scss/modules/_nav.sm.scss +++ b/scss/modules/_nav.sm.scss @@ -35,4 +35,3 @@ grid-column: 3 / 5; } } - diff --git a/scss/modules/_payment-methods-list.scss b/scss/modules/_payment-methods-list.scss index a59831a..80fb257 100644 --- a/scss/modules/_payment-methods-list.scss +++ b/scss/modules/_payment-methods-list.scss @@ -5,4 +5,3 @@ margin-block-end: var(--spacing-block-sm); } } - diff --git a/scss/modules/_skip-to-content.scss b/scss/modules/_skip-to-content.scss index 0a5f365..e407190 100644 --- a/scss/modules/_skip-to-content.scss +++ b/scss/modules/_skip-to-content.scss @@ -3,7 +3,9 @@ left: var(--grid-padding); top: -10rem; opacity: 0; - transition: top 300ms, opacity 300ms; + transition: + top 300ms, + opacity 300ms; } .skip-to-content:is(:focus, :focus-visible, :focus-within) { diff --git a/scss/normalize.scss b/scss/normalize.scss index 0f7e02f..1dc8524 100644 --- a/scss/normalize.scss +++ b/scss/normalize.scss @@ -52,7 +52,10 @@ hr { * 1. Correct the inheritance and scaling of font size in all browsers. * 2. Correct the odd `em` font sizing in all browsers. */ -code, kbd, pre, samp { +code, +kbd, +pre, +samp { font-family: monospace, monospace; /* 1 */ font-size: 1em; /* 2 */ } @@ -109,12 +112,7 @@ sup { text-transform: none; /* For buttons (Firefox, Edge) and selects (Firefox) */ } -:is( - button, - [type='button'], - [type='reset'], - [type='submit'] -) { +:is(button, [type='button'], [type='reset'], [type='submit']) { @include form-control-reset; text-transform: none; @@ -154,4 +152,3 @@ details { summary { display: list-item; } - diff --git a/scss/utils.scss b/scss/utils.scss index 7cd2a58..b595802 100644 --- a/scss/utils.scss +++ b/scss/utils.scss @@ -2,6 +2,7 @@ font-style: italic; } -li.list-style-none, .list-style-none li { +li.list-style-none, +.list-style-none li { list-style-type: none; } diff --git a/scss/values/_colours.scss b/scss/values/_colours.scss index 40db6e8..79d1da4 100644 --- a/scss/values/_colours.scss +++ b/scss/values/_colours.scss @@ -31,4 +31,3 @@ $secondary-95: #b2fff6; $secondary-98: #e4fffb; $secondary-99: #f2fffc; $secondary-100: #ffffff; - diff --git a/scss/values/spacing/_constants.scss b/scss/values/spacing/_constants.scss index c89fdc8..3663bf3 100644 --- a/scss/values/spacing/_constants.scss +++ b/scss/values/spacing/_constants.scss @@ -8,7 +8,7 @@ $grid-padding-er: ( 'md': 16, 'sm': 12, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $grid-column-count: ( @@ -18,7 +18,7 @@ $grid-column-count: ( 'md': 8, 'sm': 8, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $grid-prose-column-count: ( @@ -28,7 +28,7 @@ $grid-prose-column-count: ( 'md': 8, 'sm': 8, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $grid-padding-er: ( @@ -38,12 +38,20 @@ $grid-padding-er: ( 'md': 16, 'sm': 12, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $spacing-factor: ( - 'inline': (lg: 12, md: 6, sm: 3), - 'block': (lg: 16, md: 10, sm: 5) + 'inline': ( + lg: 12, + md: 6, + sm: 3, + ), + 'block': ( + lg: 16, + md: 10, + sm: 5, + ), ); $grid-min-total-width-absolute: ( @@ -53,6 +61,5 @@ $grid-min-total-width-absolute: ( 'md': 48rem, 'sm': 30rem, 'xs': 100vw, - 'initial': 100vw + 'initial': 100vw, ); - diff --git a/scss/values/spacing/_grid.scss b/scss/values/spacing/_grid.scss index 50d11c9..e448363 100644 --- a/scss/values/spacing/_grid.scss +++ b/scss/values/spacing/_grid.scss @@ -54,10 +54,6 @@ * module you'd end up with a circular dependency. */ @function er-to-absolute($length-er, $breakpoint: initial) { - $absolute-per-er: calc( - total-width-absolute($breakpoint) - / total-width-er($breakpoint) - ); + $absolute-per-er: calc(total-width-absolute($breakpoint) / total-width-er($breakpoint)); @return calc($length-er * $absolute-per-er); } - diff --git a/scss/values/spacing/_index.scss b/scss/values/spacing/_index.scss index 8f8a454..1d65bb5 100644 --- a/scss/values/spacing/_index.scss +++ b/scss/values/spacing/_index.scss @@ -21,4 +21,3 @@ @forward 'grid' as grid-* hide er-to-absolute; @forward 'grid' show er-to-absolute; @forward 'spacing'; - diff --git a/scss/values/spacing/_spacing.scss b/scss/values/spacing/_spacing.scss index 4fd94e8..ac0d79e 100644 --- a/scss/values/spacing/_spacing.scss +++ b/scss/values/spacing/_spacing.scss @@ -9,24 +9,18 @@ * - direction: inline, block */ @function spacing($direction, $size, $breakpoint: initial) { - $factor: map.get( - map.get(constants.$spacing-factor, $direction), - $size - ); + $factor: map.get(map.get(constants.$spacing-factor, $direction), $size); @if list.index([xxl xl lg md sm], ($breakpoint)) { @return grid.er-to-absolute($factor, $breakpoint); - } - @else if $breakpoint == xs { + } @else if $breakpoint == xs { @return clamp( spacing($direction, $size, initial), grid.er-to-absolute($factor, xs), spacing($direction, $size, sm) ); - } - @else if $breakpoint == initial { + } @else if $breakpoint == initial { @return calc($factor * 0.0625rem); } @error "Invalid breakpoint: #{$breakpoint}"; } - diff --git a/scss/values/typography/_constants.scss b/scss/values/typography/_constants.scss index 4ea0117..4921059 100644 --- a/scss/values/typography/_constants.scss +++ b/scss/values/typography/_constants.scss @@ -15,6 +15,5 @@ $font-size-factor: ( '3': 2, '4': 2.5, '5': 3, - '6': 3.5 + '6': 3.5, ); - diff --git a/scss/values/typography/_index.scss b/scss/values/typography/_index.scss index 3aa4384..cacadcf 100644 --- a/scss/values/typography/_index.scss +++ b/scss/values/typography/_index.scss @@ -4,15 +4,11 @@ @function font-size($font-size-grade, $breakpoint: initial) { @return calc( - map.get(constants.$base-font-size, $breakpoint) - * map.get(constants.$font-size-factor, $font-size-grade) + map.get(constants.$base-font-size, $breakpoint) * + map.get(constants.$font-size-factor, $font-size-grade) ); } @function border-width($breakpoint: initial) { - @return calc( - map.get(constants.$base-font-size, $breakpoint) - / 8 - ); + @return calc(map.get(constants.$base-font-size, $breakpoint) / 8); } - diff --git a/src/components/LallansIssue.astro b/src/components/LallansIssue.astro index 317ff2d..a9cdbc6 100644 --- a/src/components/LallansIssue.astro +++ b/src/components/LallansIssue.astro @@ -39,10 +39,12 @@ const t = translate(locale); <section> { - 'contributions' in issue ? ( + 'contributions' in issue && issue.contributions ? ( <LallansIssueContributions contributions={issue.contributions} /> + ) : 'contributors' in issue && issue.contributors ? ( + <LallansIssueContributors contributors={issue.contributors} /> ) : ( - 'contributors' in issue && <LallansIssueContributors contributors={issue.contributors} /> + <Fragment /> ) } </section> diff --git a/src/content/news/en-GB/2023-03-17-eiks-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-30.mdx index 20c280f..ad51bee 100644 --- a/src/content/news/en-GB/2023-03-17-eiks-30.mdx +++ b/src/content/news/en-GB/2023-03-17-eiks-30.mdx @@ -1,17 +1,17 @@ --- title: Eiks an Ens 30 summary: >- - Included in this issue of Eiks an Ens are details of our next - Conference in Perth and of our anthologies, which are having - very positive reviews and are well worth the money. + Included in this issue of Eiks an Ens are details of our next Conference in Perth and of our + anthologies, which are having very positive reviews and are well worth the money. --- + import Schedule from '$components/Schedule.astro'; ## Annual Conference -The Annual Conference of the Scots Language Society will be held on Saturday the -3<sup>rd</sup> in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 -8EP. This year’s theme will be _The Art of Flyting in Scottish Literature_. +The Annual Conference of the Scots Language Society will be held on Saturday the 3<sup>rd</sup> in +the Sandeman Room, AK Bell Library, York Place, Perth, PH2 8EP. This year’s theme will be _The Art +of Flyting in Scottish Literature_. <Schedule entries={[ @@ -29,8 +29,7 @@ The Annual Conference of the Scots Language Society will be held on Saturday the /> The cost of attending the Collogue is £20. Contact George Watt on -[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) -or Elaine Morton on +[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Elaine Morton on [failte@go-plus.net](mailto:failte@go-plus.net). ## Sangschaw 2023 Winners @@ -89,8 +88,7 @@ _Roond Stane_ by Finola Scott #### Jynt Rinner-up -_The Black Loch_ by Robert Duncan -_Aliens_ by James Sinclair +_The Black Loch_ by Robert Duncan _Aliens_ by James Sinclair #### Ruisit @@ -120,51 +118,39 @@ _Leid in ma Heid_ by Alan Millar ## Wittins: Sangschaw, Lallans 102-103 -Our own Lord Braxfield, Judge of the Sangschaw, will deliver his summary of -this year’s happenings in Lallans 102. The word on the street is that the -cranky old grump was pretty impressed by what was put before him. So keep at -it, Scots writers - it vexes him no end to see the Scots language being put to -such good effect! It’s not too early to start working on your masterpiece for -next year. The winner of the poetry class is printed below, but the editor will -endeavour to include as many entries as possible in the forthcoming Lallans -102/103. The summer number in particular will have an extraordinary and broad -showing of further Scots writing, including an interview with Scots Radio -broadcaster Frieda Morrison; Fred Freeman’s epic on Burns, Hamish Henderson -and song; the final instalment of Sam Burns’ Deacon Broadie play and an -abundance of thought-provoking poetry, stories, reviews and news concerning -all the other ventures in the ever-expanding world of the Scots language. +Our own Lord Braxfield, Judge of the Sangschaw, will deliver his summary of this year’s happenings +in Lallans 102. The word on the street is that the cranky old grump was pretty impressed by what was +put before him. So keep at it, Scots writers - it vexes him no end to see the Scots language being +put to such good effect! It’s not too early to start working on your masterpiece for next year. The +winner of the poetry class is printed below, but the editor will endeavour to include as many +entries as possible in the forthcoming Lallans 102/103. The summer number in particular will have an +extraordinary and broad showing of further Scots writing, including an interview with Scots Radio +broadcaster Frieda Morrison; Fred Freeman’s epic on Burns, Hamish Henderson and song; the final +instalment of Sam Burns’ Deacon Broadie play and an abundance of thought-provoking poetry, stories, +reviews and news concerning all the other ventures in the ever-expanding world of the Scots +language. ## _The Galloway Hoard, Kirkcudbright Museum_ by Finola Scott _Winner of the Hugh MacDiarmid Cup for Poetry, Sangschaw 2023_ -Aw muscle and glaur, he’s preenin<br /> -An muckle boastin. Yi’d think<br /> -He wis the first. In he struts<br /> -Aw Cock o the walk,<br /> -King o Faithers, comb throbbin.<br /> +Aw muscle and glaur, he’s preenin<br /> An muckle boastin. Yi’d think<br /> He wis the first. In he +struts<br /> Aw Cock o the walk,<br /> King o Faithers, comb throbbin.<br /> -Aye unnerfit, he wants tae feel<br /> -Ma flutters, tae cup the load I coorie.<br /> -He brags aboot the hero it’ll be.<br /> -Weel mibbe, but fir noo it’s jist<br /> -A wee will o the wisp, ma treisur.<br /> +Aye unnerfit, he wants tae feel<br /> Ma flutters, tae cup the load I coorie.<br /> He brags aboot +the hero it’ll be.<br /> Weel mibbe, but fir noo it’s jist<br /> A wee will o the wisp, ma +treisur.<br /> -I shouldnae compleen, sure he broucht<br /> -thon gift - a wee baa. Its hollow jinglet<br /> -when I joogelt it. I thocht it a toy<br /> -fir the bairn. But naw, seems it’s tae ease<br /> -an bless the birthin. Whit a man.<br /> +I shouldnae compleen, sure he broucht<br /> thon gift - a wee baa. Its hollow jinglet<br /> when I +joogelt it. I thocht it a toy<br /> fir the bairn. But naw, seems it’s tae ease<br /> an bless the +birthin. Whit a man.<br /> ## Anthologies -The Scots Language Society is a registered charity run by volunteers. By being -a member of the Society, you are already giving the Scots language a boost. -You can help us further by purchasing one or both of our first-rate -50th-anniversary anthologies: contact our membership Secretary, George T Watt -at [lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) -or Willie Hershaw at -[w.hershaw678@btinternet.com](mailto:w.hershaw678@btinternet.com). -Every book costs £12.99 including postage. Overseas orders incur an additional -£5 for postage. Included is a selection of the best Scots poetry and prose -from across 50 years and hundred issues of Lallans. +The Scots Language Society is a registered charity run by volunteers. By being a member of the +Society, you are already giving the Scots language a boost. You can help us further by purchasing +one or both of our first-rate 50th-anniversary anthologies: contact our membership Secretary, George +T Watt at [lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Willie Hershaw at +[w.hershaw678@btinternet.com](mailto:w.hershaw678@btinternet.com). Every book costs £12.99 including +postage. Overseas orders incur an additional £5 for postage. Included is a selection of the best +Scots poetry and prose from across 50 years and hundred issues of Lallans. diff --git a/src/content/news/en-GB/2023-12-10-eiks-31.mdx b/src/content/news/en-GB/2023-12-10-eiks-31.mdx index 39075bf..20f62c2 100644 --- a/src/content/news/en-GB/2023-12-10-eiks-31.mdx +++ b/src/content/news/en-GB/2023-12-10-eiks-31.mdx @@ -1,119 +1,99 @@ --- title: Eiks an Ens 31 summary: >- - The 2024 Sangschaw is open for submissions! Not only that, learn about a new - Scots-language audio guide at Linlithgow Palace and an upcoming album release - from our very own Wullie Hershaw. + The 2024 Sangschaw is open for submissions! Not only that, learn about a new Scots-language audio + guide at Linlithgow Palace and an upcoming album release from our very own Wullie Hershaw. --- ## Sangschaw open for submissions! -Our annual writing competition, the _Sangschaw_, is open for submissions until -the 31st of January! As ever, we will provide feedback for every entry -regardless of whether or not you win an award. It’s unusual for competitions -like us to provide feedback on entries, but we think it’s important to help -writers develop. We have three prizes: +Our annual writing competition, the _Sangschaw_, is open for submissions until the 31st of January! +As ever, we will provide feedback for every entry regardless of whether or not you win an award. +It’s unusual for competitions like us to provide feedback on entries, but we think it’s important to +help writers develop. We have three prizes: -- The **Robert McLellan Prize for Scots Prose**: up to 3000 words of original - Scots prose. -- The **John MacPhail Law Prize for Translation**: up to 3000 words of - original translation into Scots from another language. Provide along with a - copy of the original text. -- The **Hugh MacDiarmaid Tassie for Poetry**: up to 60 lines of original Scots - poetry. +- The **Robert McLellan Prize for Scots Prose**: up to 3000 words of original Scots prose. +- The **John MacPhail Law Prize for Translation**: up to 3000 words of original translation into + Scots from another language. Provide along with a copy of the original text. +- The **Hugh MacDiarmaid Tassie for Poetry**: up to 60 lines of original Scots poetry. -Writers new and old are all welcome, so don’t hold back! We look forward to -having your entries! +Writers new and old are all welcome, so don’t hold back! We look forward to having your entries! -You can enter for £5 for one category, £10 for two or £12 for all three, -whether that’s all in the same category or spread across the three. You can -submit either by email or by post. +You can enter for £5 for one category, £10 for two or £12 for all three, whether that’s all in the +same category or spread across the three. You can submit either by email or by post. ### Submitting by email -If you would like to submit by email, first pay by bank transfer to the -following account. Remember, it’s £5 for one submission or £12 for three. +If you would like to submit by email, first pay by bank transfer to the following account. Remember, +it’s £5 for one submission or £12 for three. <dl> <dt>Account name</dt> <dd>Scots Language Society</dd> - <dt>Account number</dt> - <dd>00153458</dd> +{' '} +<dt>Account number</dt> +<dd>00153458</dd> <dt>Sort code</dt> <dd>83 47 00</dd> </dl> -Then, send your entries to -[failte@go-plus.net](mailto:failte@go-plus.net) along with -proof of payment. For example, you could send a picture of you bank statement, -or a copy of the transaction reference. +Then, send your entries to [failte@go-plus.net](mailto:failte@go-plus.net) along with proof of +payment. For example, you could send a picture of you bank statement, or a copy of the transaction +reference. ### Submitting by post -If you would rather submit by post, send your entries with cash or cheque, -as well as your name and address on a separate sheet of paper, to the following -address: +If you would rather submit by post, send your entries with cash or cheque, as well as your name and +address on a separate sheet of paper, to the following address: -<address> - Sangschaw - c/o 6 Dryden Place - Edinburgh - EH9 1RP -</address> +<address>Sangschaw c/o 6 Dryden Place Edinburgh EH9 1RP</address> -Remember it’s £5 per submission or £12 for three. Address any -cheque to the Scots Language Society. +Remember it’s £5 per submission or £12 for three. Address any cheque to the Scots Language Society. ## Upcoming album release: _Leid_ -Our very own Wullie Hershaw will soon be releasing a new album of contemporary -Scots songs titled _Leid_. It will be coming early in the new year, so stay -tuned in! +Our very own Wullie Hershaw will soon be releasing a new album of contemporary Scots songs titled +_Leid_. It will be coming early in the new year, so stay tuned in! To whet your appetite, you can -[listen to the title track on YouTube](https://www.youtube.com/watch?v=23YYajAFNHQ). -You can also have a listen to the musical work of his group, +[listen to the title track on YouTube](https://www.youtube.com/watch?v=23YYajAFNHQ). You can also +have a listen to the musical work of his group, [the Bowhill Players on Bandcamp](https://thebowhillplayers.bandcamp.com). ## New audio guide at Linlithgow Palace -This winter, the good folks at Historic Environment Scotland have translated -their audio guides for visitors into Scots for the first time. The aim is to -promote the status of the Scots language as well as to give visitors the -opportunity to hear the voices of the court in something approaching their own -language. +This winter, the good folks at Historic Environment Scotland have translated their audio guides for +visitors into Scots for the first time. The aim is to promote the status of the Scots language as +well as to give visitors the opportunity to hear the voices of the court in something approaching +their own language. You can read more [about the new audio guides on the Historic Environment Scotland website](https://hes-newsroom.prgloo.com/news/new-scots-lug-in-guide-at-lithgae-palace). -As far as we know, this is the first such venture, not only by Historic -Environment Scotland, but at any major tourist attraction. Can anybody think of -anything similar? Answers on a postcard please! +As far as we know, this is the first such venture, not only by Historic Environment Scotland, but at +any major tourist attraction. Can anybody think of anything similar? Answers on a postcard please! ## Haven’t received Lallans 103 yet? -It has come to the attention of George, our membership secretary, that there -has been an error with the posting of _Lallans_ 103. Two members, both -subscribers entitled to issue 103, failed to receive their copies. +It has come to the attention of George, our membership secretary, that there has been an error with +the posting of _Lallans_ 103. Two members, both subscribers entitled to issue 103, failed to receive +their copies. -If you haven’t yet received your copy of _Lallans_ 103, which he posted out on -Wednesday the 7th of November, please email George at -[georgetwatt@hotmail.com](mailto:georgetwatt@hotmail.com) -and make us aware of it. A copy of _Lallans_ 103 will be posted out to you -straight away! +If you haven’t yet received your copy of _Lallans_ 103, which he posted out on Wednesday the 7th of +November, please email George at [georgetwatt@hotmail.com](mailto:georgetwatt@hotmail.com) and make +us aware of it. A copy of _Lallans_ 103 will be posted out to you straight away! ## New format for Eiks an Ens -Old friends will recall that _Eiks an Ens_ has formerly been a literary -magazine to accompany _Lallans_. We on the Committee felt that this neither -gave _Eiks_ the distinct identity which it deserved, nor took full advantage of -the opportunity it afforded to hold our community together. +Old friends will recall that _Eiks an Ens_ has formerly been a literary magazine to accompany +_Lallans_. We on the Committee felt that this neither gave _Eiks_ the distinct identity which it +deserved, nor took full advantage of the opportunity it afforded to hold our community together. -Therefore, this is the first issue of _Eiks_ to take a new format, where we’ll -be endeavouring to share current affairs in the world of Scots language and -literature, especially where it relates directly to our membership. +Therefore, this is the first issue of _Eiks_ to take a new format, where we’ll be endeavouring to +share current affairs in the world of Scots language and literature, especially where it relates +directly to our membership. -So send us in your inside information! If you’ve spotted something you think we -ought to share in the next _Eiks_, send it to lallans@hotmail.co.uk. +So send us in your inside information! If you’ve spotted something you think we ought to share in +the next _Eiks_, send it to lallans@hotmail.co.uk. diff --git a/src/content/news/en-GB/2024-03-19-vision-ain-countree.mdx b/src/content/news/en-GB/2024-03-19-vision-ain-countree.mdx index d7cc2e4..fc2f897 100644 --- a/src/content/news/en-GB/2024-03-19-vision-ain-countree.mdx +++ b/src/content/news/en-GB/2024-03-19-vision-ain-countree.mdx @@ -1,12 +1,12 @@ --- title: 'New CD: A Vision o ma Ain Countree' summary: >- - A new CD collects the work of many of Scotland’s most important female writers - working in the Scots language today. + A new CD collects the work of many of Scotland’s most important female writers working in the + Scots language today. --- -A new CD collects the work of many of Scotland’s most important female writers -working in the Scots language today. +A new CD collects the work of many of Scotland’s most important female writers working in the Scots +language today. -You can buy [A Vision o ma Ain Countree](/en-GB/furthsettins/scotsoun/820) from -the Publications section of this website. +You can buy [A Vision o ma Ain Countree](/en-GB/furthsettins/scotsoun/820) from the Publications +section of this website. diff --git a/src/content/news/en-GB/2024-03-25-sangschaw-winners.mdx b/src/content/news/en-GB/2024-03-25-sangschaw-winners.mdx index ebb7bc2..14e828b 100644 --- a/src/content/news/en-GB/2024-03-25-sangschaw-winners.mdx +++ b/src/content/news/en-GB/2024-03-25-sangschaw-winners.mdx @@ -3,10 +3,9 @@ title: Sangschaw winners 2024 summary: Announcing the winners of the 2024 Sangschaw! --- -We’re delighted to announce the winners of the 2024 Sangschaw competition! There -were more submissions than ever before, and the quality of submissions was higher -than ever before! All the winning entries, and some of the runners-up, will be -published in forthcoming editions of _Lallans_. +We’re delighted to announce the winners of the 2024 Sangschaw competition! There were more +submissions than ever before, and the quality of submissions was higher than ever before! All the +winning entries, and some of the runners-up, will be published in forthcoming editions of _Lallans_. ## Hugh MacDiarmaid Tassie for Poesie @@ -14,9 +13,10 @@ published in forthcoming editions of _Lallans_. <dt>Winner</dt> <dd>_Kythe_ by Craig Aitcheson</dd> - <dt>Jynt rinners-up</dt> - <dd>_Wee Greta_ by Alastair McLeish</dd> - <dd>_Shakin Briggie_ by Nicola Furrie</dd> +{' '} +<dt>Jynt rinners-up</dt> +<dd>_Wee Greta_ by Alastair McLeish</dd> +<dd>_Shakin Briggie_ by Nicola Furrie</dd> <dt>Ruisit</dt> <dd>_Garlieston Bay, February 2023_ by Colin Mackenzie</dd> @@ -42,8 +42,9 @@ published in forthcoming editions of _Lallans_. <dt>Winner</dt> <dd>_Stephen_ by Tracy Anne Harvey</dd> - <dt>Rinner-up</dt> - <dd>_Plague_ by Andy Matthews</dd> +{' '} +<dt>Rinner-up</dt> +<dd>_Plague_ by Andy Matthews</dd> <dt>Ruisit</dt> <dd>_Henry Haslett’s blinter o siller_ by Alan Millar </dd> @@ -60,8 +61,9 @@ published in forthcoming editions of _Lallans_. <dt>Winner</dt> <dd>_Smirr_ by Tom Ellett</dd> - <dt>Rinner-up</dt> - <dd>_Dies Irae_ by Donald Adamson</dd> +{' '} +<dt>Rinner-up</dt> +<dd>_Dies Irae_ by Donald Adamson</dd> <dt>Ruisit</dt> <dd>_A leein wee puppet_ by Derrick McClure</dd> diff --git a/src/content/news/en-GB/2024-04-05-eiks-32.mdx b/src/content/news/en-GB/2024-04-05-eiks-32.mdx index 308f24a..aa8db3e 100644 --- a/src/content/news/en-GB/2024-04-05-eiks-32.mdx +++ b/src/content/news/en-GB/2024-04-05-eiks-32.mdx @@ -7,43 +7,40 @@ summary: The Collogue on the 8th of June, and other news. We will be holding our Annual Collogue on Saturday the 8th of June! -The venue will be the Sandeman Room in the AK Bell Library, Perth. It will run -from 9.30am until 5pm. +The venue will be the Sandeman Room in the AK Bell Library, Perth. It will run from 9.30am until +5pm. -Our theme this year will be _Scots in Education_. This is especially topical -this year, given the opening of the first teacher training programme relating to -teaching the Scots language. We are excited to welcome a variety of excellent -speakers to give us their thoughts on this important topic! +Our theme this year will be _Scots in Education_. This is especially topical this year, given the +opening of the first teacher training programme relating to teaching the Scots language. We are +excited to welcome a variety of excellent speakers to give us their thoughts on this important +topic! -In addition, we look forward to having winners from this year’s Sangschaw -competition read their works. +In addition, we look forward to having winners from this year’s Sangschaw competition read their +works. -We will be releasing the full programme of events very soon. In the meantime, -get it in your diaries! +We will be releasing the full programme of events very soon. In the meantime, get it in your +diaries! ## Sangschaw 2024 winners announced -As detailed in [our previous news post](/en-GB/news/2024-03-25-sangschaw-winners), -we have announced the winners of the 2024 Sangschaw. Our congratulations to all -the winners, and to everyone that submitted. The quality was higher than ever -before according to our editor, Wullie, and there were more submissions than -ever before, so we all have something to be pleased about! +As detailed in [our previous news post](/en-GB/news/2024-03-25-sangschaw-winners), we have announced +the winners of the 2024 Sangschaw. Our congratulations to all the winners, and to everyone that +submitted. The quality was higher than ever before according to our editor, Wullie, and there were +more submissions than ever before, so we all have something to be pleased about! ## Album release: _LEID_ -We said in our previous issue that Wullie was about to release his new album -with the Bowhill Players: well, if you missed it, the album is out! You can -listen to it and -[buy it on Bandcamp](https://thebowhillplayers.bandcamp.com/album/leid) for -download or as a CD. In this writer’s opinion, it’s not something you want -to miss! +We said in our previous issue that Wullie was about to release his new album with the Bowhill +Players: well, if you missed it, the album is out! You can listen to it and +[buy it on Bandcamp](https://thebowhillplayers.bandcamp.com/album/leid) for download or as a CD. In +this writer’s opinion, it’s not something you want to miss! ## Book launch: _Library of Aethers_ -The folk singer Alasdair Roberts will be in conversation with Wullie Hershaw -about his new book, _Library of Aethers_, a collection from his fine and diverse -lyric book. It includes over 70 original texts from his youth until the present, -and translations into Portuguese, Gaelic, and, of course, Scots. +The folk singer Alasdair Roberts will be in conversation with Wullie Hershaw about his new book, +_Library of Aethers_, a collection from his fine and diverse lyric book. It includes over 70 +original texts from his youth until the present, and translations into Portuguese, Gaelic, and, of +course, Scots. The event will be in Kirkcaldy on Friday the 19th of April. You can buy [tickets to the book launch online](https://www.ticketsource.co.uk/whats-on/kirkcaldy/the-kitchen-treasury/library-of-aethers-book-launch-w-alasdair-roberts-and-william-hershaw/e-jbxzld). @@ -52,23 +49,20 @@ The event will be in Kirkcaldy on Friday the 19th of April. You can buy We will be one of many stalls at the [Scottish Poetry Library Pamphlet Fair](https://www.scottishpoetrylibrary.org.uk/spl-pamphlet-fair-2023/) -in Edinburgh on Saturday the 27th of April. Entry is free, 11am til 3pm at the -Scottish Poetry Library on Crichton Street. +in Edinburgh on Saturday the 27th of April. Entry is free, 11am til 3pm at the Scottish Poetry +Library on Crichton Street. ## Scottish Languages Bill -The Scottish Languages Bill continues to saunter its way through the legislative -process. The Society has submitted its contribution to the public consultation -which will be considered by the +The Scottish Languages Bill continues to saunter its way through the legislative process. The +Society has submitted its contribution to the public consultation which will be considered by the [Parliamentary Education Committee](https://www.parliament.scot/chamber-and-committees/committees/current-and-previous-committees/session-6-education-children-and-young-people-committee). -We have expressed our support for the principles of the Bill, in particular that -Scots must be recognised as an official language of Scotland. We are mindful of -the diverse situations of Scots and Gaelic and have expressed our concern that -they are not treated in the same way. +We have expressed our support for the principles of the Bill, in particular that Scots must be +recognised as an official language of Scotland. We are mindful of the diverse situations of Scots +and Gaelic and have expressed our concern that they are not treated in the same way. -We hope to publish our entire submission to the Education Committee in -due course. +We hope to publish our entire submission to the Education Committee in due course. -Meanwhile, we hope that the Education Committee will consider our submission and -will consider calling us to present evidence in person. +Meanwhile, we hope that the Education Committee will consider our submission and will consider +calling us to present evidence in person. diff --git a/src/content/news/en-GB/2024-05-17-collogue-programme.mdx b/src/content/news/en-GB/2024-05-17-collogue-programme.mdx index e6193fa..111fafd 100644 --- a/src/content/news/en-GB/2024-05-17-collogue-programme.mdx +++ b/src/content/news/en-GB/2024-05-17-collogue-programme.mdx @@ -1,29 +1,50 @@ --- title: Collogue programme 8th June summary: >- - We have fixed the programme for our annual Collogue on the 8th of June. The - theme is ‘Scots in Education’. + We have fixed the programme for our annual Collogue on the 8th of June. The theme is ‘Scots in + Education’. --- + import Schedule from '$components/Schedule.astro'; -We will be having our Annual Collogue on Saturday 8th June, 2024 in the Sandeman -Room at the AK Bell Library, York Place, Perth. This year's theme is Scots in -Education. +We will be having our Annual Collogue on Saturday 8th June, 2024 in the Sandeman Room at the AK Bell +Library, York Place, Perth. This year's theme is Scots in Education. The programme for the day will be as follows: -<Schedule entries={[ - { time: '9.30am', description: 'Reception & registration' }, - { time: '10.00am', description: 'Welcome & introduction from Rab Wilson (President)' }, - { time: '10.10am', description: 'Bruce Eunson, Scots Language Co-Ordinator, <i>The New OU Course in Scots fir teachers</i>' }, - { time: '11.10am', description: 'Laura Green, Education Specialist at the Scots Language Centre, <i>Scots in the Early Year Curriculum</i>' }, - { time: '12.10am', description: 'A selection of readings from the Sangschaw and presentation of prizes' }, - { time: '13.00pm', description: 'Buffet lunch' }, - { time: '14.10pm', description: 'Dr Jamie Fairbairn, Head of Humanities at Banff Academy, <i>Scots Scweel an Community</i>' }, - { time: '15.10pm', description: 'Alan Riach, Professor of Scottish Literature at the University of Glasgow, <i>Scots in Tertiary Education</i>' }, - { time: '16.10pm', description: 'Q&A and discussion' }, - { time: '17.00pm', description: 'Close' }, -]} /> +<Schedule + entries={[ + { time: '9.30am', description: 'Reception & registration' }, + { time: '10.00am', description: 'Welcome & introduction from Rab Wilson (President)' }, + { + time: '10.10am', + description: + 'Bruce Eunson, Scots Language Co-Ordinator, <i>The New OU Course in Scots fir teachers</i>', + }, + { + time: '11.10am', + description: + 'Laura Green, Education Specialist at the Scots Language Centre, <i>Scots in the Early Year Curriculum</i>', + }, + { + time: '12.10am', + description: 'A selection of readings from the Sangschaw and presentation of prizes', + }, + { time: '13.00pm', description: 'Buffet lunch' }, + { + time: '14.10pm', + description: + 'Dr Jamie Fairbairn, Head of Humanities at Banff Academy, <i>Scots Scweel an Community</i>', + }, + { + time: '15.10pm', + description: + 'Alan Riach, Professor of Scottish Literature at the University of Glasgow, <i>Scots in Tertiary Education</i>', + }, + { time: '16.10pm', description: 'Q&A and discussion' }, + { time: '17.00pm', description: 'Close' }, + ]} +/> -We hope to see as many members there as can attend! If you're not already a -member, you can buy a membership when you arrive. +We hope to see as many members there as can attend! If you're not already a member, you can buy a +membership when you arrive. diff --git a/src/content/news/en-GB/2024-08-08-eiks-33.md b/src/content/news/en-GB/2024-08-08-eiks-33.md index aa1fb44..f14c2cc 100644 --- a/src/content/news/en-GB/2024-08-08-eiks-33.md +++ b/src/content/news/en-GB/2024-08-08-eiks-33.md @@ -1,28 +1,27 @@ --- title: Eiks an Ens 33 summary: >- - Including notice of our AGM, things to look out for in the Fringe, and the - WayWords festival. + Including notice of our AGM, things to look out for in the Fringe, and the WayWords festival. --- ## AGM -Our AGM will be on Zoom on Wednesday the 11th of September, 7.00-7.30pm. If -you're a member of the Society, watch your email inbox for an invitation. If -you don't receive it, [get in touch](mailto:lallans@hotmail.co.uk)! Let us know -if there's anything you'd like to put on the agenda. +Our AGM will be on Zoom on Wednesday the 11th of September, 7.00-7.30pm. If you're a member of the +Society, watch your email inbox for an invitation. If you don't receive it, +[get in touch](mailto:lallans@hotmail.co.uk)! Let us know if there's anything you'd like to put on +the agenda. ## The Orgreave Stations -On the 20th of November, our editor, Wullie Hershaw, will be launching his new -poetry book, _The Orgreave Stations_. It is a fiery and unflinching look at the -1984 miners' strike through the lens of a retelling of Christ's Passion. +On the 20th of November, our editor, Wullie Hershaw, will be launching his new poetry book, _The +Orgreave Stations_. It is a fiery and unflinching look at the 1984 miners' strike through the lens +of a retelling of Christ's Passion. [Jim Aitken](https://culturematters.org.uk/index.php/arts/poetry/item/4581-the-orgreave-stations-by-william-hershaw) -and [Alistair McIntosh](https://culturematters.org.uk/index.php/arts/poetry/item/4602-a-powerful-work-of-scottish-working-class-liberation-theology-a-review-of-the-orgreave-stations) -have already done a fine job of reviewing the book, and they emphasise the -threads which Hershaw's poems endeavour to weave together between Christianity -and Marxism. +and +[Alistair McIntosh](https://culturematters.org.uk/index.php/arts/poetry/item/4602-a-powerful-work-of-scottish-working-class-liberation-theology-a-review-of-the-orgreave-stations) +have already done a fine job of reviewing the book, and they emphasise the threads which Hershaw's +poems endeavour to weave together between Christianity and Marxism. If you're in Edinburgh on the 20th of November, we'll see you there! @@ -30,8 +29,8 @@ If you're in Edinburgh on the 20th of November, we'll see you there! ## Edinburgh Fringe -It's festival season here in Edinburgh, and among the events, there's plenty of -good ones for Scots-leid enthusiasts! +It's festival season here in Edinburgh, and among the events, there's plenty of good ones for +Scots-leid enthusiasts! - [Memories, Times and Places with Alf Jasinksi and Les McConnel](https://firestationcreative.co.uk/event/memories-times-and-places) - [ScotlandsFest: Whit If? Scotland’s History as It Might Have Been – Hugh McMillan](https://tickets.edfringe.com/whats-on/scotlandsfest-whit-if-scotland-s-history-as-it-might-have-been-hugh-mcmillan) @@ -45,46 +44,43 @@ good ones for Scots-leid enthusiasts! ## Scottish Dance Research -The Royal Scottish Country Dance Society (RSCDS) has got in touch to ask if we -could help with their research to help the advance the future for Scottish -country dance. If you've got 10 minutes, why not give them a hand? +The Royal Scottish Country Dance Society (RSCDS) has got in touch to ask if we could help with their +research to help the advance the future for Scottish country dance. If you've got 10 minutes, why +not give them a hand? Here's their message: > **Contribute to Scottish Dance Research!** - -> The Royal Scottish Country Dance Society (RSCDS) invites you to participate -> in a short survey about Scottish dance and cultural traditions. Your insights, -> whether you're a dancer or not, are valuable in shaping the future of Scottish -> cultural promotion. -> + +> The Royal Scottish Country Dance Society (RSCDS) invites you to participate in a short survey +> about Scottish dance and cultural traditions. Your insights, whether you're a dancer or not, are +> valuable in shaping the future of Scottish cultural promotion. +> > - Survey takes only 5-10 minutes > - Completely anonymous > - No prior dance knowledge required -> +> > How to participate: -> +> > 1. Click on the survey link below. > 2. Answer the questions to the best of your ability. > 3. If a question doesn't apply to you, feel free to skip it. > 4. Click 'Submit' at the end of the survey. -> -> Your participation will help ensure Scottish traditions remain vibrant and -> accessible for future generations. -> +> +> Your participation will help ensure Scottish traditions remain vibrant and accessible for future +> generations. +> > Take the survey here: > [https://forms.office.com/e/FdXvD85zSt](https://forms.office.com/e/FdXvD85zSt) -> +> > Thank you for contributing to this important research! ## WayWords festival -If Edinburgh's not so convenient for you, maybe Aberdeen is better. If that's -the case, be sure to have a look at the events on offer at the fifth annual -[WayWords festival](https://www.waywordfestival.com), hosted by the University -of Aberdeen. +If Edinburgh's not so convenient for you, maybe Aberdeen is better. If that's the case, be sure to +have a look at the events on offer at the fifth annual +[WayWords festival](https://www.waywordfestival.com), hosted by the University of Aberdeen. -There'll be writers, including Liz Lochhead, dance classes, Gaelic picnics, and -workshops on translation, climate change, and much more, and our member Sheena -Blackhall will be reading out her prize-winning story at the presentation of the -Toulmin Prize for Writing North East Scots. +There'll be writers, including Liz Lochhead, dance classes, Gaelic picnics, and workshops on +translation, climate change, and much more, and our member Sheena Blackhall will be reading out her +prize-winning story at the presentation of the Toulmin Prize for Writing North East Scots. diff --git a/src/content/news/sco/2023-03-17-eiks-30.mdx b/src/content/news/sco/2023-03-17-eiks-30.mdx index caee203..6ee4630 100644 --- a/src/content/news/sco/2023-03-17-eiks-30.mdx +++ b/src/content/news/sco/2023-03-17-eiks-30.mdx @@ -1,20 +1,22 @@ --- title: Eiks an Ens 30 summary: >- - Includit i this issue o Eiks an Ens is details o oor neist Collogue in Perth an - o oor anthologies, that is haein fell positive reviews an weel wurth the siller. + Includit i this issue o Eiks an Ens is details o oor neist Collogue in Perth an o oor anthologies, + that is haein fell positive reviews an weel wurth the siller. --- + import Schedule from '$components/Schedule.astro'; ## Annual Collogue -The Annual Collogue o the Scots Leid Associe will be held on Setturday, June -3<sup>rd</sup> in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 8EP. -This year’s theme will be _The Art o Flyting in Scottish Leiterature_. +The Annual Collogue o the Scots Leid Associe will be held on Setturday, June 3<sup>rd</sup> in the +Sandeman Room, AK Bell Library, York Place, Perth, PH2 8EP. This year’s theme will be _The Art o +Flyting in Scottish Leiterature_. ### Events schedule -<Schedule entries={[ +<Schedule + entries={[ { time: '10.00 am', description: 'Registration and coffee.' }, { time: '10.30 am', description: 'Derrick McClure: Whit is Flyting?' }, { time: '11.15 am', description: 'George T Watt: The Flytin Hugh MacDiarmaid' }, @@ -29,11 +31,9 @@ This year’s theme will be _The Art o Flyting in Scottish Leiterature_. /> The cost o attendin the Collogue is £20. Contact George Watt on -[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) -or Elaine Morton on +[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Elaine Morton on [failte@go-plus.net](mailto:failte@go-plus.net). - ## Sangschaw 2023 Winners ### The Robert McLellan Tassie fur Scots Prose @@ -122,51 +122,38 @@ _Leid in ma Heid_ bi Alan Millar ## Wittins: Sangschaw, Lallans 102-103 -Our ain Lord Braxfield, Jeidge o the Sangschaw, will deleiver his summation -o this year’s fairins in Lallans 102. The wird on the pavey is that the -crabbit auld scunner wass fair taen up wi whit was puit afore him. Sae caw -awaa Scots screivers - it deaves him sairly tae see the leid being yokit -tae sic guid effeck! It’s no ower airly tae get makkin your maisterpiece -for neist year. The winner o the poesie is prentit ablaw but the editor -will ettle tae include as monie entries as possible in the furthcoming Lallans -102/103. Forby, the simmer nummer will hae a byous kythin and spreid o Scots -screivin including an interview wi Scots Radio broadcaster Frieda Morrison, -Fred Freeman’s epic on Burns, Hamish Henderson and sang, the final instalment -o Sam Burns Deacon Brodie play and a wheen o thochtie poesie, tales, reviews -and wittins anent aa the ither ploys gaun on in the aye raxin warld o Scots Leid. +Our ain Lord Braxfield, Jeidge o the Sangschaw, will deleiver his summation o this year’s fairins in +Lallans 102. The wird on the pavey is that the crabbit auld scunner wass fair taen up wi whit was +puit afore him. Sae caw awaa Scots screivers - it deaves him sairly tae see the leid being yokit tae +sic guid effeck! It’s no ower airly tae get makkin your maisterpiece for neist year. The winner o +the poesie is prentit ablaw but the editor will ettle tae include as monie entries as possible in +the furthcoming Lallans 102/103. Forby, the simmer nummer will hae a byous kythin and spreid o Scots +screivin including an interview wi Scots Radio broadcaster Frieda Morrison, Fred Freeman’s epic on +Burns, Hamish Henderson and sang, the final instalment o Sam Burns Deacon Brodie play and a wheen o +thochtie poesie, tales, reviews and wittins anent aa the ither ploys gaun on in the aye raxin warld +o Scots Leid. ## _The Galloway Hoard, Kirkcudbright Museum_ bi Finola Scott _Winner o the Hugh MacDiarmid Tassie fur Poesie, Sangschaw 2023_ -Aw muscle and glaur, he’s preenin<br /> -An muckle boastin. Yi’d think<br /> -He wis the first. In he struts<br /> -Aw Cock o the walk,<br /> -King o Faithers, comb throbbin.<br /> +Aw muscle and glaur, he’s preenin<br /> An muckle boastin. Yi’d think<br /> He wis the first. In he +struts<br /> Aw Cock o the walk,<br /> King o Faithers, comb throbbin.<br /> -Aye unnerfit, he wants tae feel<br /> -Ma flutters, tae cup the load I coorie.<br /> -He brags aboot the hero it’ll be.<br /> -Weel mibbe, but fir noo it’s jist<br /> -A wee will o the wisp, ma treisur.<br /> +Aye unnerfit, he wants tae feel<br /> Ma flutters, tae cup the load I coorie.<br /> He brags aboot +the hero it’ll be.<br /> Weel mibbe, but fir noo it’s jist<br /> A wee will o the wisp, ma +treisur.<br /> -I shouldnae compleen, sure he broucht<br /> -thon gift - a wee baa. Its hollow jinglet<br /> -when I joogelt it. I thocht it a toy<br /> -fir the bairn. But naw, seems it’s tae ease<br /> -an bless the birthin. Whit a man.<br /> +I shouldnae compleen, sure he broucht<br /> thon gift - a wee baa. Its hollow jinglet<br /> when I +joogelt it. I thocht it a toy<br /> fir the bairn. But naw, seems it’s tae ease<br /> an bless the +birthin. Whit a man.<br /> ## Anthologies -The Scots Leid Associe is a registered charity rin bi volunteers. Bi bein a -memmer o the Associe ye are aaready giein the Scots leid a heize. Ye can help -us faurther gin ye coff ane or baith o our braw 50th anniversairy anthologies: -contack our memmership secretar George T Watt at -[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) -or Willie Hershaw at -[w.hershaw678@btinternet.com](mailto:w.hershaw678@btinternet.com). -Ilka buik costs £12.99 includin postage. Owerseas orders £5 postage. -Includit is a walin o the best Scots poesie and prose fae 50 year -and a hunner nummers o Lallans. - +The Scots Leid Associe is a registered charity rin bi volunteers. Bi bein a memmer o the Associe ye +are aaready giein the Scots leid a heize. Ye can help us faurther gin ye coff ane or baith o our +braw 50th anniversairy anthologies: contack our memmership secretar George T Watt at +[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Willie Hershaw at +[w.hershaw678@btinternet.com](mailto:w.hershaw678@btinternet.com). Ilka buik costs £12.99 includin +postage. Owerseas orders £5 postage. Includit is a walin o the best Scots poesie and prose fae 50 +year and a hunner nummers o Lallans. diff --git a/src/content/news/sco/2023-12-10-eiks-31.mdx b/src/content/news/sco/2023-12-10-eiks-31.mdx index d9402cb..82f27b5 100644 --- a/src/content/news/sco/2023-12-10-eiks-31.mdx +++ b/src/content/news/sco/2023-12-10-eiks-31.mdx @@ -1,115 +1,102 @@ --- title: Eiks an Ens 31 summary: >- - The 2024 Sangschaw is open for submeissions! Forby, lairn about a new lug-in - guide at Lithgae Pailace and an upcomin album release bi our ain Wullie - Hershaw. + The 2024 Sangschaw is open for submeissions! Forby, lairn about a new lug-in guide at Lithgae + Pailace and an upcomin album release bi our ain Wullie Hershaw. --- ## Sangschaw open for submeissions! -Our annual scrievin competeition, the _Sangschaw_, is open for submeissions -until the 31st o Januar! As ey, we will provide feedback for ilka entry nae -maiter whither ye win a tassie or no. There’s no mony competeitions provide -feedback on entries, but we think it’s important tae help writers develop. We -hae three tassies: +Our annual scrievin competeition, the _Sangschaw_, is open for submeissions until the 31st o Januar! +As ey, we will provide feedback for ilka entry nae maiter whither ye win a tassie or no. There’s no +mony competeitions provide feedback on entries, but we think it’s important tae help writers +develop. We hae three tassies: -- The **Robert McLellan Tassie for Scots Prose**: up til 3000 wirds o oreiginal - Scots prose. -- The **John MacPhail Law Tassie for Owersettin**: up til 3000 wirds o - oreiginal owersettin intil Scots frae anither leid. Provide alang wi a copy o - the oreiginal text. -- The **Hugh MacDiarmaid Tassie for Poesie**: up til 60 lines o oreiginal Scots - poesie. +- The **Robert McLellan Tassie for Scots Prose**: up til 3000 wirds o oreiginal Scots prose. +- The **John MacPhail Law Tassie for Owersettin**: up til 3000 wirds o oreiginal owersettin intil + Scots frae anither leid. Provide alang wi a copy o the oreiginal text. +- The **Hugh MacDiarmaid Tassie for Poesie**: up til 60 lines o oreiginal Scots poesie. -New writers and auld haunds ar aa walcome, sae dinnae be blate! We luik forrit -tae haein your entries! +New writers and auld haunds ar aa walcome, sae dinnae be blate! We luik forrit tae haein your +entries! -It’s £5 for ae submeission, or £12 for three, whither in the same categorie -or in different categories. Ye can either submit by email or by post. +It’s £5 for ae submeission, or £12 for three, whither in the same categorie or in different +categories. Ye can either submit by email or by post. ### Submittin by email -Gin ye want tae submit by email, first pey by bank transfer til the follaein -account. Mind it’s £5 per submeission or £12 for three. +Gin ye want tae submit by email, first pey by bank transfer til the follaein account. Mind it’s £5 +per submeission or £12 for three. <dl> <dt>Account nem</dt> <dd>Scots Language Society</dd> - <dt>Account number</dt> - <dd>00153458</dd> +{' '} +<dt>Account number</dt> +<dd>00153458</dd> <dt>Sort code</dt> <dd>83 47 00</dd> </dl> -Syne, send your entries til -[failte@go-plus.net](mailto:failte@go-plus.net) alang wi pruif -o peyment. For ensaumple, you could send a photae o your bank -statement, or a copy o the transaction reference. +Syne, send your entries til [failte@go-plus.net](mailto:failte@go-plus.net) alang wi pruif o +peyment. For ensaumple, you could send a photae o your bank statement, or a copy o the transaction +reference. ### Submittin by post -Gin ye want tae submit by post, send them wi cash or cheque as weill as your nem -and your return address on a separate sheet o paper til the follaein address: +Gin ye want tae submit by post, send them wi cash or cheque as weill as your nem and your return +address on a separate sheet o paper til the follaein address: -<address> - Sangschaw - c/o 6 Dryden Place - Edinburgh - EH9 1RP -</address> +<address>Sangschaw c/o 6 Dryden Place Edinburgh EH9 1RP</address> -Mind it’s £5 per submeission or £12 for three. Address ony -cheque til the Scots Language Society. +Mind it’s £5 per submeission or £12 for three. Address ony cheque til the Scots Language Society. ## Upcomin album release: _Leid_ -Our ain Wullie Hershaw will shuin be releasin a new album o contemporar Scots -sangs titled _Leid_. It will be comin early in the new year, sae haud tuned in! +Our ain Wullie Hershaw will shuin be releasin a new album o contemporar Scots sangs titled _Leid_. +It will be comin early in the new year, sae haud tuned in! For tae whet your appetite, you can -[lug in til the title track on YouTube](https://www.youtube.com/watch?v=23YYajAFNHQ). -Ye can forby pree the muisical wark o his group, -<a href="https://thebowhillplayers.bandcamp.com">the Bowhill Players on -Bandcamp</a>. +[lug in til the title track on YouTube](https://www.youtube.com/watch?v=23YYajAFNHQ). Ye can forby +pree the muisical wark o his group, + +<a href="https://thebowhillplayers.bandcamp.com">the Bowhill Players on Bandcamp</a>. ## New lug-in guide at Lithgae Pailace -This winter, the guid fowks at Historic Environment Scotland hae owerset their -lug-in guides for veisitors intil Scots for the first time. The aim is tae -promuive the status o the Scots leid as weill as tae gie veisitors the -opportunitie tae hear the vyces o the court in somethin like their ain leid. +This winter, the guid fowks at Historic Environment Scotland hae owerset their lug-in guides for +veisitors intil Scots for the first time. The aim is tae promuive the status o the Scots leid as +weill as tae gie veisitors the opportunitie tae hear the vyces o the court in somethin like their +ain leid. Ye can read mair [about the new lug-in guides on the Historic Environment Scotland wabsteid](https://hes-newsroom.prgloo.com/news/new-scots-lug-in-guide-at-lithgae-palace). -As faur as we ken, this is first sic ventur, no juist bi Historic Environment -Scotland, but frae ony major tourist attraction. Can onybody mind o ocht -similar? Answers on a postcaird pleise! +As faur as we ken, this is first sic ventur, no juist bi Historic Environment Scotland, but frae ony +major tourist attraction. Can onybody mind o ocht similar? Answers on a postcaird pleise! ## No received Lallans 103 yet? -It haes cam tae the notice o George, our membership secretar, that thare haes -been a mishanter wi the postin o _Lallans_ 103. Twa memmers, baith subscribers -awed _Lallans_ 103, didnae receive thair copies. +It haes cam tae the notice o George, our membership secretar, that thare haes been a mishanter wi +the postin o _Lallans_ 103. Twa memmers, baith subscribers awed _Lallans_ 103, didnae receive thair +copies. -Gin ye haenae yet received yer copy o _Lallans_ 103, that he postit out on -Wadnesday 7th o November, pleise email George at -[georgetwatt@hotmail.com](mailto:georgetwatt@hotmail.com) an -mak us ken o it. A copy o _Lallans_ 103 will be postit out tae ye straucht awa! +Gin ye haenae yet received yer copy o _Lallans_ 103, that he postit out on Wadnesday 7th o November, +pleise email George at [georgetwatt@hotmail.com](mailto:georgetwatt@hotmail.com) an mak us ken o it. +A copy o _Lallans_ 103 will be postit out tae ye straucht awa! ## New format for Eiks an Ens -Auld freinds will mind that _Eiks an Ens_ haes formerlie been a leiterar magazine -tae accompanie _Lallans_. We on the Comatee felt that this didnae gie Eiks an -Ens the distinct purpose that it deserved, and it didnae tak fu advauntage o -the opportunitie _Eiks_ affuirdit tae jeel our communitie thegether. +Auld freinds will mind that _Eiks an Ens_ haes formerlie been a leiterar magazine tae accompanie +_Lallans_. We on the Comatee felt that this didnae gie Eiks an Ens the distinct purpose that it +deserved, and it didnae tak fu advauntage o the opportunitie _Eiks_ affuirdit tae jeel our +communitie thegether. -Sae this is the first issue o _Eiks_ tae tak a new format, whaur we’ll be -ettlin tae skair current affairs i the warld o Scots leid and leitratur, -especially whaur it effeirs directly til our membership. +Sae this is the first issue o _Eiks_ tae tak a new format, whaur we’ll be ettlin tae skair current +affairs i the warld o Scots leid and leitratur, especially whaur it effeirs directly til our +membership. -Sae send us in your inside information! Gin ye’ve spottit somethin you think -we shuid skair in the neist _Eiks_, send it til lallans@hotmail.co.uk. +Sae send us in your inside information! Gin ye’ve spottit somethin you think we shuid skair in the +neist _Eiks_, send it til lallans@hotmail.co.uk. diff --git a/src/content/news/sco/2024-03-19-vision-ain-countree.mdx b/src/content/news/sco/2024-03-19-vision-ain-countree.mdx index 912c1ce..a240ae3 100644 --- a/src/content/news/sco/2024-03-19-vision-ain-countree.mdx +++ b/src/content/news/sco/2024-03-19-vision-ain-countree.mdx @@ -1,12 +1,12 @@ --- title: 'New CD: A Vision o ma Ain Countree' summary: >- - A new CD collects the wark o mony o Scotland’s heidmaist female scrievers - warkin in the Scots leid the day. + A new CD collects the wark o mony o Scotland’s heidmaist female scrievers warkin in the Scots leid + the day. --- -A new CD collects the wark o mony o Scotland’s maist kenspeckle female -scrievers warkin in the Scots leid the day. +A new CD collects the wark o mony o Scotland’s maist kenspeckle female scrievers warkin in the Scots +leid the day. -You can buy [A Vision o ma Ain Countree](/sco/furthsettins/scotsoun/820) frae -the Furthsettins section o this wabsteid. +You can buy [A Vision o ma Ain Countree](/sco/furthsettins/scotsoun/820) frae the Furthsettins +section o this wabsteid. diff --git a/src/content/news/sco/2024-03-25-sangschaw-winners.mdx b/src/content/news/sco/2024-03-25-sangschaw-winners.mdx index 4af7c45..a558b36 100644 --- a/src/content/news/sco/2024-03-25-sangschaw-winners.mdx +++ b/src/content/news/sco/2024-03-25-sangschaw-winners.mdx @@ -3,10 +3,9 @@ title: Sangschaw winners 2024 summary: Annooncin the winners o the 2024 Sangschaw! --- -We’re delitit tae annoonce the winners o the 2024 Sangschaw competeition! There -wis mair submeissions nor iver afore, and the qualitie o submeissions was heicher -nor iver afore! Aw the winnin entries, and some o the rinners-up, will be -furthset i furthcomin edeitions o _Lallans_. +We’re delitit tae annoonce the winners o the 2024 Sangschaw competeition! There wis mair +submeissions nor iver afore, and the qualitie o submeissions was heicher nor iver afore! Aw the +winnin entries, and some o the rinners-up, will be furthset i furthcomin edeitions o _Lallans_. ## The Hugh MacDiarmaid Tassie for Poesie @@ -14,9 +13,10 @@ furthset i furthcomin edeitions o _Lallans_. <dt>Winner</dt> <dd>_Kythe_ bi Craig Aitcheson</dd> - <dt>Jynt rinners-up</dt> - <dd>_Wee Greta_ bi Alastair McLeish</dd> - <dd>_Shakin Briggie_ bi Nicola Furrie</dd> +{' '} +<dt>Jynt rinners-up</dt> +<dd>_Wee Greta_ bi Alastair McLeish</dd> +<dd>_Shakin Briggie_ bi Nicola Furrie</dd> <dt>Ruisit</dt> <dd>_Garlieston Bay, February 2023_ bi Colin Mackenzie</dd> @@ -42,8 +42,9 @@ furthset i furthcomin edeitions o _Lallans_. <dt>Winner</dt> <dd>_Stephen_ bi Tracy Anne Harvey</dd> - <dt>Rinner-up</dt> - <dd>_Plague_ bi Andy Matthews</dd> +{' '} +<dt>Rinner-up</dt> +<dd>_Plague_ bi Andy Matthews</dd> <dt>Ruisit</dt> <dd>_Henry Haslett’s blinter o siller_ bi Alan Millar </dd> @@ -60,8 +61,9 @@ furthset i furthcomin edeitions o _Lallans_. <dt>Winner</dt> <dd>_Smirr_ bi Tom Ellett</dd> - <dt>Rinner-up</dt> - <dd>_Dies Irae_ bi Donald Adamson</dd> +{' '} +<dt>Rinner-up</dt> +<dd>_Dies Irae_ bi Donald Adamson</dd> <dt>Ruisit</dt> <dd>_A leein wee puppet_ bi Derrick McClure</dd> diff --git a/src/content/news/sco/2024-04-05-eiks-32.mdx b/src/content/news/sco/2024-04-05-eiks-32.mdx index 488ccef..e4312bf 100644 --- a/src/content/news/sco/2024-04-05-eiks-32.mdx +++ b/src/content/news/sco/2024-04-05-eiks-32.mdx @@ -7,42 +7,37 @@ summary: The Collogue on the 8t o June, and ither news. We will be haudin oor Annual Collogue on Setterday the 8t o June! -The venue will be the Sandeman Room in the AK Bell Library, Perth. It will rin -frae 9.30am until 5pm. +The venue will be the Sandeman Room in the AK Bell Library, Perth. It will rin frae 9.30am until +5pm. -Oor theme this year will be _Scots in Education_. This is parteicular topical -this year, gien the apenin o the first teacher trainin programme effeirin til -teachin the Scots leid. We ar excitit tae walcome a wheen o braw spikkers tae -gie us their thochts on this wechtie maiter! +Oor theme this year will be _Scots in Education_. This is parteicular topical this year, gien the +apenin o the first teacher trainin programme effeirin til teachin the Scots leid. We ar excitit tae +walcome a wheen o braw spikkers tae gie us their thochts on this wechtie maiter! -Forby, we luik forrit tae haein winners frae this year’s Sangschaw competeition -read their warks. +Forby, we luik forrit tae haein winners frae this year’s Sangschaw competeition read their warks. -We will be releasin the fu programme o events gey shuin. In the meantime, get it -in your diaries! +We will be releasin the fu programme o events gey shuin. In the meantime, get it in your diaries! ## Sangschaw 2024 winners annoonced -As detailed in [oor lest news post](/sco/news/2024-03-25-sangschaw-winners), we -hae annoonced the winners o the 2024 Sangschaw. Oor congratulations til aw the -winners, an til awbody that submittit. The qualitie was heicher than iver afore -quo oor eiditor, Wullie, and there wis mair submeissions nor iver afore, sae -we aw hae somethin tae be pleised aboot! +As detailed in [oor lest news post](/sco/news/2024-03-25-sangschaw-winners), we hae annoonced the +winners o the 2024 Sangschaw. Oor congratulations til aw the winners, an til awbody that submittit. +The qualitie was heicher than iver afore quo oor eiditor, Wullie, and there wis mair submeissions +nor iver afore, sae we aw hae somethin tae be pleised aboot! ## Album release: _LEID_ -We said in oor lest issue that Wullie wis aboot tae pit oot his new album wi the -Bowhill Players: weill, gin you misst it, the album is oot! You can listen tae -it and [cowp it on Bandcamp](https://thebowhillplayers.bandcamp.com/album/leid) -for doonload or as a CD. In this scriever’s opeinion, it’s no somethin you want -tae miss! +We said in oor lest issue that Wullie wis aboot tae pit oot his new album wi the Bowhill Players: +weill, gin you misst it, the album is oot! You can listen tae it and +[cowp it on Bandcamp](https://thebowhillplayers.bandcamp.com/album/leid) for doonload or as a CD. In +this scriever’s opeinion, it’s no somethin you want tae miss! ## Beuk launch: _Library of Aethers_ -The folk singer Alasdair Roberts will be in conversation wi Wullie Hershaw about -his new beuk, _Library of Aethers_, an ingaitherin frae his rare an sindry -lyric beuks. It includes ower 70 oreiginal texts frae his youth til the nou, and -owersettins intil Portuguese, Gaelic an, o coorse, Scots. +The folk singer Alasdair Roberts will be in conversation wi Wullie Hershaw about his new beuk, +_Library of Aethers_, an ingaitherin frae his rare an sindry lyric beuks. It includes ower 70 +oreiginal texts frae his youth til the nou, and owersettins intil Portuguese, Gaelic an, o coorse, +Scots. The event will be in Kirkcaldy on Friday the 19t o April. You can cowp [tickets til the beuk launch online](https://www.ticketsource.co.uk/whats-on/kirkcaldy/the-kitchen-treasury/library-of-aethers-book-launch-w-alasdair-roberts-and-william-hershaw/e-jbxzld). @@ -51,22 +46,19 @@ The event will be in Kirkcaldy on Friday the 19t o April. You can cowp We will be amang a wheen o staws at the [Scottish Poetry Library Pamphlet Fair](https://www.scottishpoetrylibrary.org.uk/spl-pamphlet-fair-2023/) -in Embro on Setterday the 27t o April. Entry is free, 11am til 3pm at the -Scottish Poetry Library on Crichton Street. +in Embro on Setterday the 27t o April. Entry is free, 11am til 3pm at the Scottish Poetry Library on +Crichton Street. ## Scottish Leids Bill -The Scottish Leids Bill continues tae daunder its wey throu the legislative -process. The Associe haes submittit its contribution til the public consultation -that will be conseidered by the +The Scottish Leids Bill continues tae daunder its wey throu the legislative process. The Associe +haes submittit its contribution til the public consultation that will be conseidered by the [Pairliamentary Education Comatee](https://www.parliament.scot/chamber-and-committees/committees/current-and-previous-committees/session-6-education-children-and-young-people-committee). -We hae expresst oor support for the principles o the Bill, in parteicular that -Scots maun be recogneised as an offeicial leid o Scotland. We tak tent o the -sindry situations o Scots an Gaelic an hae expresst oor concern that these arnae -tret the same. +We hae expresst oor support for the principles o the Bill, in parteicular that Scots maun be +recogneised as an offeicial leid o Scotland. We tak tent o the sindry situations o Scots an Gaelic +an hae expresst oor concern that these arnae tret the same. -We howp tae furthset oor hale submeission til the Education Comatee in due -coorse. +We howp tae furthset oor hale submeission til the Education Comatee in due coorse. -Meanwhyle, we howp that the Education Comatee will conseider oor submeission and -will conseider cawin us for tae present evidence in person. +Meanwhyle, we howp that the Education Comatee will conseider oor submeission and will conseider +cawin us for tae present evidence in person. diff --git a/src/content/news/sco/2024-05-17-collogue-programme.mdx b/src/content/news/sco/2024-05-17-collogue-programme.mdx index e3bd905..eee5841 100644 --- a/src/content/news/sco/2024-05-17-collogue-programme.mdx +++ b/src/content/news/sco/2024-05-17-collogue-programme.mdx @@ -1,29 +1,50 @@ --- title: Collogue programme 8t June summary: >- - We hae set the programme for oor annual Collogue on the 8t o June. The theme - is ‘Scots in Education’. + We hae set the programme for oor annual Collogue on the 8t o June. The theme is ‘Scots in + Education’. --- + import Schedule from '$components/Schedule.astro'; -We will be haein oor Annual Collogue on Saturday 8t June, 2024 in the Sandeman -Room at the AK Bell Library, York Place, Perth. This year's theme is Scots in -Education. +We will be haein oor Annual Collogue on Saturday 8t June, 2024 in the Sandeman Room at the AK Bell +Library, York Place, Perth. This year's theme is Scots in Education. The programme for the day will be as follaes: -<Schedule entries={[ - { time: '9.30am', description: 'Reception & registration' }, - { time: '10.00am', description: 'Walcome & introduction frae Rab Wilson (Preses)' }, - { time: '10.10am', description: 'Bruce Eunson, Scots Language Co-Ordinator, <i>The New OU Course in Scots fir teachers</i>' }, - { time: '11.10am', description: 'Laura Green, Education Specialist at the Centre for the Scots Leid, <i>Scots in the Early Year Curriculum</i>' }, - { time: '12.10am', description: 'A walin o readins frae the Sangschaw and presentation o prizes' }, - { time: '13.00pm', description: 'Buffet lunch' }, - { time: '14.10pm', description: 'Dr Jamie Fairbairn, Heid o Humanities at Banff Academy, <i>Scots Scweel an Community</i>' }, - { time: '15.10pm', description: 'Alan Riach, Professor o Scottish Leitratur at the Universitie o Glesca, <i>Scots in Tertiary Education</i>' }, - { time: '16.10pm', description: 'Q&A and discussion' }, - { time: '17.00pm', description: 'Close' }, -]} /> +<Schedule + entries={[ + { time: '9.30am', description: 'Reception & registration' }, + { time: '10.00am', description: 'Walcome & introduction frae Rab Wilson (Preses)' }, + { + time: '10.10am', + description: + 'Bruce Eunson, Scots Language Co-Ordinator, <i>The New OU Course in Scots fir teachers</i>', + }, + { + time: '11.10am', + description: + 'Laura Green, Education Specialist at the Centre for the Scots Leid, <i>Scots in the Early Year Curriculum</i>', + }, + { + time: '12.10am', + description: 'A walin o readins frae the Sangschaw and presentation o prizes', + }, + { time: '13.00pm', description: 'Buffet lunch' }, + { + time: '14.10pm', + description: + 'Dr Jamie Fairbairn, Heid o Humanities at Banff Academy, <i>Scots Scweel an Community</i>', + }, + { + time: '15.10pm', + description: + 'Alan Riach, Professor o Scottish Leitratur at the Universitie o Glesca, <i>Scots in Tertiary Education</i>', + }, + { time: '16.10pm', description: 'Q&A and discussion' }, + { time: '17.00pm', description: 'Close' }, + ]} +/> -We howp tae see as mony members there as can mak it! Gin you're no a member, -you can buy a membership whan you arrive. +We howp tae see as mony members there as can mak it! Gin you're no a member, you can buy a +membership whan you arrive. diff --git a/src/content/news/sco/2024-08-08-eiks-33.md b/src/content/news/sco/2024-08-08-eiks-33.md index 6a7c4d8..e54d6a7 100644 --- a/src/content/news/sco/2024-08-08-eiks-33.md +++ b/src/content/news/sco/2024-08-08-eiks-33.md @@ -1,27 +1,26 @@ --- title: Eiks an Ens 33 summary: >- - Includin notice o our AGM, things tae leuk out for in the Fringe, an the - WayWords festival. + Includin notice o our AGM, things tae leuk out for in the Fringe, an the WayWords festival. --- ## AGM -Our AGM will be on Zoom on Wadnesday the 11t o September, 7.00-7.30pm. Gin ye're -a memmer o the Associe, watch your email inbox for an invitation. Gin ye dinnae -receive it, [get in touch](mailto:lallans@hotmail.co.uk)! Lat us ken gin there's -ocht ye wad pit on the agenda. +Our AGM will be on Zoom on Wadnesday the 11t o September, 7.00-7.30pm. Gin ye're a memmer o the +Associe, watch your email inbox for an invitation. Gin ye dinnae receive it, +[get in touch](mailto:lallans@hotmail.co.uk)! Lat us ken gin there's ocht ye wad pit on the agenda. ## The Orgreave Stations -On the 20t o November, our eiditor, Wullie Hershaw, will be launchin his new -poesie beuk, _The Orgreave Stations_. It is a fiery and unflinchin leuk at the -1984 miners' strike throu the lens o a retellin o Christ's Passion. +On the 20t o November, our eiditor, Wullie Hershaw, will be launchin his new poesie beuk, _The +Orgreave Stations_. It is a fiery and unflinchin leuk at the 1984 miners' strike throu the lens o a +retellin o Christ's Passion. [Jim Aitken](https://culturematters.org.uk/index.php/arts/poetry/item/4581-the-orgreave-stations-by-william-hershaw) -and [Alistair McIntosh](https://culturematters.org.uk/index.php/arts/poetry/item/4602-a-powerful-work-of-scottish-working-class-liberation-theology-a-review-of-the-orgreave-stations) -hae awready dane a fine job o reviewin the beuk, and they emphasise the threids -that Hershaw's poems ettle tae weave thegether atween Christianity and Marxism. +and +[Alistair McIntosh](https://culturematters.org.uk/index.php/arts/poetry/item/4602-a-powerful-work-of-scottish-working-class-liberation-theology-a-review-of-the-orgreave-stations) +hae awready dane a fine job o reviewin the beuk, and they emphasise the threids that Hershaw's poems +ettle tae weave thegether atween Christianity and Marxism. Gin you're in Embro on the 20t o November, we'll see you there! @@ -29,8 +28,8 @@ Gin you're in Embro on the 20t o November, we'll see you there! ## Embro Fringe -It's festival season here in Embro, and amang the events there's a wheen o guid -anes for Scots-leid enthusiasts! +It's festival season here in Embro, and amang the events there's a wheen o guid anes for Scots-leid +enthusiasts! - [Memories, Times and Places with Alf Jasinksi and Les McConnel](https://firestationcreative.co.uk/event/memories-times-and-places) - [ScotlandsFest: Whit If? Scotland’s History as It Might Have Been – Hugh McMillan](https://tickets.edfringe.com/whats-on/scotlandsfest-whit-if-scotland-s-history-as-it-might-have-been-hugh-mcmillan) @@ -44,46 +43,43 @@ anes for Scots-leid enthusiasts! ## Scottish Dance Research -The Royal Scottish Country Dance Society (RSCDS) haes got in titch tae ask gin -we coud help wi their research tae help them forder the futur for Scottish -country daunce. Gin ye've got 10 meenits, how no gie them a haund? +The Royal Scottish Country Dance Society (RSCDS) haes got in titch tae ask gin we coud help wi their +research tae help them forder the futur for Scottish country daunce. Gin ye've got 10 meenits, how +no gie them a haund? Here's their message: > **Contribute to Scottish Dance Research!** - -> The Royal Scottish Country Dance Society (RSCDS) invites you to participate -> in a short survey about Scottish dance and cultural traditions. Your insights, -> whether you're a dancer or not, are valuable in shaping the future of Scottish -> cultural promotion. -> + +> The Royal Scottish Country Dance Society (RSCDS) invites you to participate in a short survey +> about Scottish dance and cultural traditions. Your insights, whether you're a dancer or not, are +> valuable in shaping the future of Scottish cultural promotion. +> > - Survey takes only 5-10 minutes > - Completely anonymous > - No prior dance knowledge required -> +> > How to participate: -> +> > 1. Click on the survey link below. > 2. Answer the questions to the best of your ability. > 3. If a question doesn't apply to you, feel free to skip it. > 4. Click 'Submit' at the end of the survey. -> -> Your participation will help ensure Scottish traditions remain vibrant and -> accessible for future generations. -> +> +> Your participation will help ensure Scottish traditions remain vibrant and accessible for future +> generations. +> > Take the survey here: > [https://forms.office.com/e/FdXvD85zSt](https://forms.office.com/e/FdXvD85zSt) -> +> > Thank you for contributing to this important research! ## WayWords festival -Gin Embro's no sae convenient for ye, mebbe Aiberdeen is better. Gin that's the -case, be shair tae hae a swatch at the events on offer at the fift annual -[WayWords festival](https://www.waywordfestival.com), hostit by the Universitie -o Aiberdeen. +Gin Embro's no sae convenient for ye, mebbe Aiberdeen is better. Gin that's the case, be shair tae +hae a swatch at the events on offer at the fift annual +[WayWords festival](https://www.waywordfestival.com), hostit by the Universitie o Aiberdeen. -There'll be scrievers, includin Liz Lochhead, daunce clesses, Gaelic -picnics, and workshops on owersettin, climate chynge, and muckle mair, and our -member Sheena Blackhall will be readin out her prize-winnin story at the -presentation o the Toulmin Prize for Writing in North East Scots. +There'll be scrievers, includin Liz Lochhead, daunce clesses, Gaelic picnics, and workshops on +owersettin, climate chynge, and muckle mair, and our member Sheena Blackhall will be readin out her +prize-winnin story at the presentation o the Toulmin Prize for Writing in North East Scots. diff --git a/src/data/lallans/index.ts b/src/data/lallans/index.ts index bdb09ad..32ccfd4 100644 --- a/src/data/lallans/index.ts +++ b/src/data/lallans/index.ts @@ -78,6 +78,7 @@ export const getLallansIssue: LallansIssueGetterTable = { 100: async () => (await import('./issue100')).default, 101: async () => (await import('./issue101')).default, 102: async () => (await import('./issue102')).default, + 103: async () => (await import('./issue103')).default, 104: async () => (await import('./issue104')).default, }; diff --git a/src/data/lallans/issue103.ts b/src/data/lallans/issue103.ts new file mode 100644 index 0000000..ef1954b --- /dev/null +++ b/src/data/lallans/issue103.ts @@ -0,0 +1,64 @@ +import img192w from '$images/lallans/issue103-192w.webp'; +import img274w from '$images/lallans/issue103-274w.webp'; +import type LallansIssue from '$types/LallansIssue'; + +const issue: LallansIssue = { + issueNumber: 103, + img: { + width192: img192w, + width274: img274w, + }, + issueName: 'Yuiltide 2023', + price: '10.00', + uploadDate: '2024-09-18', + description: { + 'en-GB': 'The hundred-and-third issue of the Lallans magazine.', + sco: 'The hunner-an-thrid issue o the Lallans magazine.', + }, + contributors: [ + 'Brendan McCluskey', + 'William Dunbar', + 'Keith Wood', + 'Robert Duncan', + 'Carlos Llaza', + 'Dorothy Lawrenson', + 'Alan Millar', + 'Jerry Randalls', + 'Nicola Furrie', + 'John Burns', + 'Dauvit Horsbroch', + 'Andrew Matthews', + 'John Erskine', + 'Sheena Blackhall', + 'Ann Jones', + 'George T Watt', + 'Jim Aitken', + 'Jock Stein', + 'Fred Freeman', + 'Tom Ellett', + 'WS Milne', + 'Joe Carstairs', + 'Colin MacKenzie', + 'James Sinclair', + 'Hamish Scott', + 'Donald Adamson', + 'Aino Krohn', + 'Ross MacDiarmid', + 'Maureen Sangster', + 'Frances Robson', + 'Derrick McClure', + 'Brithers Grimm', + 'Irene Howat', + 'Alastair Mcleish', + 'AC Clarke', + 'Rob McClure', + 'Alistair Lawrie', + 'Andrew Urquhart', + 'Ian Nimmo White', + 'Elaine Morton', + 'Hamish Wallochie', + 'Ann MacKinnon', + ], +}; + +export default issue; diff --git a/src/images/lallans/issue103-192w.webp b/src/images/lallans/issue103-192w.webp Binary files differnew file mode 100644 index 0000000..9383bd3 --- /dev/null +++ b/src/images/lallans/issue103-192w.webp diff --git a/src/images/lallans/issue103-274w.webp b/src/images/lallans/issue103-274w.webp Binary files differnew file mode 100644 index 0000000..9609313 --- /dev/null +++ b/src/images/lallans/issue103-274w.webp diff --git a/src/images/lallans/issue103.jpg b/src/images/lallans/issue103.jpg Binary files differnew file mode 100644 index 0000000..146e0df --- /dev/null +++ b/src/images/lallans/issue103.jpg diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 938bfe5..7ff06a8 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -24,7 +24,7 @@ function qualifiedLocalisedPath(newLocale: Locale) { } --- -<!DOCTYPE html> +<!doctype html> <html lang={locale}> <head> <meta charset="UTF-8" /> diff --git a/src/pages/[locale]/jyne/index.astro b/src/pages/[locale]/jyne/index.astro index a586ee3..cb2cfe5 100644 --- a/src/pages/[locale]/jyne/index.astro +++ b/src/pages/[locale]/jyne/index.astro @@ -79,8 +79,8 @@ const t = translate(locale); })} /> <p> - Scots Language Society<br> - 83-47-00<br> + Scots Language Society<br /> + 83-47-00<br /> 00153458 </p> </details> diff --git a/src/pages/index.astro b/src/pages/index.astro index 4a02fcc..e496e3a 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,3 +1,5 @@ --- + --- -<meta http-equiv="refresh" content="0;url=/sco/" />
\ No newline at end of file + +<meta http-equiv="refresh" content="0;url=/sco/" /> diff --git a/src/types/LallansIssueNumber.d.ts b/src/types/LallansIssueNumber.d.ts index 25e39e9..e4eb49c 100644 --- a/src/types/LallansIssueNumber.d.ts +++ b/src/types/LallansIssueNumber.d.ts @@ -70,6 +70,7 @@ type LallansIssueNumber = | 100 | 101 | 102 + | 103 | 104; export default LallansIssueNumber; |
