diff --git a/.github/workflows/lesson-3.yaml b/.github/workflows/lesson-3.yaml
index 0cb063f4d..bde99218b 100644
--- a/.github/workflows/lesson-3.yaml
+++ b/.github/workflows/lesson-3.yaml
@@ -4,19 +4,25 @@ on:
push:
branches:
- lesson-3-complete
+
jobs:
function_test:
runs-on: ubuntu-latest
- defaults:
- run:
- working-directory: frontend
steps:
- uses: actions/checkout@v4
- - run: npm install
- - name: Run functional tests
- run: npm test -- --coverage --watchAll=false
+ - name: Set up Node.js
+ uses: actions/setup-node@v3
+ with:
+ node-version: '18'
+ - name: Install dependencies
+ run: npm install
+ working-directory: frontend
+ - name: Run tests
+ run: npm test
+ working-directory: frontend
+
deploy:
- needs: [function_test]
+ needs: function_test
runs-on: ubuntu-latest
defaults:
run:
@@ -27,4 +33,4 @@ jobs:
- name: Generate deployment package
run: zip -r deploy.zip build Dockerfile
- name: '**PLACEHOLDER** Deploy to Elastic Beanstalk'
- run: echo Placeholder for Deployment
+ run: echo Placeholder for Deployment
\ No newline at end of file
diff --git a/.github/workflows/lesson-5-backend.yaml b/.github/workflows/lesson-5-backend.yaml
index 226e52b18..ab959171e 100644
--- a/.github/workflows/lesson-5-backend.yaml
+++ b/.github/workflows/lesson-5-backend.yaml
@@ -4,8 +4,24 @@ on:
push:
branches:
- lesson-5
+
jobs:
+ security_test:
+ runs-on: ubuntu-latest
+ defaults:
+ run:
+ working-directory: backend
+ name: Execute the PyCharm security test
+ steps:
+ - uses: actions/checkout@v4
+ - name: disable debug
+ run: |
+ sed -i 's/DEBUG = True/DEBUG = False/g' hangry_api/hangry_api/settings.py
+ - name: Run PyCharm Security
+ uses: tonybaloney/pycharm-security@1.9.0
+
build_and_test:
+ needs: security_test
runs-on: ubuntu-latest
defaults:
run:
@@ -24,15 +40,19 @@ jobs:
run: |
coverage run -m --source=./hangry_api pytest
coverage report
+
deploy:
- needs: [build_and_test]
+ needs: build_and_test
runs-on: ubuntu-latest
defaults:
run:
working-directory: backend
steps:
- uses: actions/checkout@v4
+ - name: Disable Debug
+ run: |
+ sed -i 's/DEBUG = True/DEBUG = False/g' hangry_api/hangry_api/settings.py
- name: Generate deployment package
run: zip -r deploy.zip . -x '*.git*'
- name: '**PLACEHOLDER** Deploy to Elastic Beanstalk'
- run: echo Placeholder for Deployment
+ run: echo Placeholder for Deployment
\ No newline at end of file
diff --git a/.github/workflows/lesson-5-frontend.yaml b/.github/workflows/lesson-5-frontend.yaml
index 2b85c3681..48ff5b84b 100644
--- a/.github/workflows/lesson-5-frontend.yaml
+++ b/.github/workflows/lesson-5-frontend.yaml
@@ -3,7 +3,7 @@ name: Lesson 5 DAST
on:
push:
branches:
- - lesson-5
+ - lesson-5-complete
jobs:
function_test:
runs-on: ubuntu-latest
@@ -28,3 +28,11 @@ jobs:
run: zip -r deploy.zip build Dockerfile
- name: '**PLACEHOLDER** Deploy to Elastic Beanstalk'
run: echo Placeholder for Deployment
+ security_test:
+ needs: [deploy]
+ runs-on: ubuntu-latest
+ steps:
+ - name: Dynamic Application Security Scan
+ uses: zaproxy/action-baseline@v0.7.0
+ with:
+ target: 'http://hangry-web-dev.us-east-1.elasticbeanstalk.com/'
\ No newline at end of file
diff --git a/.github/workflows/lesson-6.yaml b/.github/workflows/lesson-6.yaml
index 8c6b04991..0291a7639 100644
--- a/.github/workflows/lesson-6.yaml
+++ b/.github/workflows/lesson-6.yaml
@@ -4,6 +4,7 @@ on:
push:
branches:
- lesson-6
+
jobs:
function_test:
runs-on: ubuntu-latest
@@ -15,6 +16,7 @@ jobs:
- run: npm install
- name: Run functional tests
run: npm test -- --coverage --watchAll=false
+
deploy:
needs: [function_test]
runs-on: ubuntu-latest
@@ -28,6 +30,7 @@ jobs:
run: zip -r deploy.zip build Dockerfile
- name: '**PLACEHOLDER** Deploy to Elastic Beanstalk'
run: echo Placeholder for Deployment
+
security_test:
needs: [deploy]
runs-on: ubuntu-latest
@@ -35,4 +38,4 @@ jobs:
- name: Dynamic Application Security Scan
uses: zaproxy/action-baseline@v0.7.0
with:
- target: 'http://hangryhippo.quantic.host/'
+ target: 'https://hangryhippo.quantic.host/'
\ No newline at end of file
diff --git a/README.md b/README.md
index 83d780982..54696de24 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ The front end was originally created using [Create React App](https://create-rea
3. As a result, you should see something like
- ================= test session starts ===================
+ test session starts
platform linux -- Python 3.8.13, pytest-7.1.2, pluggy-1.0.0
rootdir: ./quantic-test-course/backend/hangry_api
collected 5 items
@@ -148,7 +148,7 @@ The front end was originally created using [Create React App](https://create-rea
tests/test_DeliveryCost.py ... [ 50%]
tests/test_SubtotalCost.py .. [ 83%]
tests/test_Tax.py ........... [100%]
- ================= 5 passed in 0.16s =====================
+ 5 passed in 0.16s
4. [Optional] Generate a coverage report (note that you must have run the unit tests at least once for this to work):
@@ -203,7 +203,11 @@ The front end was originally created using [Create React App](https://create-rea
5. [Optional] To use the local back-end APIs, make sure both servers (front-end and back-end) are running. Then, update ./frontend/src/utils/constants.js by replacing this line:
+ HEAD
+ export const API_URL = 'https://hangryhippo-api.quantic.host';
+
export const API_URL = 'http://hangryhippo-api.quantic.host';
+ origin/main
with this line:
@@ -233,7 +237,6 @@ The front end was originally created using [Create React App](https://create-rea
2. Verify that the tests were run. You should see something like
- ==============================================
(Run Starting)
┌─────────────────────────────────────────────┐
│ Cypress: 10.3.0 │
@@ -279,7 +282,7 @@ The front end was originally created using [Create React App](https://create-rea
- Finished processing: /quantic-test-course/frontend/cypress/videos/spec.cy.js.mp4 (2 seconds)
- ===============================================
+
(Run Finished)
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f1a10bc82..a72476436 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -64,6 +64,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz",
"integrity": "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==",
+ "peer": true,
"dependencies": {
"@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.18.6",
@@ -951,6 +952,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz",
"integrity": "sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==",
+ "peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.18.6"
},
@@ -1513,6 +1515,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.6.tgz",
"integrity": "sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==",
+ "peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.18.6",
"@babel/helper-module-imports": "^7.18.6",
@@ -2360,8 +2363,12 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
"integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/@humanwhocodes/config-array": {
"version": "0.9.5",
@@ -3421,7 +3428,10 @@
"resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
"integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"@gar/promisify": "^1.0.1",
"semver": "^7.3.5"
@@ -3432,7 +3442,10 @@
"resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
"integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"mkdirp": "^1.0.4",
"rimraf": "^3.0.2"
@@ -3446,7 +3459,10 @@
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"bin": {
"mkdirp": "bin/cmd.js"
},
@@ -4140,6 +4156,7 @@
"version": "8.14.1",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.14.1.tgz",
"integrity": "sha512-S+E5jTThFnTga+LrX9Oj29Uz0wyLcu0/fD6i9+BUaoJpYtcW9QZ5rJ9SPq4CkKXGhz3Vz9w8poBkngq6Xg7NLQ==",
+ "peer": true,
"dependencies": {
"@babel/code-frame": "^7.10.4",
"@babel/runtime": "^7.12.5",
@@ -4462,8 +4479,12 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
"integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/@types/node": {
"version": "18.0.3",
@@ -4474,8 +4495,12 @@
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/@types/parse-json": {
"version": "4.0.0",
@@ -4635,6 +4660,7 @@
"version": "5.30.5",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.5.tgz",
"integrity": "sha512-lftkqRoBvc28VFXEoRgyZuztyVUQ04JvUnATSPtIRFAccbXTWL6DEtXGYMcbg998kXw1NLUJm7rTQ9eUt+q6Ig==",
+ "peer": true,
"dependencies": {
"@typescript-eslint/scope-manager": "5.30.5",
"@typescript-eslint/type-utils": "5.30.5",
@@ -4685,6 +4711,7 @@
"version": "5.30.5",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.5.tgz",
"integrity": "sha512-zj251pcPXI8GO9NDKWWmygP6+UjwWmrdf9qMW/L/uQJBM/0XbU2inxe5io/234y/RCvwpKEYjZ6c1YrXERkK4Q==",
+ "peer": true,
"dependencies": {
"@typescript-eslint/scope-manager": "5.30.5",
"@typescript-eslint/types": "5.30.5",
@@ -5000,8 +5027,12 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/accepts": {
"version": "1.3.8",
@@ -5019,6 +5050,7 @@
"version": "8.7.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
"integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+ "peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -5127,7 +5159,10 @@
"resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
"integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"debug": "^4.1.0",
"depd": "^1.1.2",
@@ -5142,7 +5177,10 @@
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">= 0.6"
}
@@ -5163,6 +5201,7 @@
"version": "6.12.6",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -5308,8 +5347,12 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
"integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/arch": {
"version": "2.2.0",
@@ -5335,7 +5378,10 @@
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
"integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"delegates": "^1.0.0",
"readable-stream": "^3.6.0"
@@ -5349,7 +5395,10 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
@@ -5487,7 +5536,10 @@
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
"integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=0.10.0"
}
@@ -5536,7 +5588,10 @@
"resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
"integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": "*"
}
@@ -6101,6 +6156,7 @@
"url": "https://tidelift.com/funding/github/npm/browserslist"
}
],
+ "peer": true,
"dependencies": {
"caniuse-lite": "^1.0.30001359",
"electron-to-chromium": "^1.4.172",
@@ -6182,7 +6238,10 @@
"resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
"integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"@npmcli/fs": "^1.0.0",
"@npmcli/move-file": "^1.0.1",
@@ -6212,7 +6271,10 @@
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"bin": {
"mkdirp": "bin/cmd.js"
},
@@ -6278,7 +6340,10 @@
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"camelcase": "^5.3.1",
"map-obj": "^4.0.0",
@@ -6603,7 +6668,10 @@
"resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
"integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=10"
}
@@ -6939,7 +7007,10 @@
"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"bin": {
"color-support": "bin.js"
}
@@ -7054,8 +7125,12 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/content-disposition": {
"version": "0.5.4",
@@ -7320,6 +7395,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -7784,7 +7860,10 @@
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=0.10.0"
}
@@ -7794,7 +7873,10 @@
"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
"integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"decamelize": "^1.1.0",
"map-obj": "^1.0.0"
@@ -7808,7 +7890,10 @@
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
"integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=0.10.0"
}
@@ -7904,8 +7989,12 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/depd": {
"version": "2.0.0",
@@ -8266,6 +8355,7 @@
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+ "peer": true,
"dependencies": {
"ansi-colors": "^4.1.1"
},
@@ -8286,7 +8376,10 @@
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
"integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=6"
}
@@ -8341,8 +8434,12 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
"integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/error-ex": {
"version": "1.3.2",
@@ -8526,6 +8623,7 @@
"version": "8.19.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz",
"integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==",
+ "peer": true,
"dependencies": {
"@eslint/eslintrc": "^1.3.0",
"@humanwhocodes/config-array": "^0.9.2",
@@ -8994,6 +9092,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -9878,7 +9977,10 @@
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
"integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"minipass": "^3.0.0"
},
@@ -9949,7 +10051,10 @@
"resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
"integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"aproba": "^1.0.3 || ^2.0.0",
"color-support": "^1.1.2",
@@ -9970,7 +10075,10 @@
"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"globule": "^1.0.0"
},
@@ -10025,7 +10133,10 @@
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
"integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=0.10.0"
}
@@ -10196,7 +10307,10 @@
"resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz",
"integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"glob": "~7.1.1",
"lodash": "^4.17.21",
@@ -10211,7 +10325,10 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -10232,7 +10349,10 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"brace-expansion": "^1.1.7"
},
@@ -10269,7 +10389,10 @@
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
"integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=4"
}
@@ -10280,7 +10403,10 @@
"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
"deprecated": "this library is no longer supported",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"ajv": "^6.12.3",
"har-schema": "^2.0.0"
@@ -10294,7 +10420,10 @@
"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=6"
}
@@ -10371,8 +10500,12 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/he": {
"version": "1.2.0",
@@ -10403,7 +10536,10 @@
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
"integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"lru-cache": "^6.0.0"
},
@@ -10520,8 +10656,12 @@
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
"integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/http-deceiver": {
"version": "1.2.7",
@@ -10613,7 +10753,10 @@
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"assert-plus": "^1.0.0",
"jsprim": "^1.2.2",
@@ -10649,7 +10792,10 @@
"resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
"integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"ms": "^2.0.0"
}
@@ -10729,9 +10875,15 @@
}
},
"node_modules/immutable": {
+<<<<<<< HEAD
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz",
+ "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==",
+=======
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
"integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==",
+>>>>>>> origin/main
"license": "MIT"
},
"node_modules/import-fresh": {
@@ -10795,8 +10947,12 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
"integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/inflight": {
"version": "1.0.6",
@@ -10834,8 +10990,12 @@
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
"integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/ipaddr.js": {
"version": "2.0.1",
@@ -11002,8 +11162,12 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
"integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/is-module": {
"version": "1.0.0",
@@ -11064,7 +11228,10 @@
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=0.10.0"
}
@@ -11304,6 +11471,7 @@
"version": "28.1.3",
"resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz",
"integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==",
+ "peer": true,
"dependencies": {
"@jest/core": "^28.1.3",
"@jest/types": "^28.1.3",
@@ -13692,8 +13860,12 @@
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
"integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/js-tokens": {
"version": "4.0.0",
@@ -13846,7 +14018,10 @@
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
"integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"assert-plus": "1.0.0",
"extsprintf": "1.3.0",
@@ -14195,7 +14370,10 @@
"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
"integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"agentkeepalive": "^4.1.3",
"cacache": "^15.2.0",
@@ -14231,7 +14409,10 @@
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=8"
},
@@ -14268,7 +14449,10 @@
"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"@types/minimist": "^1.2.0",
"camelcase-keys": "^6.2.2",
@@ -14397,6 +14581,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -14468,7 +14653,10 @@
"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"arrify": "^1.0.1",
"is-plain-obj": "^1.1.0",
@@ -14483,7 +14671,10 @@
"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
"integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"yallist": "^4.0.0"
},
@@ -14496,7 +14687,10 @@
"resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
"integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"minipass": "^3.0.0"
},
@@ -14509,7 +14703,10 @@
"resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
"integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"minipass": "^3.1.0",
"minipass-sized": "^1.0.3",
@@ -14527,7 +14724,10 @@
"resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
"integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"minipass": "^3.0.0"
},
@@ -14540,7 +14740,10 @@
"resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
"integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"minipass": "^3.0.0"
},
@@ -14553,7 +14756,10 @@
"resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
"integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"minipass": "^3.0.0"
},
@@ -14566,7 +14772,10 @@
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
"integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"minipass": "^3.0.0",
"yallist": "^4.0.0"
@@ -14613,8 +14822,12 @@
"version": "2.16.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
"integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/nanoid": {
"version": "3.3.4",
@@ -14707,7 +14920,10 @@
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
"integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"env-paths": "^2.2.0",
"glob": "^7.1.4",
@@ -14732,7 +14948,10 @@
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz",
"integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"delegates": "^1.0.0",
"readable-stream": "^3.6.0"
@@ -14746,7 +14965,10 @@
"resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
"integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"aproba": "^1.0.3 || ^2.0.0",
"color-support": "^1.1.3",
@@ -14766,7 +14988,10 @@
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
"integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"are-we-there-yet": "^3.0.0",
"console-control-strings": "^1.1.0",
@@ -14782,7 +15007,10 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
@@ -14802,6 +15030,8 @@
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
},
+<<<<<<< HEAD
+=======
"node_modules/node-sass": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.1.tgz",
@@ -14833,12 +15063,16 @@
"node": ">=12"
}
},
+>>>>>>> origin/main
"node_modules/nopt": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
"integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"abbrev": "1"
},
@@ -14854,7 +15088,10 @@
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"hosted-git-info": "^4.0.1",
"is-core-module": "^2.5.0",
@@ -14908,7 +15145,10 @@
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
"integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"are-we-there-yet": "^2.0.0",
"console-control-strings": "^1.1.0",
@@ -14937,7 +15177,10 @@
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": "*"
}
@@ -15574,6 +15817,7 @@
"url": "https://tidelift.com/funding/github/npm/postcss"
}
],
+ "peer": true,
"dependencies": {
"nanoid": "^3.3.4",
"picocolors": "^1.0.0",
@@ -16635,6 +16879,7 @@
"version": "6.0.10",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+ "peer": true,
"dependencies": {
"cssesc": "^3.0.0",
"util-deprecate": "^1.0.2"
@@ -16791,15 +17036,22 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
"integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/promise-retry": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
"integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"err-code": "^2.0.2",
"retry": "^0.12.0"
@@ -16813,7 +17065,10 @@
"resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
"integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">= 4"
}
@@ -16933,7 +17188,10 @@
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=8"
}
@@ -17045,6 +17303,7 @@
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
"integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+ "peer": true,
"dependencies": {
"loose-envify": "^1.1.0"
},
@@ -17114,6 +17373,7 @@
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
"integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+ "peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"scheduler": "^0.23.0"
@@ -17136,6 +17396,7 @@
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
"integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
+ "peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -17915,7 +18176,10 @@
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"@types/normalize-package-data": "^2.4.0",
"normalize-package-data": "^2.5.0",
@@ -17931,7 +18195,10 @@
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"find-up": "^4.1.0",
"read-pkg": "^5.2.0",
@@ -17949,7 +18216,10 @@
"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"locate-path": "^5.0.0",
"path-exists": "^4.0.0"
@@ -17963,7 +18233,10 @@
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"p-locate": "^4.1.0"
},
@@ -17976,7 +18249,10 @@
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"p-try": "^2.0.0"
},
@@ -17992,7 +18268,10 @@
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"p-limit": "^2.2.0"
},
@@ -18005,7 +18284,10 @@
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=8"
}
@@ -18014,15 +18296,22 @@
"version": "2.8.9",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/read-pkg/node_modules/normalize-package-data": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"hosted-git-info": "^2.1.4",
"resolve": "^1.10.0",
@@ -18035,7 +18324,10 @@
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"bin": {
"semver": "bin/semver"
}
@@ -18045,7 +18337,10 @@
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=8"
}
@@ -18257,7 +18552,10 @@
"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
"deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"aws-sign2": "~0.7.0",
"aws4": "^1.8.0",
@@ -18297,7 +18595,10 @@
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.6",
@@ -18312,7 +18613,10 @@
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"psl": "^1.1.28",
"punycode": "^2.1.1"
@@ -18494,6 +18798,7 @@
"version": "2.76.0",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.76.0.tgz",
"integrity": "sha512-9jwRIEY1jOzKLj3nsY/yot41r19ITdQrhs+q3ggNWhr9TQgduHqANvPpS32RNpzGklJu3G1AJfvlZLi/6wFgWA==",
+ "peer": true,
"bin": {
"rollup": "dist/bin/rollup"
},
@@ -18599,6 +18904,10 @@
"resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz",
"integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==",
"license": "MIT",
+<<<<<<< HEAD
+ "peer": true,
+=======
+>>>>>>> origin/main
"dependencies": {
"chokidar": "^4.0.0",
"immutable": "^5.0.2",
@@ -18619,7 +18928,10 @@
"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz",
"integrity": "sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"glob": "^7.0.0",
"lodash": "^4.17.11",
@@ -18744,7 +19056,10 @@
"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz",
"integrity": "sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"js-base64": "^2.4.3",
"source-map": "^0.7.1"
@@ -18755,7 +19070,10 @@
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">= 8"
}
@@ -19111,8 +19429,12 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/setprototypeof": {
"version": "1.2.0",
@@ -19192,7 +19514,10 @@
"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
"integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">= 6.0.0",
"npm": ">= 3.0.0"
@@ -19221,7 +19546,10 @@
"resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
"integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"ip": "^1.1.5",
"smart-buffer": "^4.2.0"
@@ -19236,7 +19564,10 @@
"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
"integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"agent-base": "^6.0.2",
"debug": "^4.3.3",
@@ -19317,7 +19648,10 @@
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0"
@@ -19327,15 +19661,22 @@
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/spdx-expression-parse": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"spdx-exceptions": "^2.1.0",
"spdx-license-ids": "^3.0.0"
@@ -19345,8 +19686,12 @@
"version": "3.0.11",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
"integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"node_modules/spdy": {
"version": "4.0.2",
@@ -19423,7 +19768,10 @@
"resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
"integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"minipass": "^3.1.1"
},
@@ -19474,7 +19822,10 @@
"resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
"integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"readable-stream": "^2.0.1"
}
@@ -19943,7 +20294,10 @@
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
"integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"chownr": "^2.0.0",
"fs-minipass": "^2.0.0",
@@ -19961,7 +20315,10 @@
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"bin": {
"mkdirp": "bin/cmd.js"
},
@@ -20193,7 +20550,10 @@
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"engines": {
"node": ">=8"
}
@@ -20203,7 +20563,10 @@
"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"glob": "^7.1.2"
}
@@ -20302,6 +20665,8 @@
"node": ">=4"
}
},
+<<<<<<< HEAD
+=======
"node_modules/type-fest": {
"version": "0.18.1",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
@@ -20315,6 +20680,7 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+>>>>>>> origin/main
"node_modules/type-is": {
"version": "1.6.18",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -20403,7 +20769,10 @@
"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"unique-slug": "^2.0.0"
}
@@ -20413,7 +20782,10 @@
"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
"integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"imurmurhash": "^0.1.4"
}
@@ -20547,7 +20919,10 @@
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
"deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"bin": {
"uuid": "bin/uuid"
}
@@ -20575,7 +20950,10 @@
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"spdx-correct": "^3.0.0",
"spdx-expression-parse": "^3.0.0"
@@ -20671,6 +21049,7 @@
"version": "5.73.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz",
"integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==",
+ "peer": true,
"dependencies": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51",
@@ -20739,6 +21118,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -20788,6 +21168,7 @@
"version": "4.9.3",
"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.3.tgz",
"integrity": "sha512-3qp/eoboZG5/6QgiZ3llN8TUzkSpYg1Ko9khWX1h40MIEUNS2mDoIa8aXsPfskER+GbTvs/IJZ1QTBBhhuetSw==",
+ "peer": true,
"dependencies": {
"@types/bonjour": "^3.5.9",
"@types/connect-history-api-fallback": "^1.3.5",
@@ -20842,6 +21223,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -21064,7 +21446,10 @@
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"dependencies": {
"string-width": "^1.0.2 || 2 || 3 || 4"
}
@@ -21172,6 +21557,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -21546,6 +21932,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz",
"integrity": "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==",
+ "peer": true,
"requires": {
"@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.18.6",
@@ -22161,6 +22548,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz",
"integrity": "sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==",
+ "peer": true,
"requires": {
"@babel/helper-plugin-utils": "^7.18.6"
}
@@ -22507,6 +22895,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.6.tgz",
"integrity": "sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==",
+ "peer": true,
"requires": {
"@babel/helper-annotate-as-pure": "^7.18.6",
"@babel/helper-module-imports": "^7.18.6",
@@ -23074,8 +23463,12 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
"integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"@humanwhocodes/config-array": {
"version": "0.9.5",
@@ -23929,7 +24322,10 @@
"resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
"integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"@gar/promisify": "^1.0.1",
"semver": "^7.3.5"
@@ -23940,7 +24336,10 @@
"resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
"integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"mkdirp": "^1.0.4",
"rimraf": "^3.0.2"
@@ -23950,8 +24349,12 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
}
}
},
@@ -24286,6 +24689,7 @@
"version": "8.14.1",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.14.1.tgz",
"integrity": "sha512-S+E5jTThFnTga+LrX9Oj29Uz0wyLcu0/fD6i9+BUaoJpYtcW9QZ5rJ9SPq4CkKXGhz3Vz9w8poBkngq6Xg7NLQ==",
+ "peer": true,
"requires": {
"@babel/code-frame": "^7.10.4",
"@babel/runtime": "^7.12.5",
@@ -24572,8 +24976,12 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
"integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"@types/node": {
"version": "18.0.3",
@@ -24584,8 +24992,12 @@
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"@types/parse-json": {
"version": "4.0.0",
@@ -24745,6 +25157,7 @@
"version": "5.30.5",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.5.tgz",
"integrity": "sha512-lftkqRoBvc28VFXEoRgyZuztyVUQ04JvUnATSPtIRFAccbXTWL6DEtXGYMcbg998kXw1NLUJm7rTQ9eUt+q6Ig==",
+ "peer": true,
"requires": {
"@typescript-eslint/scope-manager": "5.30.5",
"@typescript-eslint/type-utils": "5.30.5",
@@ -24769,6 +25182,7 @@
"version": "5.30.5",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.5.tgz",
"integrity": "sha512-zj251pcPXI8GO9NDKWWmygP6+UjwWmrdf9qMW/L/uQJBM/0XbU2inxe5io/234y/RCvwpKEYjZ6c1YrXERkK4Q==",
+ "peer": true,
"requires": {
"@typescript-eslint/scope-manager": "5.30.5",
"@typescript-eslint/types": "5.30.5",
@@ -25007,8 +25421,12 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"accepts": {
"version": "1.3.8",
@@ -25022,7 +25440,8 @@
"acorn": {
"version": "8.7.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
- "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+ "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+ "peer": true
},
"acorn-globals": {
"version": "6.0.0",
@@ -25101,7 +25520,10 @@
"resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
"integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"debug": "^4.1.0",
"depd": "^1.1.2",
@@ -25112,8 +25534,12 @@
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
}
}
},
@@ -25130,6 +25556,7 @@
"version": "6.12.6",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "peer": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -25228,8 +25655,12 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
"integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"arch": {
"version": "2.2.0",
@@ -25241,7 +25672,10 @@
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
"integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^3.6.0"
@@ -25252,7 +25686,10 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
@@ -25352,8 +25789,12 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
"integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"asap": {
"version": "2.0.6",
@@ -25389,11 +25830,17 @@
"integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
},
"async-foreach": {
+<<<<<<< HEAD
+ "version": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+ "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
+ "optional": true
+=======
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
"integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"asynckit": {
"version": "0.4.0",
@@ -25806,6 +26253,7 @@
"version": "4.21.1",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.1.tgz",
"integrity": "sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==",
+ "peer": true,
"requires": {
"caniuse-lite": "^1.0.30001359",
"electron-to-chromium": "^1.4.172",
@@ -25855,7 +26303,10 @@
"resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
"integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"@npmcli/fs": "^1.0.0",
"@npmcli/move-file": "^1.0.1",
@@ -25881,8 +26332,12 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
}
}
},
@@ -25929,7 +26384,10 @@
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"camelcase": "^5.3.1",
"map-obj": "^4.0.0",
@@ -26156,8 +26614,12 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
"integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"chrome-trace-event": {
"version": "1.0.3",
@@ -26406,8 +26868,12 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"colord": {
"version": "2.9.2",
@@ -26503,8 +26969,12 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"content-disposition": {
"version": "0.5.4",
@@ -26667,6 +27137,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -27009,15 +27480,22 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"decamelize-keys": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
"integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"decamelize": "^1.1.0",
"map-obj": "^1.0.0"
@@ -27027,8 +27505,12 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
"integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
}
}
},
@@ -27099,8 +27581,12 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"depd": {
"version": "2.0.0",
@@ -27375,6 +27861,7 @@
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+ "peer": true,
"requires": {
"ansi-colors": "^4.1.1"
}
@@ -27388,8 +27875,12 @@
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
"integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"enzyme": {
"version": "3.11.0",
@@ -27435,8 +27926,12 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
"integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"error-ex": {
"version": "1.3.2",
@@ -27580,6 +28075,7 @@
"version": "8.19.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz",
"integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==",
+ "peer": true,
"requires": {
"@eslint/eslintrc": "^1.3.0",
"@humanwhocodes/config-array": "^0.9.2",
@@ -27949,6 +28445,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -28572,7 +29069,10 @@
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
"integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"minipass": "^3.0.0"
}
@@ -28624,7 +29124,10 @@
"resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
"integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"aproba": "^1.0.3 || ^2.0.0",
"color-support": "^1.1.2",
@@ -28638,11 +29141,13 @@
}
},
"gaze": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+ "version": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"globule": "^1.0.0"
}
@@ -28678,11 +29183,17 @@
"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="
},
"get-stdin": {
+<<<<<<< HEAD
+ "version": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+ "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
+ "optional": true
+=======
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
"integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"get-stream": {
"version": "6.0.1",
@@ -28806,7 +29317,10 @@
"resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz",
"integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"glob": "~7.1.1",
"lodash": "^4.17.21",
@@ -28818,7 +29332,10 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -28833,7 +29350,10 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -28862,15 +29382,22 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
"integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"har-validator": {
"version": "5.1.5",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"ajv": "^6.12.3",
"har-schema": "^2.0.0"
@@ -28880,8 +29407,12 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"harmony-reflect": {
"version": "1.6.2",
@@ -28931,8 +29462,12 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"he": {
"version": "1.2.0",
@@ -28957,7 +29492,10 @@
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
"integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"lru-cache": "^6.0.0"
}
@@ -29042,8 +29580,12 @@
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
"integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"http-deceiver": {
"version": "1.2.7",
@@ -29111,7 +29653,10 @@
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"assert-plus": "^1.0.0",
"jsprim": "^1.2.2",
@@ -29137,7 +29682,10 @@
"resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
"integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"ms": "^2.0.0"
}
@@ -29185,9 +29733,15 @@
"integrity": "sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ=="
},
"immutable": {
+<<<<<<< HEAD
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz",
+ "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA=="
+=======
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
"integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg=="
+>>>>>>> origin/main
},
"import-fresh": {
"version": "3.3.0",
@@ -29228,8 +29782,12 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
"integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"inflight": {
"version": "1.0.6",
@@ -29264,8 +29822,12 @@
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
"integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"ipaddr.js": {
"version": "2.0.1",
@@ -29372,8 +29934,12 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
"integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"is-module": {
"version": "1.0.0",
@@ -29412,8 +29978,12 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"is-potential-custom-element-name": {
"version": "1.0.1",
@@ -29583,6 +30153,7 @@
"version": "28.1.3",
"resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz",
"integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==",
+ "peer": true,
"requires": {
"@jest/core": "^28.1.3",
"@jest/types": "^28.1.3",
@@ -31459,8 +32030,12 @@
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
"integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"js-tokens": {
"version": "4.0.0",
@@ -31581,7 +32156,10 @@
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
"integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"assert-plus": "1.0.0",
"extsprintf": "1.3.0",
@@ -31845,7 +32423,10 @@
"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
"integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"agentkeepalive": "^4.1.3",
"cacache": "^15.2.0",
@@ -31877,8 +32458,12 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"mdn-data": {
"version": "2.0.4",
@@ -31899,11 +32484,13 @@
}
},
"meow": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+ "version": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"@types/minimist": "^1.2.0",
"camelcase-keys": "^6.2.2",
@@ -31989,6 +32576,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -32045,7 +32633,10 @@
"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"arrify": "^1.0.1",
"is-plain-obj": "^1.1.0",
@@ -32057,7 +32648,10 @@
"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
"integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"yallist": "^4.0.0"
}
@@ -32067,7 +32661,10 @@
"resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
"integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"minipass": "^3.0.0"
}
@@ -32077,7 +32674,10 @@
"resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
"integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"encoding": "^0.1.12",
"minipass": "^3.1.0",
@@ -32090,7 +32690,10 @@
"resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
"integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"minipass": "^3.0.0"
}
@@ -32100,7 +32703,10 @@
"resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
"integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"minipass": "^3.0.0"
}
@@ -32110,7 +32716,10 @@
"resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
"integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"minipass": "^3.0.0"
}
@@ -32120,7 +32729,10 @@
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
"integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"minipass": "^3.0.0",
"yallist": "^4.0.0"
@@ -32155,11 +32767,17 @@
}
},
"nan": {
+<<<<<<< HEAD
+ "version": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
+ "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
+ "optional": true
+=======
"version": "2.16.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
"integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"nanoid": {
"version": "3.3.4",
@@ -32227,11 +32845,13 @@
"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
},
"node-gyp": {
- "version": "8.4.1",
- "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
+ "version": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
"integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"env-paths": "^2.2.0",
"glob": "^7.1.4",
@@ -32250,7 +32870,10 @@
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz",
"integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^3.6.0"
@@ -32261,7 +32884,10 @@
"resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
"integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"aproba": "^1.0.3 || ^2.0.0",
"color-support": "^1.1.3",
@@ -32278,7 +32904,10 @@
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
"integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"are-we-there-yet": "^3.0.0",
"console-control-strings": "^1.1.0",
@@ -32291,7 +32920,10 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
@@ -32310,6 +32942,8 @@
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
},
+<<<<<<< HEAD
+=======
"node-sass": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.1.tgz",
@@ -32334,12 +32968,16 @@
"true-case-path": "^1.0.2"
}
},
+>>>>>>> origin/main
"nopt": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
"integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"abbrev": "1"
}
@@ -32349,7 +32987,10 @@
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"hosted-git-info": "^4.0.1",
"is-core-module": "^2.5.0",
@@ -32381,11 +33022,13 @@
}
},
"npmlog": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+ "version": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
"integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"are-we-there-yet": "^2.0.0",
"console-control-strings": "^1.1.0",
@@ -32410,8 +33053,12 @@
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"object-assign": {
"version": "4.1.1",
@@ -32852,6 +33499,7 @@
"version": "8.4.14",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
"integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+ "peer": true,
"requires": {
"nanoid": "^3.3.4",
"picocolors": "^1.0.0",
@@ -33439,6 +34087,7 @@
"version": "6.0.10",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+ "peer": true,
"requires": {
"cssesc": "^3.0.0",
"util-deprecate": "^1.0.2"
@@ -33554,15 +34203,22 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
"integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"promise-retry": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
"integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"err-code": "^2.0.2",
"retry": "^0.12.0"
@@ -33572,8 +34228,12 @@
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
"integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
}
}
},
@@ -33662,8 +34322,12 @@
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"raf": {
"version": "3.4.1",
@@ -33755,6 +34419,7 @@
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
"integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+ "peer": true,
"requires": {
"loose-envify": "^1.1.0"
}
@@ -33814,6 +34479,7 @@
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
"integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+ "peer": true,
"requires": {
"loose-envify": "^1.1.0",
"scheduler": "^0.23.0"
@@ -33832,7 +34498,8 @@
"react-refresh": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
- "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="
+ "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
+ "peer": true
},
"react-router": {
"version": "6.3.0",
@@ -34432,7 +35099,10 @@
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"@types/normalize-package-data": "^2.4.0",
"normalize-package-data": "^2.5.0",
@@ -34444,15 +35114,22 @@
"version": "2.8.9",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"normalize-package-data": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"hosted-git-info": "^2.1.4",
"resolve": "^1.10.0",
@@ -34464,15 +35141,23 @@
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"type-fest": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
}
}
},
@@ -34481,7 +35166,10 @@
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"find-up": "^4.1.0",
"read-pkg": "^5.2.0",
@@ -34493,7 +35181,10 @@
"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"locate-path": "^5.0.0",
"path-exists": "^4.0.0"
@@ -34504,7 +35195,10 @@
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"p-locate": "^4.1.0"
}
@@ -34514,7 +35208,10 @@
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"p-try": "^2.0.0"
}
@@ -34524,7 +35221,10 @@
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"p-limit": "^2.2.0"
}
@@ -34533,8 +35233,12 @@
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
}
}
},
@@ -34702,11 +35406,13 @@
}
},
"request": {
- "version": "2.88.2",
- "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+ "version": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"aws-sign2": "~0.7.0",
"aws4": "^1.8.0",
@@ -34735,7 +35441,10 @@
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.6",
@@ -34747,7 +35456,10 @@
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"psl": "^1.1.28",
"punycode": "^2.1.1"
@@ -34876,6 +35588,7 @@
"version": "2.76.0",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.76.0.tgz",
"integrity": "sha512-9jwRIEY1jOzKLj3nsY/yot41r19ITdQrhs+q3ggNWhr9TQgduHqANvPpS32RNpzGklJu3G1AJfvlZLi/6wFgWA==",
+ "peer": true,
"requires": {
"fsevents": "~2.3.2"
}
@@ -34956,6 +35669,10 @@
"version": "1.89.2",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz",
"integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==",
+<<<<<<< HEAD
+ "peer": true,
+=======
+>>>>>>> origin/main
"requires": {
"@parcel/watcher": "^2.4.1",
"chokidar": "^4.0.0",
@@ -34979,11 +35696,13 @@
}
},
"sass-graph": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz",
+ "version": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz",
"integrity": "sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"glob": "^7.0.0",
"lodash": "^4.17.11",
@@ -35036,7 +35755,10 @@
"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz",
"integrity": "sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"js-base64": "^2.4.3",
"source-map": "^0.7.1"
@@ -35046,8 +35768,12 @@
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
}
}
},
@@ -35349,8 +36075,12 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"setprototypeof": {
"version": "1.2.0",
@@ -35414,8 +36144,12 @@
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
"integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"sockjs": {
"version": "0.3.24",
@@ -35439,7 +36173,10 @@
"resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
"integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"ip": "^1.1.5",
"smart-buffer": "^4.2.0"
@@ -35450,7 +36187,10 @@
"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
"integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"agent-base": "^6.0.2",
"debug": "^4.3.3",
@@ -35511,7 +36251,10 @@
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0"
@@ -35521,15 +36264,22 @@
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"spdx-expression-parse": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"spdx-exceptions": "^2.1.0",
"spdx-license-ids": "^3.0.0"
@@ -35539,8 +36289,12 @@
"version": "3.0.11",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
"integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"spdy": {
"version": "4.0.2",
@@ -35605,7 +36359,10 @@
"resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
"integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"minipass": "^3.1.1"
}
@@ -35641,11 +36398,13 @@
"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
},
"stdout-stream": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
+ "version": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
"integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"readable-stream": "^2.0.1"
}
@@ -36000,7 +36759,10 @@
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
"integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"chownr": "^2.0.0",
"fs-minipass": "^2.0.0",
@@ -36014,8 +36776,12 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
}
}
},
@@ -36176,15 +36942,21 @@
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"true-case-path": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+ "version": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"glob": "^7.1.2"
}
@@ -36266,6 +37038,8 @@
"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
},
+<<<<<<< HEAD
+=======
"type-fest": {
"version": "0.18.1",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
@@ -36273,6 +37047,7 @@
"optional": true,
"peer": true
},
+>>>>>>> origin/main
"type-is": {
"version": "1.6.18",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -36336,7 +37111,10 @@
"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"unique-slug": "^2.0.0"
}
@@ -36346,7 +37124,10 @@
"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
"integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"imurmurhash": "^0.1.4"
}
@@ -36440,8 +37221,12 @@
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+<<<<<<< HEAD
+ "optional": true
+=======
"optional": true,
"peer": true
+>>>>>>> origin/main
},
"v8-compile-cache": {
"version": "2.3.0",
@@ -36463,7 +37248,10 @@
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"spdx-correct": "^3.0.0",
"spdx-expression-parse": "^3.0.0"
@@ -36546,6 +37334,7 @@
"version": "5.73.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz",
"integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==",
+ "peer": true,
"requires": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51",
@@ -36610,6 +37399,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -36647,6 +37437,7 @@
"version": "4.9.3",
"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.3.tgz",
"integrity": "sha512-3qp/eoboZG5/6QgiZ3llN8TUzkSpYg1Ko9khWX1h40MIEUNS2mDoIa8aXsPfskER+GbTvs/IJZ1QTBBhhuetSw==",
+ "peer": true,
"requires": {
"@types/bonjour": "^3.5.9",
"@types/connect-history-api-fallback": "^1.3.5",
@@ -36683,6 +37474,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -36825,7 +37617,10 @@
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
"optional": true,
+<<<<<<< HEAD
+=======
"peer": true,
+>>>>>>> origin/main
"requires": {
"string-width": "^1.0.2 || 2 || 3 || 4"
}
@@ -36918,6 +37713,7 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+ "peer": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 2d4b273ea..98c15298d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,6 +21,7 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
+ "test-coverage": "react-scripts test --coverage --watchAll=false",
"eject": "react-scripts eject"
},
"eslintConfig": {
diff --git a/frontend/src/pages/Home/Home.test.js b/frontend/src/pages/Home/Home.test.js
index 189d200b5..c3344d3a9 100644
--- a/frontend/src/pages/Home/Home.test.js
+++ b/frontend/src/pages/Home/Home.test.js
@@ -9,10 +9,7 @@ describe('Test Home', () => {
});
test('Test Render', async () => {
- //Arrange: Setup the mock API
- //Listen for any GET requests using the axios module
const mockGet = jest.spyOn(axios, 'get');
- //Intercept the GET requests and provide a mocked response
mockGet.mockImplementation((url) => {
switch (url) {
case `${API_URL}/api/category/?format=json`:
@@ -20,41 +17,22 @@ describe('Test Home', () => {
data: {
status: 'success',
data: [
- {
- id: 1,
- name: 'Handhelds',
- description: "So big, you don't need thumbs.",
- },
- {
- id: 2,
- name: 'Appeteasers',
- description: 'Tease the hangry hippo, he get hangrier',
- },
+ { id: 1, name: 'Handhelds', description: "So big, you don't need thumbs." },
+ { id: 2, name: 'Appeteasers', description: 'Tease the hangry hippo, he get hangrier' }
],
},
});
default:
- return Promise.resolve({
- data: {
- status: 'fail',
- },
- });
+ return Promise.resolve({ data: { status: 'fail' } });
}
});
- //Act: Call the Home page
render();
-
- //Assert: Check the values in the rendered Home page.
- //There should be 2 categories as defined in the mock response above
expect(await screen.findAllByTestId(/category-item/i)).toHaveLength(2);
- //The word Appeateasers should be in there as defined in the mock response above.
expect(await screen.findByText('Appeteasers')).toBeInTheDocument();
});
test('Negative Test: Test Failed Category call', async () => {
- //Arrange: Setup the mock API
- //Listen for any GET requests using the axios module
const mockGet = jest.spyOn(axios, 'get');
mockGet.mockImplementation((url) => {
switch (url) {
@@ -63,42 +41,24 @@ describe('Test Home', () => {
data: {
status: 'fail',
data: [
- {
- id: 1,
- name: 'Handhelds',
- description: "So big, you don't need thumbs.",
- },
- {
- id: 2,
- name: 'Appeteasers',
- description: 'Tease the hangry hippo, he get hangrier',
- },
+ { id: 1, name: 'Handhelds', description: "So big, you don't need thumbs." },
+ { id: 2, name: 'Appeteasers', description: 'Tease the hangry hippo, he get hangrier' }
],
},
});
default:
- return Promise.resolve({
- data: {
- status: 'fail',
- },
- });
+ return Promise.resolve({ data: { status: 'fail' } });
}
});
- //Act: Call the Home page
+
render();
- //Assert: Check the values are NOT in the rendered Home page. This is because the mocked status value is set to fail.
expect(screen.queryByTestId(/category-item/i)).not.toBeInTheDocument();
});
- //Copied "Test Render"
test('Test Integration Render', async () => {
- //Deleted the mock calls. There is no Arrange for this test since this will access the shared servers.
- //Act: Call the Home page
render();
- //Assert: Check the values in the rendered Home page.
- //There should be 2 categories as defined in the mock response above
expect(await screen.findAllByTestId(/category-item/i)).toHaveLength(2);
- //The word Appeateasers should be in there as defined in the mock response above.
expect(await screen.findByText('Appeteasers')).toBeInTheDocument();
});
});
+
diff --git a/frontend/src/pages/Order/Order.test.js b/frontend/src/pages/Order/Order.test.js
index 54fad92b2..ddcea105c 100644
--- a/frontend/src/pages/Order/Order.test.js
+++ b/frontend/src/pages/Order/Order.test.js
@@ -9,109 +9,102 @@ import OrderContext from '../../context/OrderContext';
describe('Test Order', () => {
let orderName;
let orderItems;
+
beforeEach(() => {
- //Arrange:
- //Setup Order Context
orderName = 'test-fun';
orderItems = [
{ item: 'Test 1', quantity: 1 },
{ item: 'Test 2', quantity: 2 },
{ item: 'Test 3', quantity: 3 },
];
+
//Mock API calls
const mockGet = jest.spyOn(axios, 'get');
mockGet.mockImplementation((url) => {
switch (url) {
case `${API_URL}/api/delivery/test-fun/0`:
return Promise.resolve({
- data: {
- status: 'success',
- data: 2.5,
- },
+ data: { status: 'success', data: 2.5 },
});
case `${API_URL}/api/delivery/test-fun/5`:
return Promise.resolve({
- data: {
- status: 'success',
- data: 5.0,
- },
+ data: { status: 'success', data: 5.0 },
});
case `${API_URL}/api/subtotal/test-fun`:
return Promise.resolve({
- data: {
- status: 'success',
- data: 5,
- },
+ data: { status: 'success', data: 5 },
});
case `${API_URL}/api/tax/test-fun/5`:
return Promise.resolve({
- data: {
- status: 'success',
- data: 0.86,
- },
+ data: { status: 'success', data: 0.86 },
});
case `${API_URL}/api/total/test-fun/5`:
return Promise.resolve({
- data: {
- status: 'success',
- data: 10.86,
- },
+ data: { status: 'success', data: 10.86 },
});
default:
- return Promise.resolve({
- data: {
- status: 'fail',
- },
- });
+ return Promise.resolve({ data: { status: 'fail' } });
}
});
});
- it('Test Delivery Fee', async () => {
- //ACT
- //Call the page
+ afterEach(() => {
+ jest.clearAllMocks();
+ });
+
+ test('Test Delivery Fee', async () => {
+ setupMock();
+
render(
);
- //ASSERT
- //Check for subtotal and delivery fee
await waitFor(() => {
expect(screen.getAllByText('$2.50')).toHaveLength(1);
});
+
expect(screen.getAllByText('$5.00')).toHaveLength(1);
});
- it('Test Update Delivery Fee', async () => {
- //ACT
- //Call the page
+ test('Test Update Delivery Fee', async () => {
render(
);
- //ACT
- //Update the Delivery distance by choosing the 5 mile option from the drop down
userEvent.selectOptions(
- // Find the select element, like a real user would.
screen.getByRole('combobox'),
- // Find and select the 5 mile option, like a real user would.
screen.getByRole('option', { name: '5 miles' })
);
- //ASSERT
- //Once the dropdown value for the delivery distance is changed, an API call will be made to determine the delivery fee
- //Wait for the API call to return and the delivery fee to be updated
await waitFor(() => {
- //The delivery fee and the subtotal should be $5.00. So there should be 2.
expect(screen.getAllByText('$5.00')).toHaveLength(2);
});
- //Check the tax
+
expect(screen.getAllByText('$0.86')).toHaveLength(1);
- //Check the total.
expect(screen.getAllByText('$10.86')).toHaveLength(1);
});
});
+
+const setupMock = () => {
+ const mockGet = jest.spyOn(axios, 'get');
+ mockGet.mockImplementation((url) => {
+ switch (url) {
+ case `${API_URL}/api/delivery/test-fun/0`:
+ return Promise.resolve({
+ data: { status: 'success', data: 2.5 },
+ });
+ case `${API_URL}/api/delivery/test-fun/5`:
+ return Promise.resolve({
+ data: { status: 'success', data: 5.0 },
+ });
+ default:
+ return Promise.resolve({
+ data: { status: 'fail' },
+ });
+ }
+ });
+};