Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
VampireChicken12 authored Jan 22, 2024
2 parents 0217b6e + 7141df0 commit 3999fe9
Show file tree
Hide file tree
Showing 3 changed files with 179 additions and 45 deletions.
145 changes: 122 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@thedutchcoder/postcss-rem-to-px": "^0.0.2",
"@total-typescript/ts-reset": "^0.5.1",
"@types/archiver": "^6.0.1",
"@types/chrome": "^0.0.254",
"@types/chrome": "^0.0.258",
"@types/node": "^20.9.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
Expand Down
77 changes: 56 additions & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -961,10 +961,10 @@
dependencies:
"@types/readdir-glob" "*"

"@types/chrome@^0.0.254":
version "0.0.254"
resolved "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.254.tgz"
integrity sha512-svkOGKwA+6ZZuk9xtrYun8MYpNY/9hD17rgZ19v3KunhsK1ZOKaMESw12/1AXLh1u3UPA8jQIRi2370DXv9wgw==
"@types/chrome@^0.0.258":
version "0.0.258"
resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.258.tgz#81dc7dab909786eb7ffca74b6c80a9ecb5549a68"
integrity sha512-vicJi6cg2zaFuLmLY7laG6PHBknjKFusPYlaKQ9Zlycskofy71rStlGvW07MUuqUIVorZf8k5KH+zeTTGcH2dQ==
dependencies:
"@types/filesystem" "*"
"@types/har-format" "*"
Expand Down Expand Up @@ -1079,14 +1079,14 @@
ts-api-utils "^1.0.1"

"@typescript-eslint/parser@^6.10.0":
version "6.18.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.18.1.tgz#3c3987e186b38c77b30b6bfa5edf7c98ae2ec9d3"
integrity sha512-zct/MdJnVaRRNy9e84XnVtRv9Vf91/qqe+hZJtKanjojud4wAVy/7lXxJmMyX6X6J+xc6c//YEWvpeif8cAhWA==
dependencies:
"@typescript-eslint/scope-manager" "6.18.1"
"@typescript-eslint/types" "6.18.1"
"@typescript-eslint/typescript-estree" "6.18.1"
"@typescript-eslint/visitor-keys" "6.18.1"
version "6.19.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.19.0.tgz#80344086f362181890ade7e94fc35fe0480bfdf5"
integrity sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow==
dependencies:
"@typescript-eslint/scope-manager" "6.19.0"
"@typescript-eslint/types" "6.19.0"
"@typescript-eslint/typescript-estree" "6.19.0"
"@typescript-eslint/visitor-keys" "6.19.0"
debug "^4.3.4"

"@typescript-eslint/scope-manager@6.18.1":
Expand All @@ -1097,6 +1097,14 @@
"@typescript-eslint/types" "6.18.1"
"@typescript-eslint/visitor-keys" "6.18.1"

"@typescript-eslint/scope-manager@6.19.0":
version "6.19.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz#b6d2abb825b29ab70cb542d220e40c61c1678116"
integrity sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==
dependencies:
"@typescript-eslint/types" "6.19.0"
"@typescript-eslint/visitor-keys" "6.19.0"

"@typescript-eslint/type-utils@6.18.1":
version "6.18.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.18.1.tgz#115cf535f8b39db8301677199ce51151e2daee96"
Expand All @@ -1112,6 +1120,11 @@
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.1.tgz#91617d8080bcd99ac355d9157079970d1d49fefc"
integrity sha512-4TuMAe+tc5oA7wwfqMtB0Y5OrREPF1GeJBAjqwgZh1lEMH5PJQgWgHGfYufVB51LtjD+peZylmeyxUXPfENLCw==

"@typescript-eslint/types@6.19.0":
version "6.19.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.0.tgz#689b0498c436272a6a2059b09f44bcbd90de294a"
integrity sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==

"@typescript-eslint/typescript-estree@6.18.1":
version "6.18.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.1.tgz#a12b6440175b4cbc9d09ab3c4966c6b245215ab4"
Expand All @@ -1126,6 +1139,20 @@
semver "^7.5.4"
ts-api-utils "^1.0.1"

"@typescript-eslint/typescript-estree@6.19.0":
version "6.19.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz#0813ba364a409afb4d62348aec0202600cb468fa"
integrity sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==
dependencies:
"@typescript-eslint/types" "6.19.0"
"@typescript-eslint/visitor-keys" "6.19.0"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
minimatch "9.0.3"
semver "^7.5.4"
ts-api-utils "^1.0.1"

"@typescript-eslint/utils@6.18.1", "@typescript-eslint/utils@^6.13.0":
version "6.18.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.18.1.tgz#3451cfe2e56babb6ac657e10b6703393d4b82955"
Expand All @@ -1147,6 +1174,14 @@
"@typescript-eslint/types" "6.18.1"
eslint-visitor-keys "^3.4.1"

"@typescript-eslint/visitor-keys@6.19.0":
version "6.19.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz#4565e0ecd63ca1f81b96f1dd76e49f746c6b2b49"
integrity sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==
dependencies:
"@typescript-eslint/types" "6.19.0"
eslint-visitor-keys "^3.4.1"

"@ungap/structured-clone@^1.2.0":
version "1.2.0"
resolved "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz"
Expand Down Expand Up @@ -2071,9 +2106,9 @@ dot-prop@^5.1.0:
is-obj "^2.0.0"

dotenv@^16.3.1:
version "16.3.1"
resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz"
integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
version "16.3.2"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.2.tgz#3cb611ce5a63002dbabf7c281bc331f69d28f03f"
integrity sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==

duplexer2@~0.1.0:
version "0.1.4"
Expand Down Expand Up @@ -4103,9 +4138,9 @@ node-releases@^2.0.13:
integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==

nodemon@^3.0.1:
version "3.0.2"
resolved "https://registry.npmjs.org/nodemon/-/nodemon-3.0.2.tgz"
integrity sha512-9qIN2LNTrEzpOPBaWHTm4Asy1LxXLSickZStAQ4IZe7zsoIpD/A7LWxhZV3t4Zu352uBcqVnRsDXSMR2Sc3lTA==
version "3.0.3"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.0.3.tgz#244a62d1c690eece3f6165c6cdb0db03ebd80b76"
integrity sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==
dependencies:
chokidar "^3.5.2"
debug "^4"
Expand Down Expand Up @@ -5574,9 +5609,9 @@ tailwind-merge@^2.0.0:
"@babel/runtime" "^7.23.5"

tailwindcss@^3.3.5:
version "3.4.0"
resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.0.tgz"
integrity sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA==
version "3.4.1"
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.1.tgz#f512ca5d1dd4c9503c7d3d28a968f1ad8f5c839d"
integrity sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==
dependencies:
"@alloc/quick-lru" "^5.2.0"
arg "^5.0.2"
Expand Down

0 comments on commit 3999fe9

Please sign in to comment.