Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/DenverCoder1/custom-icon-ba…
Browse files Browse the repository at this point in the history 
…dges
  • Loading branch information
@DenverCoder1
DenverCoder1 committed Jun 26, 2023
2 parents df676e7 + a51071a commit 0568cd3
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
10 changes: 5 additions & 5 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.5.2",
"@types/node": "^20.3.0",
"@types/react": "^18.2.11",
"@types/react-dom": "^18.2.4",
"@types/node": "^20.3.1",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"bootstrap": "^5.3.0",
"react": "^18.2.0",
"react-bootstrap": "^2.7.4",
Expand All @@ -20,15 +20,15 @@
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.5",
"eslint": "^8.42.0",
"eslint": "^8.43.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"react-test-renderer": "^18.2.0",
"sass": "^1.63.3"
"sass": "^1.63.6"
},
"scripts": {
"start": "react-scripts start",
Expand Down
38 changes: 19 additions & 19 deletions client/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,9 +1034,9 @@
minimatch "^3.1.2"
strip-json-comments "^3.1.1"

"@eslint/js@8.42.0":
version "8.42.0"
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz#484a1d638de2911e6f5a30c12f49c7e4a3270fb6"
"@eslint/js@8.43.0":
version "8.43.0"
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0"

"@humanwhocodes/config-array@^0.11.10":
version "0.11.10"
Expand Down Expand Up @@ -1762,9 +1762,9 @@
version "1.3.2"
resolved "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"

"@types/node@*", "@types/node@^20.3.0":
version "20.3.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.0.tgz#719498898d5defab83c3560f45d8498f58d11938"
"@types/node@*", "@types/node@^20.3.1":
version "20.3.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe"

"@types/parse-json@^4.0.0":
version "4.0.0"
Expand All @@ -1790,9 +1790,9 @@
version "1.2.4"
resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"

"@types/react-dom@^18.0.0", "@types/react-dom@^18.2.4":
version "18.2.4"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.4.tgz#13f25bfbf4e404d26f62ac6e406591451acba9e0"
"@types/react-dom@^18.0.0", "@types/react-dom@^18.2.6":
version "18.2.6"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.6.tgz#ad621fa71a8db29af7c31b41b2ea3d8a6f4144d1"
dependencies:
"@types/react" "*"

Expand All @@ -1802,9 +1802,9 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@>=16.9.11", "@types/react@^18.2.11":
version "18.2.11"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.11.tgz#168f7dbb421ed214fcf8c5fe8e587765a3e02fd1"
"@types/react@*", "@types/react@>=16.9.11", "@types/react@^18.2.14":
version "18.2.14"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.14.tgz#fa7a6fecf1ce35ca94e74874f70c56ce88f7a127"
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down Expand Up @@ -3667,14 +3667,14 @@ eslint-webpack-plugin@^3.1.1:
normalize-path "^3.0.0"
schema-utils "^3.1.1"

eslint@^8.3.0, eslint@^8.42.0:
version "8.42.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.42.0.tgz#7bebdc3a55f9ed7167251fe7259f75219cade291"
eslint@^8.3.0, eslint@^8.43.0:
version "8.43.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.43.0.tgz#3e8c6066a57097adfd9d390b8fc93075f257a094"
dependencies:
"@eslint-community/eslint-utils" "^4.2.0"
"@eslint-community/regexpp" "^4.4.0"
"@eslint/eslintrc" "^2.0.3"
"@eslint/js" "8.42.0"
"@eslint/js" "8.43.0"
"@humanwhocodes/config-array" "^0.11.10"
"@humanwhocodes/module-importer" "^1.0.1"
"@nodelib/fs.walk" "^1.2.8"
Expand Down Expand Up @@ -6923,9 +6923,9 @@ sass-loader@^12.3.0:
klona "^2.0.4"
neo-async "^2.6.2"

sass@^1.63.3:
version "1.63.3"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.3.tgz#527746aa43bf2e4eac1ab424f67f6f18a081061a"
sass@^1.63.6:
version "1.63.6"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.6.tgz#481610e612902e0c31c46b46cf2dad66943283ea"
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"body-parser": "^1.20.2",
"concurrently": "^8.2.0",
"cors": "^2.8.5",
"dotenv": "^16.2.0",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"express-rate-limit": "^6.7.0",
"monk": "^7.3.4",
Expand All @@ -20,7 +20,7 @@
},
"devDependencies": {
"@babel/core": "^7.22.5",
"@babel/eslint-parser": "^7.21.8",
"@babel/eslint-parser": "^7.22.5",
"@types/express": "^4.17.17",
"@types/primer__octicons": "^17.11.0",
"@typescript-eslint/eslint-plugin": "^4.33.0",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
json5 "^2.2.2"
semver "^6.3.0"

"@babel/eslint-parser@^7.21.8":
version "7.21.8"
resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.21.8.tgz#59fb6fc4f3b017ab86987c076226ceef7b2b2ef2"
integrity sha512-HLhI+2q+BP3sf78mFUZNCGc10KEmoUqtUT1OCdMZsN+qr4qFeLUod62/zAnF3jNQstwyasDkZnVXwfK2Bml7MQ==
"@babel/eslint-parser@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz#fa032503b9e2d188e25b1b95d29e8b8431042d78"
integrity sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==
dependencies:
"@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
eslint-visitor-keys "^2.1.0"
Expand Down Expand Up @@ -932,10 +932,10 @@ doctrine@^3.0.0:
dependencies:
esutils "^2.0.2"

dotenv@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.2.0.tgz#d0c7110551d39c407f407d1afdce49c501c8e320"
integrity sha512-jcq2vR1DY1+QA+vH58RIrWLDZOifTGmyQJWzP9arDUbgZcySdzuBb1WvhWZzZtiXgfm+GW2pjBqStqlfpzq7wQ==
dotenv@^16.3.1:
version "16.3.1"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==

[email protected]:
version "1.1.1"
Expand Down

0 comments on commit 0568cd3

Please sign in to comment.