From 517178a7e7e300ce0e695a5fdcf834987b0a812e Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 15 Nov 2023 02:20:31 +0000 Subject: [PATCH 01/22] build: update Browserslist db --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 04023eb1..bcd087f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1371,9 +1371,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538: - version "1.0.30001559" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz" - integrity sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA== + version "1.0.30001562" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz" + integrity sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng== caseless@~0.12.0: version "0.12.0" From 1b004a76b20609797f569ca4d303a828b1a51ebb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 23:09:27 +0000 Subject: [PATCH 02/22] chore(deps): update all non-major dependencies --- package.json | 4 ++-- yarn.lock | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 2d414d05..4fafc1ad 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "cy-verify-downloads": "0.2.2", "cypress": "12.17.4", "cypress-localstorage-commands": "2.2.4", - "eslint": "8.53.0", + "eslint": "8.54.0", "eslint-config-prettier": "8.10.0", "eslint-plugin-cypress": "2.15.1", "eslint-plugin-es": "4.1.0", @@ -60,7 +60,7 @@ "prettier": "2.8.8", "prettier-plugin-svelte": "^2.10.0", "svelte": "3.59.2", - "svelte-preprocess": "5.0.4", + "svelte-preprocess": "5.1.0", "tailwindcss": "^3.3.1", "tslib": "^2.5.0", "typescript": "5.2.2", diff --git a/yarn.lock b/yarn.lock index 04023eb1..2e8e72d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -329,10 +329,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.53.0": - version "8.53.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d" - integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w== +"@eslint/js@8.54.0": + version "8.54.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf" + integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ== "@fastify/busboy@^2.0.0": version "2.0.0" @@ -2660,15 +2660,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@8.53.0: - version "8.53.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.53.0.tgz#14f2c8244298fcae1f46945459577413ba2697ce" - integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag== +eslint@8.54.0: + version "8.54.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537" + integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.3" - "@eslint/js" "8.53.0" + "@eslint/js" "8.54.0" "@humanwhocodes/config-array" "^0.11.13" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" @@ -5761,10 +5761,10 @@ svelte-hmr@^0.15.3: resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.15.3.tgz#df54ccde9be3f091bf5f18fc4ef7b8eb6405fbe6" integrity sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ== -svelte-preprocess@5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-5.0.4.tgz#2123898e079a074f7f4ef1799e10e037f5bcc55b" - integrity sha512-ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw== +svelte-preprocess@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-5.1.0.tgz#824a1b072da118cba46ad2e5e88a568083acad4b" + integrity sha512-EkErPiDzHAc0k2MF5m6vBNmRUh338h2myhinUw/xaqsLs7/ZvsgREiLGj03VrSzbY/TB5ZXgBOsKraFee5yceA== dependencies: "@types/pug" "^2.0.6" detect-indent "^6.1.0" From f5f9ec9560e665b702cf48c2ee9565f01b56f627 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Nov 2023 12:04:12 +0000 Subject: [PATCH 03/22] chore(deps): update all non-major dependencies --- package.json | 6 +++--- yarn.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 4fafc1ad..49a4a63f 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "devDependencies": { "@cypress/snapshot": "2.1.7", "@sveltejs/adapter-static": "2.0.3", - "@sveltejs/kit": "1.27.3", + "@sveltejs/kit": "1.27.6", "@testing-library/jest-dom": "5.17.0", "@testing-library/svelte": "3.2.2", "@types/pako": "2.0.3", @@ -38,7 +38,7 @@ "cssnano": "^6.0.0", "cy-verify-downloads": "0.2.2", "cypress": "12.17.4", - "cypress-localstorage-commands": "2.2.4", + "cypress-localstorage-commands": "2.2.5", "eslint": "8.54.0", "eslint-config-prettier": "8.10.0", "eslint-plugin-cypress": "2.15.1", @@ -88,7 +88,7 @@ }, "volta": { "node": "18.18.2", - "yarn": "1.22.19" + "yarn": "1.22.21" }, "engines": { "node": ">=16.7" diff --git a/yarn.lock b/yarn.lock index 2e8e72d5..5f06efc0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -465,12 +465,12 @@ resolved "https://registry.yarnpkg.com/@sveltejs/adapter-static/-/adapter-static-2.0.3.tgz#616836c30bdce4d673a2e26c0f5ffbd5c1bc7c67" integrity sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ== -"@sveltejs/kit@1.27.3": - version "1.27.3" - resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.27.3.tgz#2e7067fd781d26c194e0da536cf643cbae9b79a2" - integrity sha512-pd7qwX6ww5noA0/FLk45B0aKUeOXWR+pfZsGTrv3dRmj3lTmnki9UTmTdWzHJGrje+BBkGUZHfgGrsSOQQBQpQ== +"@sveltejs/kit@1.27.6": + version "1.27.6" + resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.27.6.tgz#2feea84413205422887e01326d979edd9a982dff" + integrity sha512-GsjTkMbKzXdbeRg0tk8S7HNShQ4879ftRr0ZHaZfjbig1xQwG57Bvcm9U9/mpLJtCapLbLWUnygKrgcLISLC8A== dependencies: - "@sveltejs/vite-plugin-svelte" "^2.4.1" + "@sveltejs/vite-plugin-svelte" "^2.5.0" "@types/cookie" "^0.5.1" cookie "^0.5.0" devalue "^4.3.1" @@ -484,23 +484,23 @@ tiny-glob "^0.2.9" undici "~5.26.2" -"@sveltejs/vite-plugin-svelte-inspector@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.3.tgz#fdbf80b43bfaa20deaa5ff6d0676351aa9aecbcc" - integrity sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA== +"@sveltejs/vite-plugin-svelte-inspector@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.4.tgz#c99fcb73aaa845a3e2c0563409aeb3ee0b863add" + integrity sha512-zjiuZ3yydBtwpF3bj0kQNV0YXe+iKE545QGZVTaylW3eAzFr+pJ/cwK8lZEaRp4JtaJXhD5DyWAV4AxLh6DgaQ== dependencies: debug "^4.3.4" -"@sveltejs/vite-plugin-svelte@^2.4.1": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.4.5.tgz#55ba60ce37dfa3acf76b4ec54955011a34cd49a2" - integrity sha512-UJKsFNwhzCVuiZd06jM/psscyNJNDwjQC+qIeb7GBJK9iWeQCcIyfcPWDvbCudfcJggY9jtxJeeaZH7uny93FQ== +"@sveltejs/vite-plugin-svelte@^2.5.0": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.5.2.tgz#de9e9cab3d9614407788702514bc57258a3cac77" + integrity sha512-Dfy0Rbl+IctOVfJvWGxrX/3m6vxPLH8o0x+8FA5QEyMUQMo4kGOVIojjryU7YomBAexOTAuYf1RT7809yDziaA== dependencies: - "@sveltejs/vite-plugin-svelte-inspector" "^1.0.3" + "@sveltejs/vite-plugin-svelte-inspector" "^1.0.4" debug "^4.3.4" deepmerge "^4.3.1" kleur "^4.1.5" - magic-string "^0.30.2" + magic-string "^0.30.3" svelte-hmr "^0.15.3" vitefu "^0.2.4" @@ -1791,10 +1791,10 @@ cy-verify-downloads@0.2.2: resolved "https://registry.yarnpkg.com/cy-verify-downloads/-/cy-verify-downloads-0.2.2.tgz#c5eb96724f1abdaf3456a3ca5669030be52da01c" integrity sha512-Cr4U38xg5z8AK8XiYuEcbAy1rfgtkZTdUFTWkG5NM+BxKSjRlpGt6LpylLpHp9B6ikKCBPotpeewW7fOuBFKlA== -cypress-localstorage-commands@2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/cypress-localstorage-commands/-/cypress-localstorage-commands-2.2.4.tgz#deba47b5128156abd40eb5b69a9e7bfa943fbc6e" - integrity sha512-XiWFJhhgcoWf7p6sS5igGuN8WWGF0K1jRCPo2XlikwEWgts1uvPl80cybGiztYoNrU1xCbQO9/IOz6Y0eTl4Lg== +cypress-localstorage-commands@2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/cypress-localstorage-commands/-/cypress-localstorage-commands-2.2.5.tgz#81c8f53a06e2ed93c1e068c1101da85f80f27f61" + integrity sha512-07zpwzWdY+uPi1NEHFhWQNylIJqRxR78Ile05L6WT8h1Gz0OaxgBSZRuzp+pqUni/3Pk4d2ieq/cSh++ZmujEA== cypress@12.17.4: version "12.17.4" @@ -4029,14 +4029,14 @@ magic-string@^0.27.0: dependencies: "@jridgewell/sourcemap-codec" "^1.4.13" -magic-string@^0.30.0, magic-string@^0.30.2: +magic-string@^0.30.0: version "0.30.2" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.2.tgz#dcf04aad3d0d1314bc743d076c50feb29b3c7aca" integrity sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug== dependencies: "@jridgewell/sourcemap-codec" "^1.4.15" -magic-string@^0.30.1: +magic-string@^0.30.1, magic-string@^0.30.3: version "0.30.5" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9" integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA== From 26116640473aa703fa67c3eca98a1b8d1b77a16f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 01:29:47 +0000 Subject: [PATCH 04/22] chore(deps): update all non-major dependencies --- package.json | 2 +- yarn.lock | 97 +++++++++++++++++++++++++++++----------------------- 2 files changed, 56 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index 49a4a63f..08804871 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "lint-staged": "13.3.0", "node-html-parser": "^6.1.5", "postcss": "^8.4.21", - "postcss-load-config": "4.0.1", + "postcss-load-config": "4.0.2", "prettier": "2.8.8", "prettier-plugin-svelte": "^2.10.0", "svelte": "3.59.2", diff --git a/yarn.lock b/yarn.lock index 5f06efc0..b627faa3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -767,13 +767,13 @@ "@typescript-eslint/types" "5.62.0" "@typescript-eslint/visitor-keys" "5.62.0" -"@typescript-eslint/scope-manager@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz#b0276118b13d16f72809e3cecc86a72c93708540" - integrity sha512-TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg== +"@typescript-eslint/scope-manager@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz#621f603537c89f4d105733d949aa4d55eee5cea8" + integrity sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A== dependencies: - "@typescript-eslint/types" "6.10.0" - "@typescript-eslint/visitor-keys" "6.10.0" + "@typescript-eslint/types" "6.11.0" + "@typescript-eslint/visitor-keys" "6.11.0" "@typescript-eslint/type-utils@5.62.0": version "5.62.0" @@ -790,10 +790,10 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== -"@typescript-eslint/types@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.10.0.tgz#f4f0a84aeb2ac546f21a66c6e0da92420e921367" - integrity sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg== +"@typescript-eslint/types@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.11.0.tgz#8ad3aa000cbf4bdc4dcceed96e9b577f15e0bf53" + integrity sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA== "@typescript-eslint/typescript-estree@5.62.0": version "5.62.0" @@ -808,13 +808,13 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz#667381eed6f723a1a8ad7590a31f312e31e07697" - integrity sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg== +"@typescript-eslint/typescript-estree@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz#7b52c12a623bf7f8ec7f8a79901b9f98eb5c7990" + integrity sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ== dependencies: - "@typescript-eslint/types" "6.10.0" - "@typescript-eslint/visitor-keys" "6.10.0" + "@typescript-eslint/types" "6.11.0" + "@typescript-eslint/visitor-keys" "6.11.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -835,17 +835,17 @@ eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/utils@^6.9.1": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.10.0.tgz#4d76062d94413c30e402c9b0df8c14aef8d77336" - integrity sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg== +"@typescript-eslint/utils@^6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.11.0.tgz#11374f59ef4cea50857b1303477c08aafa2ca604" + integrity sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.10.0" - "@typescript-eslint/types" "6.10.0" - "@typescript-eslint/typescript-estree" "6.10.0" + "@typescript-eslint/scope-manager" "6.11.0" + "@typescript-eslint/types" "6.11.0" + "@typescript-eslint/typescript-estree" "6.11.0" semver "^7.5.4" "@typescript-eslint/visitor-keys@5.62.0": @@ -856,12 +856,12 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" -"@typescript-eslint/visitor-keys@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz#b9eaf855a1ac7e95633ae1073af43d451e8f84e3" - integrity sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg== +"@typescript-eslint/visitor-keys@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz#d991538788923f92ec40d44389e7075b359f3458" + integrity sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ== dependencies: - "@typescript-eslint/types" "6.10.0" + "@typescript-eslint/types" "6.11.0" eslint-visitor-keys "^3.4.1" "@ungap/structured-clone@^1.2.0": @@ -2621,11 +2621,11 @@ eslint-plugin-unicorn@^46.0.0: strip-indent "^3.0.0" eslint-plugin-vitest@^0.3.0: - version "0.3.9" - resolved "https://registry.yarnpkg.com/eslint-plugin-vitest/-/eslint-plugin-vitest-0.3.9.tgz#0490c8c5157fde7f2bafe4161b3c625a06c4abc3" - integrity sha512-ZGrz8dWFlotM5dwrsMLP4VcY5MizwKNV4JTnY0VKdnuCZ+qeEUMHf1qd8kRGQA3tqLvXcV929wt2ANkduq2Pgw== + version "0.3.10" + resolved "https://registry.yarnpkg.com/eslint-plugin-vitest/-/eslint-plugin-vitest-0.3.10.tgz#236f8da89ffc10edc158d39fa61d13ff8759febc" + integrity sha512-08lj4rdhZHYyHk+Py2nJ7SlE6arP8GNfGXl9jVqhe9s5JoZIGiBpIkLGX+VNBiB6vXTn56H6Ant7Koc6XzRjtQ== dependencies: - "@typescript-eslint/utils" "^6.9.1" + "@typescript-eslint/utils" "^6.11.0" eslint-scope@^5.1.1: version "5.1.1" @@ -3332,9 +3332,9 @@ ieee754@^1.1.13: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.2.0: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" + integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== import-fresh@^3.2.1: version "3.3.0" @@ -3870,6 +3870,11 @@ lilconfig@2.1.0, lilconfig@^2.0.5, lilconfig@^2.1.0: resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== +lilconfig@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc" + integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g== + lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" @@ -4836,13 +4841,13 @@ postcss-js@^4.0.0, postcss-js@^4.0.1: dependencies: camelcase-css "^2.0.1" -postcss-load-config@4.0.1, postcss-load-config@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.1.tgz#152383f481c2758274404e4962743191d73875bd" - integrity sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA== +postcss-load-config@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3" + integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ== dependencies: - lilconfig "^2.0.5" - yaml "^2.1.1" + lilconfig "^3.0.0" + yaml "^2.3.4" postcss-load-config@^3.1.0: version "3.1.4" @@ -4852,6 +4857,14 @@ postcss-load-config@^3.1.0: lilconfig "^2.0.5" yaml "^1.10.2" +postcss-load-config@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.1.tgz#152383f481c2758274404e4962743191d73875bd" + integrity sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA== + dependencies: + lilconfig "^2.0.5" + yaml "^2.1.1" + postcss-merge-longhand@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz#6f627b27db939bce316eaa97e22400267e798d69" @@ -6350,7 +6363,7 @@ yaml@^1.10.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yaml@^2.1.1: +yaml@^2.1.1, yaml@^2.3.4: version "2.3.4" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2" integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA== From 11a814ac7d754d18afa75016bdd4f97fc6b4bd03 Mon Sep 17 00:00:00 2001 From: Max Stanley Date: Tue, 21 Nov 2023 21:00:14 +0000 Subject: [PATCH 05/22] Add environment arguments to Dockerfile --- .dockerignore | 6 +++++- .gitignore | 1 + Dockerfile | 40 +++++++++++++++++++++++++++------------- Dockerfile.dev | 8 -------- docker-compose.yml | 2 +- src/env.d.ts | 3 --- src/lib/util/env.ts | 7 +------ 7 files changed, 35 insertions(+), 32 deletions(-) delete mode 100644 Dockerfile.dev diff --git a/.dockerignore b/.dockerignore index b477f4cc..7624b2ae 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,4 +2,8 @@ **/.git **/.svelte-kit **/dist -**/docs \ No newline at end of file +**/docs + +Dockerfile +.dockerignore +docker-compose.yml \ No newline at end of file diff --git a/.gitignore b/.gitignore index 381928d7..b3bcfc8f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ yarn-error.log /cypress/downloads /cypress/videos /cypress/screenshots +/docs diff --git a/Dockerfile b/Dockerfile index 879b9aa1..c8ab6c84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,31 @@ -# Two-stage docker container for mermaid-js/mermaid-live-editor -# Build : docker build -t mermaid-js/mermaid-live-editor . -# Run : docker run --name mermaid-live-editor --publish 8080:8080 mermaid-js/mermaid-live-editor -# Start : docker start mermaid-live-editor -# Use webbrowser : http://localhost:8080 -# Stop : press ctrl + c -# or -# docker stop mermaid-live-editor -FROM node:18.18.2 as mermaid-live-editor-builder -COPY --chown=node:node . /home -WORKDIR /home +FROM docker.io/library/node:20-alpine3.18 AS mermaid-live-editor-dependencies + +RUN apk --no-cache add build-base git python3 && \ + rm -rf /var/cache/apk/* + +RUN yarn global add node-gyp + +WORKDIR /app + +COPY ./package.json . +COPY ./yarn.lock . + RUN yarn install + +FROM mermaid-live-editor-dependencies AS mermaid-live-editor-builder + +ARG MERMAID_RENDERER_URL +ARG MERMAID_KROKI_RENDERER_URL + +COPY . ./ + RUN yarn build -FROM nginxinc/nginx-unprivileged:alpine as mermaid-live-editor-runner +FROM mermaid-live-editor-builder AS mermaid-dev + +ENTRYPOINT ["yarn", "dev"] + +FROM nginx:1.25-alpine3.18 AS mermaid + COPY ./nginx.conf /etc/nginx/conf.d/default.conf -COPY --from=mermaid-live-editor-builder --chown=nginx:nginx /home/docs /usr/share/nginx/html +COPY --from=mermaid-live-editor-builder /app/docs /usr/share/nginx/html diff --git a/Dockerfile.dev b/Dockerfile.dev deleted file mode 100644 index 5e36fd41..00000000 --- a/Dockerfile.dev +++ /dev/null @@ -1,8 +0,0 @@ -FROM node:18.18.2 -WORKDIR /app -COPY package.json . -COPY yarn.lock . -RUN npm install -COPY . . -RUN ls -CMD ["yarn", "dev"] diff --git a/docker-compose.yml b/docker-compose.yml index 68a47332..c4649256 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: mermaid: build: context: . - dockerfile: Dockerfile.dev + target: mermaid-dev volumes: - ./src:/app/src ports: diff --git a/src/env.d.ts b/src/env.d.ts index 8188f7aa..3bdd9740 100644 --- a/src/env.d.ts +++ b/src/env.d.ts @@ -3,9 +3,6 @@ interface ImportMetaEnv { readonly MERMAID_RENDERER_URL?: string; readonly MERMAID_KROKI_RENDERER_URL?: string; - readonly MERMAID_CDN_URL?: string; - readonly MERMAID_BASE_URL?: string; - readonly MERMAID_LOCAL?: boolean; // more env variables... } diff --git a/src/lib/util/env.ts b/src/lib/util/env.ts index 2c14a52e..bc500063 100644 --- a/src/lib/util/env.ts +++ b/src/lib/util/env.ts @@ -1,9 +1,4 @@ export const env = { rendererUrl: import.meta.env.MERMAID_RENDERER_URL ?? 'https://mermaid.ink', - krokiRendererUrl: import.meta.env.MERMAID_KROKI_RENDERER_URL ?? 'https://kroki.io', - mermaidCDNUrl: import.meta.env.MERMAID_CDN_URL ?? 'https://unpkg.com/@mermaid-js', - mermaidBaseURL: import.meta.env.MERMAID_BASE_URL ?? 'http://localhost:9000', - useLocalMermaid: import.meta.env.MERMAID_LOCAL ?? false, - isDev: import.meta.env.DEV, - baseURL: import.meta.env.BASE_URL + krokiRendererUrl: import.meta.env.MERMAID_KROKI_RENDERER_URL ?? 'https://kroki.io' }; From 7db761fba7c6a13cf0b25fe886ea0df8a0534f27 Mon Sep 17 00:00:00 2001 From: Max Stanley Date: Tue, 21 Nov 2023 21:59:03 +0000 Subject: [PATCH 06/22] Improved docker CI --- .dockerignore | 4 ++ .github/workflows/docker-publish.yml | 94 ++++++++++++++-------------- 2 files changed, 52 insertions(+), 46 deletions(-) diff --git a/.dockerignore b/.dockerignore index 7624b2ae..dd59c3f5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,6 +4,10 @@ **/dist **/docs +**/.github +**/.husky +**/.vscode + Dockerfile .dockerignore docker-compose.yml \ No newline at end of file diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index d57fc48a..1a086f1a 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -17,53 +17,55 @@ on: - develop env: - IMAGE_NAME: mermaid-live-editor + IMAGE_BASE: ghcr.io/${{ github.repository }} jobs: - test: + docker: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Run tests - run: | - docker build . --file Dockerfile - - push: - # Ensure test job passes before pushing image. - needs: test - - runs-on: ubuntu-latest - if: github.event_name == 'push' - - steps: - - uses: actions/checkout@v3 - - - name: Build image - run: docker build . --file Dockerfile --tag $IMAGE_NAME - - - name: Log into registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME - - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - - # Strip git ref prefix from version - VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') - - # Strip "v" prefix from tag name - [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') - - # Use Docker `latest` tag convention - [ "$VERSION" == "master" ] && VERSION=latest - - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - - docker tag $IMAGE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 + - name: Login to GitHub Container Registry + if: github.event_name != 'pull_request' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - uses: docker/metadata-action@v5 + if: github.ref_type == 'tag' + id: meta + with: + images: ${IMAGE_BASE} + # this will generate tags in the following format: + # latest + # 1.2.3 + tags: | + type=raw,value=latest + type=semver,pattern={{version}} + - uses: docker/build-push-action@v5 + if: github.ref_type == 'tag' + with: + context: . + target: mermaid + push: ${{ github.event_name != 'pull_request' }} + pull: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + - uses: docker/metadata-action@v5 + if: github.ref_type == 'branch' + id: meta-nightly + with: + images: ${IMAGE_BASE} + tags: | + type=raw,value=nightly + - uses: docker/build-push-action@v5 + if: github.ref_type == 'branch' + with: + context: . + target: mermaid + push: ${{ github.event_name != 'pull_request' }} + pull: true + tags: ${{ steps.meta-nightly.outputs.tags }} + labels: ${{ steps.meta-nightly.outputs.labels }} From 2d7f91ab2602d0f6e0041e0a06279cdf22ea5154 Mon Sep 17 00:00:00 2001 From: Max Stanley Date: Tue, 21 Nov 2023 22:01:13 +0000 Subject: [PATCH 07/22] Add new-line --- .github/workflows/docker-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 1a086f1a..4074fcd1 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -39,6 +39,7 @@ jobs: with: images: ${IMAGE_BASE} # this will generate tags in the following format: + # # latest # 1.2.3 tags: | From 6d983158b652b85629ff923714477b1d5a7d598e Mon Sep 17 00:00:00 2001 From: Max Stanley Date: Tue, 21 Nov 2023 22:03:11 +0000 Subject: [PATCH 08/22] Fix env --- .github/workflows/docker-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 4074fcd1..8b5fe4ba 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -37,7 +37,7 @@ jobs: if: github.ref_type == 'tag' id: meta with: - images: ${IMAGE_BASE} + images: $IMAGE_BASE # this will generate tags in the following format: # # latest @@ -58,7 +58,7 @@ jobs: if: github.ref_type == 'branch' id: meta-nightly with: - images: ${IMAGE_BASE} + images: $IMAGE_BASE tags: | type=raw,value=nightly - uses: docker/build-push-action@v5 From f6a729f871fa9328e7b309c5f37e94489c6ce575 Mon Sep 17 00:00:00 2001 From: Max Stanley Date: Tue, 21 Nov 2023 22:06:16 +0000 Subject: [PATCH 09/22] Remove env --- .github/workflows/docker-publish.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 8b5fe4ba..74772f49 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -16,9 +16,6 @@ on: - master - develop -env: - IMAGE_BASE: ghcr.io/${{ github.repository }} - jobs: docker: runs-on: ubuntu-latest @@ -37,7 +34,7 @@ jobs: if: github.ref_type == 'tag' id: meta with: - images: $IMAGE_BASE + images: ghcr.io/${{ github.repository }} # this will generate tags in the following format: # # latest @@ -58,7 +55,7 @@ jobs: if: github.ref_type == 'branch' id: meta-nightly with: - images: $IMAGE_BASE + images: ghcr.io/${{ github.repository }} tags: | type=raw,value=nightly - uses: docker/build-push-action@v5 From d2d082ec0845d87435eb38e68fcb59a571f6d6a8 Mon Sep 17 00:00:00 2001 From: Max Stanley Date: Tue, 21 Nov 2023 22:08:25 +0000 Subject: [PATCH 10/22] Always push tag event --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 74772f49..1492b3d7 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -47,7 +47,7 @@ jobs: with: context: . target: mermaid - push: ${{ github.event_name != 'pull_request' }} + push: true pull: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 9ba2598b00e191d36c8e863d404cb942b4fc3bdc Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Tue, 28 Nov 2023 14:25:14 +0530 Subject: [PATCH 11/22] feat: Add Holiday2023 banner --- src/lib/components/Navbar.svelte | 21 ++++++++++-- src/lib/util/promos/Holiday2023.svelte | 7 ++++ src/lib/util/promos/promo.ts | 47 ++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 src/lib/util/promos/Holiday2023.svelte create mode 100644 src/lib/util/promos/promo.ts diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte index 51da006b..6bd90f1c 100644 --- a/src/lib/components/Navbar.svelte +++ b/src/lib/components/Navbar.svelte @@ -8,6 +8,7 @@ +{#if activePromotion} +
+ + +
+{/if} +
@@ -93,7 +111,7 @@ id="menu-toggle" bind:checked={isMenuOpen} on:click={toggleMenu} /> - +
-