diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml index 5e0ecd7..5f11d73 100644 --- a/.github/workflows/test-and-publish.yml +++ b/.github/workflows/test-and-publish.yml @@ -61,17 +61,17 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - cache: 'yarn' + cache: 'npm' - name: Log environment setup run: | node -v - yarn -v + npm -v - name: Install dependencies - run: yarn install --ignore-engines + run: npm install - name: Build templates - run: yarn run build:templates + run: npm run build:templates - name: Build library - run: yarn run build + run: npm run build publish: runs-on: ubuntu-latest @@ -97,12 +97,12 @@ jobs: repo-token: "${{ secrets.GITHUB_TOKEN }}" tag: "${{ env.version }}" - name: Install dependencies - run: yarn + run: npm install - uses: actions/setup-node@v3 with: registry-url: 'https://registry.npmjs.org' node-version: '18.x' - - name: Configure Yarn version + - name: Configure NPM version env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} run: | @@ -112,19 +112,17 @@ jobs: echo "registry=https://registry.npmjs.org/" >> .npmrc echo "access=public" >> .npmrc echo "save-exact=true" >> .npmrc - yarn config set version-tag-prefix "" - yarn config set version-git-message "Release version %s" - name: Version package run: | # Update version in packages to publish - yarn version --non-interactive --new-version $(cat .version) + npm version $(cat .version) -m "Release version %s" - name: Publish to NPM - run: yarn publish --tag $(cat .tag) --non-interactive --new-version $(cat .version) + run: npm publish --tag $(cat .tag) - uses: actions/setup-node@v3 with: node-version: '18.x' registry-url: 'https://npm.pkg.github.com' - - name: Configure Yarn version + - name: Configure NPM version env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | @@ -134,18 +132,12 @@ jobs: echo "@rtfpessoa:registry=https://npm.pkg.github.com/" >> .npmrc echo "access=public" >> .npmrc echo "save-exact=true" >> .npmrc - yarn config set version-tag-prefix "" - yarn config set version-git-message "Release version %s" - - name: Version package - run: | - # Update version in packages to publish - yarn version --non-interactive --new-version $(cat .version) - name: Publish to GPR run: | # HACK: Override npm package name to be able to publish in GitHub sed -i 's/^ "name":.*/ "name": "@rtfpessoa\/diff2html",/g' package.json echo "Going to publish version $(cat .version) to GitHub" - yarn publish --tag $(cat .tag) --non-interactive --new-version $(cat .version) + npm publish --tag $(cat .tag) # HACK: Restore npm package name sed -i 's/^ "name":.*/ "name": "diff2html",/g' package.json - name: Upload docs diff --git a/.husky/pre-commit b/.husky/pre-commit index 36af219..3199e8e 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -npx lint-staged +npm run lint:staged diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 809f3d5..0a17ae3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,9 +10,9 @@ - Before sending a pull request make sure your code is tested. -- Before sending a pull request for a feature, be sure to run tests with `yarn test`. +- Before sending a pull request for a feature, be sure to run tests with `npm run test`. -- Use the same coding style as the rest of the codebase, most of the check can be performed with `yarn run lint`. +- Use the same coding style as the rest of the codebase, most of the check can be performed with `npm run run lint`. - Use `git rebase` (not `git merge`) to sync your work from time to time with the master branch. diff --git a/README.md b/README.md index 63c24da..9ae319c 100644 --- a/README.md +++ b/README.md @@ -321,7 +321,7 @@ import { Controller } from '@hotwired/stimulus'; import { Diff2HtmlUI, Diff2HtmlUIConfig } from 'diff2html/lib/ui/js/diff2html-ui-slim.js'; -// Requires `yarn add highlight.js` +// Requires `npm install highlight.js` import 'highlight.js/styles/github.css'; import 'diff2html/bundles/css/diff2html.min.css'; diff --git a/package-lock.json b/package-lock.json index 4222a63..ac19f4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,7 +49,11 @@ "mini-css-extract-plugin": "2.7.7", "mkdirp": "3.0.1", "nopt": "7.2.0", +<<<<<<< HEAD "postcss": "^8.4.33", +======= + "postcss": "8.4.33", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-cli": "11.0.0", "postcss-import": "16.0.0", "postcss-loader": "7.3.4", @@ -82,6 +86,7 @@ } }, "node_modules/@ampproject/remapping": { +<<<<<<< HEAD "version": "2.2.1", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", @@ -89,12 +94,22 @@ "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" +======= + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">=6.0.0" } }, "node_modules/@babel/code-frame": { +<<<<<<< HEAD "version": "7.23.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", @@ -102,11 +117,21 @@ "dependencies": { "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" +======= + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", + "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.24.2", + "picocolors": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">=6.9.0" } }, +<<<<<<< HEAD "node_modules/@babel/code-frame/node_modules/ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -182,12 +207,19 @@ "version": "7.23.5", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", +======= + "node_modules/@babel/compat-data": { + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz", + "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { +<<<<<<< HEAD "version": "7.23.7", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz", "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==", @@ -203,6 +235,23 @@ "@babel/template": "^7.22.15", "@babel/traverse": "^7.23.7", "@babel/types": "^7.23.6", +======= + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz", + "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.2", + "@babel/generator": "^7.24.4", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.24.4", + "@babel/parser": "^7.24.4", + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -227,6 +276,7 @@ } }, "node_modules/@babel/generator": { +<<<<<<< HEAD "version": "7.23.6", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", @@ -235,6 +285,16 @@ "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", +======= + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz", + "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "jsesc": "^2.5.1" }, "engines": { @@ -301,12 +361,21 @@ } }, "node_modules/@babel/helper-module-imports": { +<<<<<<< HEAD "version": "7.22.15", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, "dependencies": { "@babel/types": "^7.22.15" +======= + "version": "7.24.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", + "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">=6.9.0" @@ -332,9 +401,15 @@ } }, "node_modules/@babel/helper-plugin-utils": { +<<<<<<< HEAD "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", +======= + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", + "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">=6.9.0" @@ -365,9 +440,15 @@ } }, "node_modules/@babel/helper-string-parser": { +<<<<<<< HEAD "version": "7.23.4", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", +======= + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", + "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">=6.9.0" @@ -392,6 +473,7 @@ } }, "node_modules/@babel/helpers": { +<<<<<<< HEAD "version": "7.23.8", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.8.tgz", "integrity": "sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==", @@ -400,20 +482,41 @@ "@babel/template": "^7.22.15", "@babel/traverse": "^7.23.7", "@babel/types": "^7.23.6" +======= + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz", + "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==", + "dev": true, + "dependencies": { + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { +<<<<<<< HEAD "version": "7.23.4", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", +======= + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz", + "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", +<<<<<<< HEAD "js-tokens": "^4.0.0" +======= + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">=6.9.0" @@ -491,9 +594,15 @@ } }, "node_modules/@babel/parser": { +<<<<<<< HEAD "version": "7.23.6", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", +======= + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz", + "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -563,12 +672,21 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { +<<<<<<< HEAD "version": "7.23.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz", "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" +======= + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz", + "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">=6.9.0" @@ -665,12 +783,21 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { +<<<<<<< HEAD "version": "7.23.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz", "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" +======= + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz", + "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">=6.9.0" @@ -680,9 +807,15 @@ } }, "node_modules/@babel/runtime": { +<<<<<<< HEAD "version": "7.23.8", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.8.tgz", "integrity": "sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==", +======= + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz", + "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" @@ -692,6 +825,7 @@ } }, "node_modules/@babel/template": { +<<<<<<< HEAD "version": "7.22.15", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", @@ -700,12 +834,23 @@ "@babel/code-frame": "^7.22.13", "@babel/parser": "^7.22.15", "@babel/types": "^7.22.15" +======= + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { +<<<<<<< HEAD "version": "7.23.7", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", @@ -713,12 +858,26 @@ "dependencies": { "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", +======= + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz", + "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.24.1", + "@babel/generator": "^7.24.1", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", +<<<<<<< HEAD "@babel/parser": "^7.23.6", "@babel/types": "^7.23.6", +======= + "@babel/parser": "^7.24.1", + "@babel/types": "^7.24.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -736,9 +895,15 @@ } }, "node_modules/@babel/types": { +<<<<<<< HEAD "version": "7.23.6", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", +======= + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.23.4", @@ -778,9 +943,15 @@ } }, "node_modules/@csstools/cascade-layer-name-parser": { +<<<<<<< HEAD "version": "1.0.7", "resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.7.tgz", "integrity": "sha512-9J4aMRJ7A2WRjaRLvsMeWrL69FmEuijtiW1XlK/sG+V0UJiHVYUyvj9mY4WAXfU/hGIiGOgL8e0jJcRyaZTjDQ==", +======= + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.9.tgz", + "integrity": "sha512-RRqNjxTZDUhx7pxYOBG/AkCVmPS3zYzfE47GEhIGkFuWFTQGJBgWOUUkKNo5MfxIfjDz5/1L3F3rF1oIsYaIpw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -796,6 +967,7 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { +<<<<<<< HEAD "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3" } @@ -804,6 +976,16 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-4.0.0.tgz", "integrity": "sha512-wjyXB22/h2OvxAr3jldPB7R7kjTUEzopvjitS8jWtyd8fN6xJ8vy1HnHu0ZNfEkqpBJgQ76Q+sBDshWcMvTa/w==", +======= + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4" + } + }, + "node_modules/@csstools/color-helpers": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-4.1.0.tgz", + "integrity": "sha512-pWRKF6cDwget8HowIIf2MqEmqIca/cf8/jO4b3PRtUF5EfQXYMtBIKycXB4yXTCUmwLKOoRZAzh/hjnc7ywOIg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -820,9 +1002,15 @@ } }, "node_modules/@csstools/css-calc": { +<<<<<<< HEAD "version": "1.1.6", "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-1.1.6.tgz", "integrity": "sha512-YHPAuFg5iA4qZGzMzvrQwzkvJpesXXyIUyaONflQrjtHB+BcFFbgltJkIkb31dMGO4SE9iZFA4HYpdk7+hnYew==", +======= + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-1.2.0.tgz", + "integrity": "sha512-iQqIW5vDPqQdLx07/atCuNKDprhIWjB0b8XRhUyXZWBZYUG+9mNyFwyu30rypX84WLevVo25NYW2ipxR8WyseQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -838,6 +1026,7 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { +<<<<<<< HEAD "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3" } @@ -846,6 +1035,16 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-1.5.1.tgz", "integrity": "sha512-x+SajGB2paGrTjPOUorGi8iCztF008YMKXTn+XzGVDBEIVJ/W1121pPerpneJYGOe1m6zWLPLnzOPaznmQxKFw==", +======= + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4" + } + }, + "node_modules/@csstools/css-color-parser": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-1.6.3.tgz", + "integrity": "sha512-pQPUPo32HW3/NuZxrwr3VJHE+vGqSTVI5gK4jGbuJ7eOFUrsTmZikXcVdInCVWOvuxK5xbCzwDWoTlZUCAKN+A==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -858,13 +1057,19 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/color-helpers": "^4.0.0", "@csstools/css-calc": "^1.1.6" +======= + "@csstools/color-helpers": "^4.1.0", + "@csstools/css-calc": "^1.2.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" }, "peerDependencies": { +<<<<<<< HEAD "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3" } @@ -873,6 +1078,16 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.5.0.tgz", "integrity": "sha512-abypo6m9re3clXA00eu5syw+oaPHbJTPapu9C4pzNsJ4hdZDzushT50Zhu+iIYXgEe1CxnRMn7ngsbV+MLrlpQ==", +======= + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4" + } + }, + "node_modules/@csstools/css-parser-algorithms": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.1.tgz", + "integrity": "sha512-ubEkAaTfVZa+WwGhs5jbo5Xfqpeaybr/RvWzvFxRs4jfq16wH8l8Ty/QEEpINxll4xhuGfdMbipRyz5QZh9+FA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -888,6 +1103,7 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { +<<<<<<< HEAD "@csstools/css-tokenizer": "^2.2.3" } }, @@ -895,6 +1111,15 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.3.tgz", "integrity": "sha512-pp//EvZ9dUmGuGtG1p+n17gTHEOqu9jO+FiCUjNN3BDmyhdA2Jq9QsVeR7K8/2QCK17HSsioPlTW9ZkzoWb3Lg==", +======= + "@csstools/css-tokenizer": "^2.2.4" + } + }, + "node_modules/@csstools/css-tokenizer": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.4.tgz", + "integrity": "sha512-PuWRAewQLbDhGeTvFuq2oClaSCKPIBmHyIobCV39JHRYN0byDcUWJl5baPeNUcqrjtdMNqFooE0FGl31I3JOqw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -911,9 +1136,15 @@ } }, "node_modules/@csstools/media-query-list-parser": { +<<<<<<< HEAD "version": "2.1.7", "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.7.tgz", "integrity": "sha512-lHPKJDkPUECsyAvD60joYfDmp8UERYxHGkFfyLJFTVK/ERJe0sVlIFLXU5XFxdjNDTerp5L4KeaKG+Z5S94qxQ==", +======= + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.9.tgz", + "integrity": "sha512-qqGuFfbn4rUmyOB0u8CVISIp5FfJ5GAR3mBrZ9/TKndHakdnm6pY0L/fbLcpPnrzwCyyTEZl1nUcXAYHEWneTA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -929,6 +1160,7 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { +<<<<<<< HEAD "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3" } @@ -937,6 +1169,16 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-4.0.2.tgz", "integrity": "sha512-PqM+jvg5T2tB4FHX+akrMGNWAygLupD4FNUjcv4PSvtVuWZ6ISxuo37m4jFGU7Jg3rCfloGzKd0+xfr5Ec3vZQ==", +======= + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4" + } + }, + "node_modules/@csstools/postcss-cascade-layers": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-4.0.4.tgz", + "integrity": "sha512-MKErv8lpEwVmAcAwidY1Kfd3oWrh2Q14kxHs9xn26XzjP/PrcdngWq63lJsZeMlBY7o+WlEOeE+FP6zPzeY2uw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -949,7 +1191,11 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/selector-specificity": "^3.0.1", +======= + "@csstools/selector-specificity": "^3.0.3", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-selector-parser": "^6.0.13" }, "engines": { @@ -960,9 +1206,15 @@ } }, "node_modules/@csstools/postcss-color-function": { +<<<<<<< HEAD "version": "3.0.9", "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-3.0.9.tgz", "integrity": "sha512-6Hbkw/4k73UH121l4LG+LNLKSvrfHqk3GHHH0A6/iFlD0xGmsWAr80Jd0VqXjfYbUTOGmJTOMMoxv3jvNxt1uw==", +======= + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-3.0.13.tgz", + "integrity": "sha512-gM24cIPU45HSPJ2zllz7VKjS1OKQS1sKOMI7Wsw8gFyXSGAGrxhYo++McylOqOXd8ecMaKxKQMUJqJVibvJYig==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -975,10 +1227,18 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-color-parser": "^1.5.1", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", "@csstools/postcss-progressive-custom-properties": "^3.0.3" +======= + "@csstools/css-color-parser": "^1.6.3", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -988,9 +1248,15 @@ } }, "node_modules/@csstools/postcss-color-mix-function": { +<<<<<<< HEAD "version": "2.0.9", "resolved": "https://registry.npmjs.org/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.9.tgz", "integrity": "sha512-fs1SOWJ/44DQSsDeJP+rxAkP2MYkCg6K4ZB8qJwFku2EjurgCAPiPZJvC6w94T1hBBinJwuMfT9qvvvniXyVgw==", +======= + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.13.tgz", + "integrity": "sha512-mD8IIfGVeWkN1H1wfCqYePOg4cDnVrOXm4P0OlYcvKriq6sImGCGShv/2D88q6s3iUlLXfUBES+DUjLVjDMhnw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1003,10 +1269,18 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-color-parser": "^1.5.1", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", "@csstools/postcss-progressive-custom-properties": "^3.0.3" +======= + "@csstools/css-color-parser": "^1.6.3", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1016,9 +1290,15 @@ } }, "node_modules/@csstools/postcss-exponential-functions": { +<<<<<<< HEAD "version": "1.0.3", "resolved": "https://registry.npmjs.org/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.3.tgz", "integrity": "sha512-IfGtEg3eC4b8Nd/kPgO3SxgKb33YwhHVsL0eJ3UYihx6fzzAiZwNbWmVW9MZTQjZ5GacgKxa4iAHikGvpwuIjw==", +======= + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.5.tgz", + "integrity": "sha512-7S7I7KgwHWQYzJJAoIjRtUf7DQs1dxipeg1A6ikZr0PYapNJX7UHz0evlpE67SQqYj1xBs70gpG7xUv3uLp4PA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1031,9 +1311,15 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-calc": "^1.1.6", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3" +======= + "@csstools/css-calc": "^1.2.0", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1043,9 +1329,15 @@ } }, "node_modules/@csstools/postcss-font-format-keywords": { +<<<<<<< HEAD "version": "3.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-3.0.1.tgz", "integrity": "sha512-D1lcG2sfotTq6yBEOMV3myFxJLT10F3DLYZJMbiny5YToqzHWodZen8WId3UTimm0mEHitXqAUNL5jdd6RzVdA==", +======= + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-3.0.2.tgz", + "integrity": "sha512-E0xz2sjm4AMCkXLCFvI/lyl4XO6aN1NCSMMVEOngFDJ+k2rDwfr6NDjWljk1li42jiLNChVX+YFnmfGCigZKXw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1058,6 +1350,10 @@ } ], "dependencies": { +<<<<<<< HEAD +======= + "@csstools/utilities": "^1.0.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -1068,9 +1364,15 @@ } }, "node_modules/@csstools/postcss-gamut-mapping": { +<<<<<<< HEAD "version": "1.0.2", "resolved": "https://registry.npmjs.org/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-1.0.2.tgz", "integrity": "sha512-zf9KHGM2PTuJEm4ZYg4DTmzCir38EbZBzlMPMbA4jbhLDqXHkqwnQ+Z5+UNrU8y6seVu5B4vzZmZarTFQwe+Ig==", +======= + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-1.0.6.tgz", + "integrity": "sha512-qGFpHU9cRf9qqkbHh9cWMTlBtGi/ujPgP/znQdwkbB4TgDR1ddI5wRRrksBsx64sfoUSlIEd70bxXzD9FtfdLg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1083,9 +1385,15 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-color-parser": "^1.5.1", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3" +======= + "@csstools/css-color-parser": "^1.6.3", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1095,9 +1403,15 @@ } }, "node_modules/@csstools/postcss-gradients-interpolation-method": { +<<<<<<< HEAD "version": "4.0.9", "resolved": "https://registry.npmjs.org/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.9.tgz", "integrity": "sha512-PSqR6QH7h3ggOl8TsoH73kbwYTKVQjAJauGg6nDKwaGfi5IL5StV//ehrv1C7HuPsHixMTc9YoAuuv1ocT20EQ==", +======= + "version": "4.0.14", + "resolved": "https://registry.npmjs.org/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.14.tgz", + "integrity": "sha512-VMWC3xtpchHJoRBb/fs1gJR/5nHopX+0GwwmgdCI1DjROtfWUKIW0nv8occ922Gv0/Lk93XBtYBv8JttVBMZUQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1110,10 +1424,18 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-color-parser": "^1.5.1", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", "@csstools/postcss-progressive-custom-properties": "^3.0.3" +======= + "@csstools/css-color-parser": "^1.6.3", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1123,9 +1445,15 @@ } }, "node_modules/@csstools/postcss-hwb-function": { +<<<<<<< HEAD "version": "3.0.8", "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.8.tgz", "integrity": "sha512-CRQEG372Hivmt17rm/Ho22hBQI9K/a6grzGQ21Zwc7dyspmyG0ibmPIW8hn15vJmXqWGeNq7S+L2b8/OrU7O5A==", +======= + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.12.tgz", + "integrity": "sha512-90kIs+FsM6isAXLVoFHTTl4h0J6g1J1M6ahpIjAs6/k7a2A9FB/q+l0MHpLre0ZiPlBf2y3e1j4L+79vml7kJw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1138,9 +1466,17 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-color-parser": "^1.5.1", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3" +======= + "@csstools/css-color-parser": "^1.6.3", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1150,9 +1486,15 @@ } }, "node_modules/@csstools/postcss-ic-unit": { +<<<<<<< HEAD "version": "3.0.3", "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.3.tgz", "integrity": "sha512-MpcmIL0/uMm/cFWh5V/9nbKKJ7jRr2qTYW5Q6zoE6HZ6uzOBJr2KRERv5/x8xzEBQ1MthDT7iP1EBp9luSQy7g==", +======= + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.6.tgz", + "integrity": "sha512-fHaU9C/sZPauXMrzPitZ/xbACbvxbkPpHoUgB9Kw5evtsBWdVkVrajOyiT9qX7/c+G1yjApoQjP1fQatldsy9w==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1165,7 +1507,12 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/postcss-progressive-custom-properties": "^3.0.3", +======= + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -1198,9 +1545,15 @@ } }, "node_modules/@csstools/postcss-is-pseudo-class": { +<<<<<<< HEAD "version": "4.0.4", "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.4.tgz", "integrity": "sha512-vTVO/uZixpTVAOQt3qZRUFJ/K1L03OfNkeJ8sFNDVNdVy/zW0h1L5WT7HIPMDUkvSrxQkFaCCybTZkUP7UESlQ==", +======= + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.6.tgz", + "integrity": "sha512-HilOhAsMpFheMYkuaREZx+CGa4hsG6kQdzwXSsuqKDFzYz2eIMP213+3dH/vUbPXaWrzqLKr8m3i0dgYPoh7vg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1213,7 +1566,11 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/selector-specificity": "^3.0.1", +======= + "@csstools/selector-specificity": "^3.0.3", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-selector-parser": "^6.0.13" }, "engines": { @@ -1315,9 +1672,15 @@ } }, "node_modules/@csstools/postcss-logical-viewport-units": { +<<<<<<< HEAD "version": "2.0.5", "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.5.tgz", "integrity": "sha512-2fjSamKN635DSW6fEoyNd2Bkpv3FVblUpgk5cpghIgPW1aDHZE2SYfZK5xQALvjMYZVjfqsD5EbXA7uDVBQVQA==", +======= + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.7.tgz", + "integrity": "sha512-L4G3zsp/bnU0+WXUyysihCUH14LkfMgUJsS9vKz3vCYbVobOTqQRoNXnEPpyNp8WYyolLqAWbGGJhVu8J6u2OQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1330,7 +1693,12 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-tokenizer": "^2.2.3" +======= + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/utilities": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1340,9 +1708,15 @@ } }, "node_modules/@csstools/postcss-media-minmax": { +<<<<<<< HEAD "version": "1.1.2", "resolved": "https://registry.npmjs.org/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.1.2.tgz", "integrity": "sha512-7qTRTJxW96u2yiEaTep1+8nto1O/rEDacewKqH+Riq5E6EsHTOmGHxkB4Se5Ic5xgDC4I05lLZxzzxnlnSypxA==", +======= + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.1.4.tgz", + "integrity": "sha512-xl/PIO3TUbXO1ZA4SA6HCw+Q9UGe2cgeRKx3lHCzoNig2D4bT5vfVCOrwhxjUb09oHihc9eI3I0iIfVPiXaN1A==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1355,10 +1729,17 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-calc": "^1.1.6", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", "@csstools/media-query-list-parser": "^2.1.7" +======= + "@csstools/css-calc": "^1.2.0", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/media-query-list-parser": "^2.1.9" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1368,9 +1749,15 @@ } }, "node_modules/@csstools/postcss-media-queries-aspect-ratio-number-values": { +<<<<<<< HEAD "version": "2.0.5", "resolved": "https://registry.npmjs.org/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.5.tgz", "integrity": "sha512-XHMPasWYPWa9XaUHXU6Iq0RLfoAI+nvGTPj51hOizNsHaAyFiq2SL4JvF1DU8lM6B70+HVzKM09Isbyrr755Bw==", +======= + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.7.tgz", + "integrity": "sha512-HBDAQw1K0NilcHGMUHv8jzf2mpOtcWTVKtuY3AeZ5TS1uyWWNVi5/yuA/tREPLU9WifNdqHQ+rfbsV/8zTIkTg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1383,9 +1770,15 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", "@csstools/media-query-list-parser": "^2.1.7" +======= + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/media-query-list-parser": "^2.1.9" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1395,9 +1788,15 @@ } }, "node_modules/@csstools/postcss-nested-calc": { +<<<<<<< HEAD "version": "3.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-3.0.1.tgz", "integrity": "sha512-bwwababZpWRm0ByHaWBxTsDGTMhZKmtUNl3Wt0Eom8AY7ORgXx5qF9SSk1vEFrCi+HOfJT6M6W5KPgzXuQNRwQ==", +======= + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-3.0.2.tgz", + "integrity": "sha512-ySUmPyawiHSmBW/VI44+IObcKH0v88LqFe0d09Sb3w4B1qjkaROc6d5IA3ll9kjD46IIX/dbO5bwFN/swyoyZA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1410,6 +1809,10 @@ } ], "dependencies": { +<<<<<<< HEAD +======= + "@csstools/utilities": "^1.0.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -1445,9 +1848,15 @@ } }, "node_modules/@csstools/postcss-oklab-function": { +<<<<<<< HEAD "version": "3.0.9", "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.9.tgz", "integrity": "sha512-l639gpcBfL3ogJe+og1M5FixQn8iGX8+29V7VtTSCUB37VzpzOC05URfde7INIdiJT65DkHzgdJ64/QeYggU8A==", +======= + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.13.tgz", + "integrity": "sha512-xbzMmukDFAwCt2+279io7ZiamZj87s6cnU3UgKB3G+NMpRX9A6uvN8xlnTLCe384hqg6hix5vlOmwkxqACb5pg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1460,10 +1869,18 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-color-parser": "^1.5.1", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", "@csstools/postcss-progressive-custom-properties": "^3.0.3" +======= + "@csstools/css-color-parser": "^1.6.3", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1473,9 +1890,15 @@ } }, "node_modules/@csstools/postcss-progressive-custom-properties": { +<<<<<<< HEAD "version": "3.0.3", "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.0.3.tgz", "integrity": "sha512-WipTVh6JTMQfeIrzDV4wEPsV9NTzMK2jwXxyH6CGBktuWdivHnkioP/smp1x/0QDPQyx7NTS14RB+GV3zZZYEw==", +======= + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.2.0.tgz", + "integrity": "sha512-BZlirVxCRgKlE7yVme+Xvif72eTn1MYXj8oZ4Knb+jwaH4u3AN1DjbhM7j86RP5vvuAOexJ4JwfifYYKWMN/QQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1498,9 +1921,15 @@ } }, "node_modules/@csstools/postcss-relative-color-syntax": { +<<<<<<< HEAD "version": "2.0.9", "resolved": "https://registry.npmjs.org/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.9.tgz", "integrity": "sha512-2UoaRd2iIuzUGtYgteN5fJ0s+OfCiV7PvCnw8MCh3om8+SeVinfG8D5sqBOvImxFVfrp6k60XF5RFlH6oc//fg==", +======= + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.13.tgz", + "integrity": "sha512-mENWPNcHdiEYtjHFfZP9U1jNukQgFpSQ7wvTvwiadK3qgNBiSl0vMSinM9kKsGsJLTHQ0LEAqWLHurU52I4Jeg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1513,10 +1942,18 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-color-parser": "^1.5.1", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", "@csstools/postcss-progressive-custom-properties": "^3.0.3" +======= + "@csstools/css-color-parser": "^1.6.3", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1551,9 +1988,15 @@ } }, "node_modules/@csstools/postcss-stepped-value-functions": { +<<<<<<< HEAD "version": "3.0.4", "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.4.tgz", "integrity": "sha512-gyNQ2YaOVXPqLR737XtReRPVu7DGKBr9JBDLoiH1T+N1ggV3r4HotRCOC1l6rxVC0zOuU1KiOzUn9Z5W838/rg==", +======= + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.6.tgz", + "integrity": "sha512-rnyp8tWRuBXERTHVdB5hjUlif5dQgPcyN+BX55wUnYpZ3LN9QPfK2Z3/HUZymwyou8Gg6vhd6X2W+g1pLq1jYg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1566,9 +2009,15 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-calc": "^1.1.6", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3" +======= + "@csstools/css-calc": "^1.2.0", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1578,9 +2027,15 @@ } }, "node_modules/@csstools/postcss-text-decoration-shorthand": { +<<<<<<< HEAD "version": "3.0.4", "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-3.0.4.tgz", "integrity": "sha512-yUZmbnUemgQmja7SpOZeU45+P49wNEgQguRdyTktFkZsHf7Gof+ZIYfvF6Cm+LsU1PwSupy4yUeEKKjX5+k6cQ==", +======= + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-3.0.5.tgz", + "integrity": "sha512-qKxXpD0TYINkUtWDN1RHdeWKtZCzEv5j3UMT/ZGqyY27icwCFw7iKO0bUeLSHjYFBqhurCWvoOsa9REqLdrNDw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1593,7 +2048,11 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/color-helpers": "^4.0.0", +======= + "@csstools/color-helpers": "^4.1.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -1604,9 +2063,15 @@ } }, "node_modules/@csstools/postcss-trigonometric-functions": { +<<<<<<< HEAD "version": "3.0.4", "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.4.tgz", "integrity": "sha512-qj4Cxth6c38iNYzfJJWAxt8jsLrZaMVmbfGDDLOlI2YJeZoC3A5Su6/Kr7oXaPFRuspUu+4EQHngOktqVHWfVg==", +======= + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.6.tgz", + "integrity": "sha512-i5Zd0bMJooZAn+ZcDmPij2WCkcOJJJ6opzK+QeDjxbMrYmoGQl0CY8FDHdeQyBF1Nly+Q0Fq3S7QfdNLKBBaCg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1619,9 +2084,15 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-calc": "^1.1.6", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3" +======= + "@csstools/css-calc": "^1.2.0", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -1652,10 +2123,17 @@ "postcss": "^8.4" } }, +<<<<<<< HEAD "node_modules/@csstools/selector-specificity": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.1.tgz", "integrity": "sha512-NPljRHkq4a14YzZ3YD406uaxh7s0g6eAq3L9aLOWywoqe8PkYamAvtsh7KNX6c++ihDrJ0RiU+/z7rGnhlZ5ww==", +======= + "node_modules/@csstools/selector-resolve-nested": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-1.1.0.tgz", + "integrity": "sha512-uWvSaeRcHyeNenKg8tp17EVDRkpflmdyvbE0DHo6D/GdBb6PDnCYYU6gRpXhtICMGMcahQmj2zGxwFM/WC8hCg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -1674,6 +2152,53 @@ "postcss-selector-parser": "^6.0.13" } }, +<<<<<<< HEAD +======= + "node_modules/@csstools/selector-specificity": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.3.tgz", + "integrity": "sha512-KEPNw4+WW5AVEIyzC80rTbWEUatTW2lXpN8+8ILC8PiPeWPjwUzrPZDIOZ2wwqDmeqOYTdSGyL3+vE5GC3FB3Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "postcss-selector-parser": "^6.0.13" + } + }, + "node_modules/@csstools/utilities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/utilities/-/utilities-1.0.0.tgz", + "integrity": "sha512-tAgvZQe/t2mlvpNosA4+CkMiZ2azISW5WPAcdSalZlEjQvUfghHxfQcrCiK/7/CrfAWVxyM88kGFYO82heIGDg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -1811,9 +2336,15 @@ } }, "node_modules/@humanwhocodes/object-schema": { +<<<<<<< HEAD "version": "2.0.2", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", +======= + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/@istanbuljs/load-nyc-config": { @@ -2218,6 +2749,7 @@ } }, "node_modules/@jridgewell/gen-mapping": { +<<<<<<< HEAD "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", @@ -2226,30 +2758,53 @@ "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/trace-mapping": "^0.3.9" +======= + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/resolve-uri": { +<<<<<<< HEAD "version": "3.1.1", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", +======= + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/set-array": { +<<<<<<< HEAD "version": "1.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", +======= + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/source-map": { +<<<<<<< HEAD "version": "0.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", @@ -2257,6 +2812,15 @@ "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" +======= + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 } }, "node_modules/@jridgewell/sourcemap-codec": { @@ -2266,9 +2830,15 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { +<<<<<<< HEAD "version": "0.3.21", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz", "integrity": "sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==", +======= + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -2276,9 +2846,15 @@ } }, "node_modules/@leichtgewicht/ip-codec": { +<<<<<<< HEAD "version": "2.0.4", "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", +======= + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz", + "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/@nodelib/fs.scandir": { @@ -2333,9 +2909,15 @@ } }, "node_modules/@sindresorhus/merge-streams": { +<<<<<<< HEAD "version": "1.0.0", "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz", "integrity": "sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==", +======= + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", + "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">=18" @@ -2345,9 +2927,15 @@ } }, "node_modules/@sinonjs/commons": { +<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", +======= + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "type-detect": "4.0.8" @@ -2372,9 +2960,15 @@ } }, "node_modules/@tsconfig/node10": { +<<<<<<< HEAD "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", +======= + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/@tsconfig/node12": { @@ -2481,9 +3075,15 @@ "dev": true }, "node_modules/@types/eslint": { +<<<<<<< HEAD "version": "8.56.2", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.2.tgz", "integrity": "sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==", +======= + "version": "8.56.10", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", + "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "@types/estree": "*", @@ -2519,9 +3119,15 @@ } }, "node_modules/@types/express-serve-static-core": { +<<<<<<< HEAD "version": "4.17.41", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz", "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==", +======= + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.0.tgz", + "integrity": "sha512-bGyep3JqPCRry1wq+O5n7oiBgGWmeIJXPjXXCo8EK0u8duZGSYar7cGqd3ML2JUsLGeB7fmc06KYo9fLGWqPvQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "@types/node": "*", @@ -2659,9 +3265,15 @@ "dev": true }, "node_modules/@types/qs": { +<<<<<<< HEAD "version": "6.9.11", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz", "integrity": "sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==", +======= + "version": "6.9.15", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", + "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/@types/range-parser": { @@ -2677,9 +3289,15 @@ "dev": true }, "node_modules/@types/semver": { +<<<<<<< HEAD "version": "7.5.6", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", +======= + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/@types/send": { @@ -2702,6 +3320,7 @@ } }, "node_modules/@types/serve-static": { +<<<<<<< HEAD "version": "1.15.5", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz", "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==", @@ -2710,6 +3329,16 @@ "@types/http-errors": "*", "@types/mime": "*", "@types/node": "*" +======= + "version": "1.15.7", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", + "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", + "dev": true, + "dependencies": { + "@types/http-errors": "*", + "@types/node": "*", + "@types/send": "*" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 } }, "node_modules/@types/sockjs": { @@ -2948,9 +3577,15 @@ "dev": true }, "node_modules/@webassemblyjs/ast": { +<<<<<<< HEAD "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", +======= + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", @@ -2970,9 +3605,15 @@ "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { +<<<<<<< HEAD "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", +======= + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { @@ -2993,6 +3634,7 @@ "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { +<<<<<<< HEAD "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", @@ -3002,6 +3644,17 @@ "@webassemblyjs/helper-buffer": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/wasm-gen": "1.11.6" +======= + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.12.1" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 } }, "node_modules/@webassemblyjs/ieee754": { @@ -3029,6 +3682,7 @@ "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { +<<<<<<< HEAD "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", @@ -3051,6 +3705,30 @@ "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.6", +======= + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" + } + }, + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", "@webassemblyjs/leb128": "1.11.6", @@ -3058,6 +3736,7 @@ } }, "node_modules/@webassemblyjs/wasm-opt": { +<<<<<<< HEAD "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", @@ -3076,6 +3755,26 @@ "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.6", +======= + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" + } + }, + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "@webassemblyjs/helper-api-error": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", @@ -3084,12 +3783,21 @@ } }, "node_modules/@webassemblyjs/wast-printer": { +<<<<<<< HEAD "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.6", +======= + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "@xtuc/long": "4.2.2" } }, @@ -3471,6 +4179,7 @@ "dev": true }, "node_modules/array-buffer-byte-length": { +<<<<<<< HEAD "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", @@ -3478,6 +4187,18 @@ "dependencies": { "call-bind": "^1.0.2", "is-array-buffer": "^3.0.1" +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3490,6 +4211,7 @@ "dev": true }, "node_modules/array-includes": { +<<<<<<< HEAD "version": "3.1.7", "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", @@ -3499,6 +4221,18 @@ "define-properties": "^1.2.0", "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1", +======= + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "is-string": "^1.0.7" }, "engines": { @@ -3518,6 +4252,7 @@ } }, "node_modules/array.prototype.findlastindex": { +<<<<<<< HEAD "version": "1.2.3", "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", @@ -3528,6 +4263,19 @@ "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0", "get-intrinsic": "^1.2.1" +======= + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", + "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -3573,6 +4321,7 @@ } }, "node_modules/arraybuffer.prototype.slice": { +<<<<<<< HEAD "version": "1.0.2", "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", @@ -3584,6 +4333,20 @@ "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1", "is-array-buffer": "^3.0.2", +======= + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "is-shared-array-buffer": "^1.0.2" }, "engines": { @@ -3599,6 +4362,18 @@ "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", "dev": true }, +<<<<<<< HEAD +======= + "node_modules/autolinker": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.28.1.tgz", + "integrity": "sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==", + "dev": true, + "dependencies": { + "gulp-header": "^1.7.1" + } + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/autoprefixer": { "version": "10.4.16", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz", @@ -3637,10 +4412,20 @@ } }, "node_modules/available-typed-arrays": { +<<<<<<< HEAD "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", "dev": true, +======= + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "engines": { "node": ">= 0.4" }, @@ -4270,12 +5055,35 @@ } }, "node_modules/binary-extensions": { +<<<<<<< HEAD "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true, "engines": { "node": ">=8" +======= + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bl": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", + "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", + "dev": true, + "optional": true, + "dependencies": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 } }, "node_modules/body-parser": { @@ -4376,9 +5184,15 @@ } }, "node_modules/browserslist": { +<<<<<<< HEAD "version": "4.22.2", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", +======= + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -4395,8 +5209,13 @@ } ], "dependencies": { +<<<<<<< HEAD "caniuse-lite": "^1.0.30001565", "electron-to-chromium": "^1.4.601", +======= + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, @@ -4428,6 +5247,34 @@ "node-int64": "^0.4.0" } }, +<<<<<<< HEAD +======= + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true, + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/buffer-alloc": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", @@ -4510,6 +5357,7 @@ "node": ">=4" } }, +<<<<<<< HEAD "node_modules/cacheable-request/node_modules/http-cache-semantics": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", @@ -4517,6 +5365,8 @@ "dev": true, "optional": true }, +======= +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/cacheable-request/node_modules/json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", @@ -4545,6 +5395,7 @@ } }, "node_modules/call-bind": { +<<<<<<< HEAD "version": "1.0.5", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", @@ -4553,6 +5404,21 @@ "function-bind": "^1.1.2", "get-intrinsic": "^1.2.1", "set-function-length": "^1.1.1" +======= + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4599,9 +5465,15 @@ } }, "node_modules/caniuse-lite": { +<<<<<<< HEAD "version": "1.0.30001576", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz", "integrity": "sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg==", +======= + "version": "1.0.30001611", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001611.tgz", + "integrity": "sha512-19NuN1/3PjA3QI8Eki55N8my4LzfkMCRLgCVfrl/slbSAchQfV0+GwjPrK3rq37As4UCLlM/DHajbKkAqbv92Q==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -4666,6 +5538,7 @@ "dev": true }, "node_modules/chokidar": { +<<<<<<< HEAD "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", @@ -4676,6 +5549,12 @@ "url": "https://paulmillr.com/funding/" } ], +======= + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -4688,6 +5567,12 @@ "engines": { "node": ">= 8.10.0" }, +<<<<<<< HEAD +======= + "funding": { + "url": "https://paulmillr.com/funding/" + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "optionalDependencies": { "fsevents": "~2.3.2" } @@ -4784,9 +5669,15 @@ "dev": true }, "node_modules/cli-truncate/node_modules/string-width": { +<<<<<<< HEAD "version": "7.0.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz", "integrity": "sha512-GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw==", +======= + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", + "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "emoji-regex": "^10.3.0", @@ -5130,12 +6021,21 @@ } }, "node_modules/copy-webpack-plugin/node_modules/globby": { +<<<<<<< HEAD "version": "14.0.0", "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz", "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==", "dev": true, "dependencies": { "@sindresorhus/merge-streams": "^1.0.0", +======= + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz", + "integrity": "sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==", + "dev": true, + "dependencies": { + "@sindresorhus/merge-streams": "^2.1.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "fast-glob": "^3.3.2", "ignore": "^5.2.4", "path-type": "^5.0.0", @@ -5247,9 +6147,15 @@ } }, "node_modules/css-blank-pseudo": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-6.0.1.tgz", "integrity": "sha512-goSnEITByxTzU4Oh5oJZrEWudxTqk7L6IXj1UW69pO6Hv0UdX+Vsrt02FFu5DweRh2bLu6WpX/+zsQCu5O1gKw==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-6.0.2.tgz", + "integrity": "sha512-J/6m+lsqpKPqWHOifAFtKFeGLOzw3jR92rxQcwRUfA/eTuZzKfKlxOmYDx2+tqOPQAueNvBiY8WhAeHu5qNmTg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -5272,9 +6178,15 @@ } }, "node_modules/css-declaration-sorter": { +<<<<<<< HEAD "version": "7.1.1", "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz", "integrity": "sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==", +======= + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz", + "integrity": "sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": "^14 || ^16 || >=18" @@ -5284,9 +6196,15 @@ } }, "node_modules/css-has-pseudo": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-6.0.1.tgz", "integrity": "sha512-WwoVKqNxApfEI7dWFyaHoeFCcUPD+lPyjL6lNpRUNX7IyIUuVpawOTwwA5D0ZR6V2xQZonNPVj8kEcxzEaAQfQ==", +======= + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-6.0.3.tgz", + "integrity": "sha512-qIsDxK/z0byH/mpNsv5hzQ5NOl8m1FRmOLgZpx4bG5uYHnOlO2XafeMI4mFIgNSViHwoUWcxSJZyyijaAmbs+A==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -5299,7 +6217,11 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/selector-specificity": "^3.0.1", +======= + "@csstools/selector-specificity": "^3.0.3", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-selector-parser": "^6.0.13", "postcss-value-parser": "^4.2.0" }, @@ -5401,9 +6323,15 @@ } }, "node_modules/cssdb": { +<<<<<<< HEAD "version": "7.10.0", "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.10.0.tgz", "integrity": "sha512-yGZ5tmA57gWh/uvdQBHs45wwFY0IBh3ypABk5sEubPBPSzXzkNgsWReqx7gdx6uhC+QoFBe+V8JwBB9/hQ6cIA==", +======= + "version": "7.11.2", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.11.2.tgz", + "integrity": "sha512-lhQ32TFkc1X4eTefGfYPvgovRSzIMofHkigfH8nWtyRL4XJLsRhJFreRvEgKzept7x1rjBuy3J/MurXLaFxW/A==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -5449,6 +6377,7 @@ } }, "node_modules/cssnano-preset-default": { +<<<<<<< HEAD "version": "6.0.3", "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.3.tgz", "integrity": "sha512-4y3H370aZCkT9Ev8P4SO4bZbt+AExeKhh8wTbms/X7OLDo5E7AYUUy6YPxa/uF5Grf+AJwNcCnxKhZynJ6luBA==", @@ -5483,6 +6412,43 @@ "postcss-reduce-transforms": "^6.0.1", "postcss-svgo": "^6.0.2", "postcss-unique-selectors": "^6.0.2" +======= + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz", + "integrity": "sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg==", + "dev": true, + "dependencies": { + "browserslist": "^4.23.0", + "css-declaration-sorter": "^7.2.0", + "cssnano-utils": "^4.0.2", + "postcss-calc": "^9.0.1", + "postcss-colormin": "^6.1.0", + "postcss-convert-values": "^6.1.0", + "postcss-discard-comments": "^6.0.2", + "postcss-discard-duplicates": "^6.0.3", + "postcss-discard-empty": "^6.0.3", + "postcss-discard-overridden": "^6.0.2", + "postcss-merge-longhand": "^6.0.5", + "postcss-merge-rules": "^6.1.1", + "postcss-minify-font-values": "^6.1.0", + "postcss-minify-gradients": "^6.0.3", + "postcss-minify-params": "^6.1.0", + "postcss-minify-selectors": "^6.0.4", + "postcss-normalize-charset": "^6.0.2", + "postcss-normalize-display-values": "^6.0.2", + "postcss-normalize-positions": "^6.0.2", + "postcss-normalize-repeat-style": "^6.0.2", + "postcss-normalize-string": "^6.0.2", + "postcss-normalize-timing-functions": "^6.0.2", + "postcss-normalize-unicode": "^6.1.0", + "postcss-normalize-url": "^6.0.2", + "postcss-normalize-whitespace": "^6.0.2", + "postcss-ordered-values": "^6.0.2", + "postcss-reduce-initial": "^6.1.0", + "postcss-reduce-transforms": "^6.0.2", + "postcss-svgo": "^6.0.3", + "postcss-unique-selectors": "^6.0.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18.0" @@ -5492,9 +6458,15 @@ } }, "node_modules/cssnano-utils": { +<<<<<<< HEAD "version": "4.0.1", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.1.tgz", "integrity": "sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ==", +======= + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz", + "integrity": "sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" @@ -5537,6 +6509,60 @@ "url": "https://github.com/imagemin/cwebp-bin?sponsor=1" } }, +<<<<<<< HEAD +======= + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -5767,9 +6793,15 @@ } }, "node_modules/dedent": { +<<<<<<< HEAD "version": "1.5.1", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", +======= + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", + "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "peerDependencies": { "babel-plugin-macros": "^3.1.0" @@ -5867,6 +6899,7 @@ } }, "node_modules/define-data-property": { +<<<<<<< HEAD "version": "1.1.1", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", @@ -5878,6 +6911,22 @@ }, "engines": { "node": ">= 0.4" +======= + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 } }, "node_modules/define-lazy-prop": { @@ -6177,9 +7226,15 @@ "dev": true }, "node_modules/electron-to-chromium": { +<<<<<<< HEAD "version": "1.4.630", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.630.tgz", "integrity": "sha512-osHqhtjojpCsACVnuD11xO5g9xaCyw7Qqn/C2KParkMv42i8jrJJgx3g7mkHfpxwhy9MnOJr8+pKOdZ7qzgizg==", +======= + "version": "1.4.744", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.744.tgz", + "integrity": "sha512-nAGcF0yeKKfrP13LMFr5U1eghfFSvFLg302VUFzWlcjPOnUYd52yU5x6PBYrujhNbc4jYmZFrGZFK+xasaEzVA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/emittery": { @@ -6229,9 +7284,15 @@ } }, "node_modules/enhanced-resolve": { +<<<<<<< HEAD "version": "5.15.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", +======= + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz", + "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -6251,9 +7312,15 @@ } }, "node_modules/envinfo": { +<<<<<<< HEAD "version": "7.11.0", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz", "integrity": "sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==", +======= + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.12.0.tgz", + "integrity": "sha512-Iw9rQJBGpJRd3rwXm9ft/JiGoAZmLxxJZELYDQoPRZ4USVhkKtIcNBPw6U+/K2mBpaqM25JSV6Yl4Az9vO2wJg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "bin": { "envinfo": "dist/cli.js" @@ -6272,6 +7339,7 @@ } }, "node_modules/es-abstract": { +<<<<<<< HEAD "version": "1.22.3", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", @@ -6316,6 +7384,59 @@ "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", "which-typed-array": "^1.1.13" +======= + "version": "1.23.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "data-view-buffer": "^1.0.1", + "data-view-byte-length": "^1.0.1", + "data-view-byte-offset": "^1.0.0", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.0.3", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "hasown": "^2.0.2", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.3", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.13", + "is-weakref": "^1.0.2", + "object-inspect": "^1.13.1", + "object-keys": "^1.1.1", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.2", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.9", + "string.prototype.trimend": "^1.0.8", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.6", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.15" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -6324,6 +7445,7 @@ "url": "https://github.com/sponsors/ljharb" } }, +<<<<<<< HEAD "node_modules/es-module-lexer": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", @@ -6339,6 +7461,56 @@ "get-intrinsic": "^1.2.2", "has-tostringtag": "^1.0.0", "hasown": "^2.0.0" +======= + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-module-lexer": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.0.tgz", + "integrity": "sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==", + "dev": true + }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -6371,9 +7543,15 @@ } }, "node_modules/escalade": { +<<<<<<< HEAD "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", +======= + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">=6" @@ -6485,9 +7663,15 @@ } }, "node_modules/eslint-module-utils": { +<<<<<<< HEAD "version": "2.8.0", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", +======= + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", + "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "debug": "^3.2.7" @@ -7473,9 +8657,15 @@ "dev": true }, "node_modules/fast-xml-parser": { +<<<<<<< HEAD "version": "4.3.3", "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.3.tgz", "integrity": "sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg==", +======= + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz", + "integrity": "sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -7511,9 +8701,15 @@ "dev": true }, "node_modules/fastq": { +<<<<<<< HEAD "version": "1.16.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz", "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==", +======= + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -7736,6 +8932,7 @@ "node": ">=6" } }, +<<<<<<< HEAD "node_modules/find-versions/node_modules/semver-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz", @@ -7746,6 +8943,8 @@ "node": ">=6" } }, +======= +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -7770,9 +8969,15 @@ } }, "node_modules/flatted": { +<<<<<<< HEAD "version": "3.2.9", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", +======= + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/follow-redirects": { @@ -7969,16 +9174,31 @@ } }, "node_modules/get-intrinsic": { +<<<<<<< HEAD "version": "1.2.2", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dev": true, "dependencies": { +======= + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" }, +<<<<<<< HEAD +======= + "engines": { + "node": ">= 0.4" + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -8031,6 +9251,7 @@ } }, "node_modules/get-symbol-description": { +<<<<<<< HEAD "version": "1.0.0", "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", @@ -8038,6 +9259,16 @@ "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.1" +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -8447,21 +9678,36 @@ } }, "node_modules/has-property-descriptors": { +<<<<<<< HEAD "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", "dev": true, "dependencies": { "get-intrinsic": "^1.2.2" +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-proto": { +<<<<<<< HEAD "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", +======= + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">= 0.4" @@ -8506,12 +9752,21 @@ } }, "node_modules/has-tostringtag": { +<<<<<<< HEAD "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "dev": true, "dependencies": { "has-symbols": "^1.0.2" +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.3" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -8521,9 +9776,15 @@ } }, "node_modules/hasown": { +<<<<<<< HEAD "version": "2.0.0", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", +======= + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "function-bind": "^1.1.2" @@ -8603,9 +9864,15 @@ } }, "node_modules/html-entities": { +<<<<<<< HEAD "version": "2.4.0", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", +======= + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz", + "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -8696,6 +9963,16 @@ "entities": "^2.0.0" } }, +<<<<<<< HEAD +======= + "node_modules/http-cache-semantics": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", + "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", + "dev": true, + "optional": true + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", @@ -8850,9 +10127,15 @@ "optional": true }, "node_modules/ignore": { +<<<<<<< HEAD "version": "5.3.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", +======= + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">= 4" @@ -9284,12 +10567,21 @@ } }, "node_modules/internal-slot": { +<<<<<<< HEAD "version": "1.0.6", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", "dev": true, "dependencies": { "get-intrinsic": "^1.2.2", +======= + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "hasown": "^2.0.0", "side-channel": "^1.0.4" }, @@ -9330,6 +10622,7 @@ } }, "node_modules/is-array-buffer": { +<<<<<<< HEAD "version": "3.0.2", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", @@ -9338,6 +10631,18 @@ "call-bind": "^1.0.2", "get-intrinsic": "^1.2.0", "is-typed-array": "^1.1.10" +======= + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9468,6 +10773,24 @@ "node": ">=6" } }, +<<<<<<< HEAD +======= + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, + "dependencies": { + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/is-date-object": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", @@ -9590,9 +10913,15 @@ "optional": true }, "node_modules/is-negative-zero": { +<<<<<<< HEAD "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", +======= + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">= 0.4" @@ -9715,12 +11044,24 @@ } }, "node_modules/is-shared-array-buffer": { +<<<<<<< HEAD "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", "dev": true, "dependencies": { "call-bind": "^1.0.2" +======= + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9783,12 +11124,21 @@ } }, "node_modules/is-typed-array": { +<<<<<<< HEAD "version": "1.1.12", "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "dependencies": { "which-typed-array": "^1.1.11" +======= + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "dev": true, + "dependencies": { + "which-typed-array": "^1.1.14" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -9855,6 +11205,7 @@ } }, "node_modules/istanbul-lib-instrument": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz", "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==", @@ -9863,6 +11214,16 @@ "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", "@istanbuljs/schema": "^0.1.2", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz", + "integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==", + "dev": true, + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "istanbul-lib-coverage": "^3.2.0", "semver": "^7.5.4" }, @@ -9914,9 +11275,15 @@ } }, "node_modules/istanbul-reports": { +<<<<<<< HEAD "version": "3.1.6", "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", +======= + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "html-escaper": "^2.0.0", @@ -10732,9 +12099,15 @@ } }, "node_modules/jsonc-parser": { +<<<<<<< HEAD "version": "3.2.0", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", +======= + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/jsonfile": { @@ -10833,12 +12206,24 @@ } }, "node_modules/lilconfig": { +<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", "dev": true, "engines": { "node": ">=14" +======= + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz", + "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antonk52" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 } }, "node_modules/lines-and-columns": { @@ -10951,6 +12336,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +<<<<<<< HEAD +======= + "node_modules/lint-staged/node_modules/lilconfig": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", + "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", + "dev": true, + "engines": { + "node": ">=14" + } + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/lint-staged/node_modules/mimic-fn": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", @@ -10964,9 +12361,15 @@ } }, "node_modules/lint-staged/node_modules/npm-run-path": { +<<<<<<< HEAD "version": "5.2.0", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", +======= + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "path-key": "^4.0.0" @@ -11168,6 +12571,7 @@ } }, "node_modules/log-update/node_modules/ansi-escapes": { +<<<<<<< HEAD "version": "6.2.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz", "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==", @@ -11175,6 +12579,12 @@ "dependencies": { "type-fest": "^3.0.0" }, +======= + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz", + "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==", + "dev": true, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "engines": { "node": ">=14.16" }, @@ -11283,6 +12693,7 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, +<<<<<<< HEAD "node_modules/log-update/node_modules/type-fest": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", @@ -11295,6 +12706,8 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +======= +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", @@ -11420,10 +12833,16 @@ } }, "node_modules/memfs": { +<<<<<<< HEAD "version": "3.6.0", "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.6.0.tgz", "integrity": "sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==", "deprecated": "this will be v4", +======= + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "fs-monkey": "^1.0.4" @@ -11932,6 +13351,7 @@ } }, "node_modules/object.fromentries": { +<<<<<<< HEAD "version": "2.0.7", "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", @@ -11940,6 +13360,17 @@ "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" +======= + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -11949,6 +13380,7 @@ } }, "node_modules/object.groupby": { +<<<<<<< HEAD "version": "1.0.1", "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", @@ -11958,6 +13390,19 @@ "define-properties": "^1.2.0", "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1" +======= + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 } }, "node_modules/object.pick": { @@ -11982,6 +13427,7 @@ } }, "node_modules/object.values": { +<<<<<<< HEAD "version": "1.1.7", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", @@ -11990,6 +13436,16 @@ "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" +======= + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -12654,6 +14110,18 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/postcss": { "version": "8.4.33", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", @@ -12683,20 +14151,42 @@ } }, "node_modules/postcss-attribute-case-insensitive": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-6.0.2.tgz", "integrity": "sha512-IRuCwwAAQbgaLhxQdQcIIK0dCVXg3XDUnzgKD8iwdiYdwU4rMWRWyl/W9/0nA4ihVpq5pyALiHB2veBJ0292pw==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.10" +======= + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-6.0.3.tgz", + "integrity": "sha512-KHkmCILThWBRtg+Jn1owTnHPnFit4OkqS+eKiGEOPIGke54DCeYGJ6r0Fx/HjfE9M9kznApCLcU0DvnPchazMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "dependencies": { + "postcss-selector-parser": "^6.0.13" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" }, +<<<<<<< HEAD "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, +======= +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "peerDependencies": { "postcss": "^8.4" } @@ -12776,12 +14266,21 @@ } }, "node_modules/postcss-cli/node_modules/globby": { +<<<<<<< HEAD "version": "14.0.0", "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz", "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==", "dev": true, "dependencies": { "@sindresorhus/merge-streams": "^1.0.0", +======= + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz", + "integrity": "sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==", + "dev": true, + "dependencies": { + "@sindresorhus/merge-streams": "^2.1.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "fast-glob": "^3.3.2", "ignore": "^5.2.4", "path-type": "^5.0.0", @@ -12864,9 +14363,15 @@ } }, "node_modules/postcss-color-functional-notation": { +<<<<<<< HEAD "version": "6.0.4", "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.4.tgz", "integrity": "sha512-YBzfVvVUNR4U3N0imzU1NPKCuwxzfHJkEP6imJxzsJ8LozRKeej9mWmg9Ef1ovJdb0xrGTRVzUxgTrMun5iw/Q==", +======= + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.8.tgz", + "integrity": "sha512-BilFPTHcfWEnuQeqL83nbSPVK3tcU57S60aOrqgditarNDzOojyF0Gdc2Ur5L+zox366QjrCe0rOBLDO2pNvRQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -12879,10 +14384,18 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-color-parser": "^1.5.1", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", "@csstools/postcss-progressive-custom-properties": "^3.0.3" +======= + "@csstools/css-color-parser": "^1.6.3", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -12892,9 +14405,15 @@ } }, "node_modules/postcss-color-hex-alpha": { +<<<<<<< HEAD "version": "9.0.3", "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-9.0.3.tgz", "integrity": "sha512-7sEHU4tAS6htlxun8AB9LDrCXoljxaC34tFVRlYKcvO+18r5fvGiXgv5bQzN40+4gXLCyWSMRK5FK31244WcCA==", +======= + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-9.0.4.tgz", + "integrity": "sha512-XQZm4q4fNFqVCYMGPiBjcqDhuG7Ey2xrl99AnDJMyr5eDASsAGalndVgHZF8i97VFNy1GQeZc4q2ydagGmhelQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -12907,6 +14426,10 @@ } ], "dependencies": { +<<<<<<< HEAD +======= + "@csstools/utilities": "^1.0.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -12917,9 +14440,15 @@ } }, "node_modules/postcss-color-rebeccapurple": { +<<<<<<< HEAD "version": "9.0.2", "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-9.0.2.tgz", "integrity": "sha512-f+RDEAPW2m8UbJWkSpRfV+QxhSaQhDMihI75DVGJJh4oRIoegjheeRtINFJum9D8BqGJcvD4GLjggTvCwZ4zuA==", +======= + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-9.0.3.tgz", + "integrity": "sha512-ruBqzEFDYHrcVq3FnW3XHgwRqVMrtEPLBtD7K2YmsLKVc2jbkxzzNEctJKsPCpDZ+LeMHLKRDoSShVefGc+CkQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -12932,6 +14461,10 @@ } ], "dependencies": { +<<<<<<< HEAD +======= + "@csstools/utilities": "^1.0.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -12942,6 +14475,7 @@ } }, "node_modules/postcss-colormin": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.2.tgz", "integrity": "sha512-TXKOxs9LWcdYo5cgmcSHPkyrLAh86hX1ijmyy6J8SbOhyv6ua053M3ZAM/0j44UsnQNIWdl8gb5L7xX2htKeLw==", @@ -12950,6 +14484,16 @@ "browserslist": "^4.22.2", "caniuse-api": "^3.0.0", "colord": "^2.9.1", +======= + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz", + "integrity": "sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==", + "dev": true, + "dependencies": { + "browserslist": "^4.23.0", + "caniuse-api": "^3.0.0", + "colord": "^2.9.3", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -12960,12 +14504,21 @@ } }, "node_modules/postcss-convert-values": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.2.tgz", "integrity": "sha512-aeBmaTnGQ+NUSVQT8aY0sKyAD/BaLJenEKZ03YK0JnDE1w1Rr8XShoxdal2V2H26xTJKr3v5haByOhJuyT4UYw==", "dev": true, "dependencies": { "browserslist": "^4.22.2", +======= + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz", + "integrity": "sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==", + "dev": true, + "dependencies": { + "browserslist": "^4.23.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -12976,9 +14529,15 @@ } }, "node_modules/postcss-custom-media": { +<<<<<<< HEAD "version": "10.0.2", "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-10.0.2.tgz", "integrity": "sha512-zcEFNRmDm2fZvTPdI1pIW3W//UruMcLosmMiCdpQnrCsTRzWlKQPYMa1ud9auL0BmrryKK1+JjIGn19K0UjO/w==", +======= + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-10.0.4.tgz", + "integrity": "sha512-Ubs7O3wj2prghaKRa68VHBvuy3KnTQ0zbGwqDYY1mntxJD0QL2AeiAy+AMfl3HBedTCVr2IcFNktwty9YpSskA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -12991,10 +14550,17 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/cascade-layer-name-parser": "^1.0.5", "@csstools/css-parser-algorithms": "^2.3.2", "@csstools/css-tokenizer": "^2.2.1", "@csstools/media-query-list-parser": "^2.1.5" +======= + "@csstools/cascade-layer-name-parser": "^1.0.9", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/media-query-list-parser": "^2.1.9" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -13004,9 +14570,15 @@ } }, "node_modules/postcss-custom-properties": { +<<<<<<< HEAD "version": "13.3.4", "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-13.3.4.tgz", "integrity": "sha512-9YN0gg9sG3OH+Z9xBrp2PWRb+O4msw+5Sbp3ZgqrblrwKspXVQe5zr5sVqi43gJGwW/Rv1A483PRQUzQOEewvA==", +======= + "version": "13.3.7", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-13.3.7.tgz", + "integrity": "sha512-0N9F/GUCr/D0IazjzHahyYW2bQVDT6qDtEudiGHAhMd3XqhfM3VmfYVlkc/40DOhsPtngSNb54/Ctu8msvFOvQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -13019,9 +14591,16 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/cascade-layer-name-parser": "^1.0.7", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", +======= + "@csstools/cascade-layer-name-parser": "^1.0.9", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/utilities": "^1.0.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -13032,9 +14611,15 @@ } }, "node_modules/postcss-custom-selectors": { +<<<<<<< HEAD "version": "7.1.6", "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-7.1.6.tgz", "integrity": "sha512-svsjWRaxqL3vAzv71dV0/65P24/FB8TbPX+lWyyf9SZ7aZm4S4NhCn7N3Bg+Z5sZunG3FS8xQ80LrCU9hb37cw==", +======= + "version": "7.1.8", + "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-7.1.8.tgz", + "integrity": "sha512-fqDkGSEsO7+oQaqdRdR8nwwqH+N2uk6LE/2g4myVJJYz/Ly418lHKEleKTdV/GzjBjFcG4n0dbfuH/Pd2BE8YA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -13047,9 +14632,15 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/cascade-layer-name-parser": "^1.0.5", "@csstools/css-parser-algorithms": "^2.3.2", "@csstools/css-tokenizer": "^2.2.1", +======= + "@csstools/cascade-layer-name-parser": "^1.0.9", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-selector-parser": "^6.0.13" }, "engines": { @@ -13085,9 +14676,15 @@ } }, "node_modules/postcss-discard-comments": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz", "integrity": "sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz", + "integrity": "sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" @@ -13097,9 +14694,15 @@ } }, "node_modules/postcss-discard-duplicates": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz", "integrity": "sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg==", +======= + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz", + "integrity": "sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" @@ -13109,9 +14712,15 @@ } }, "node_modules/postcss-discard-empty": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz", "integrity": "sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg==", +======= + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz", + "integrity": "sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" @@ -13121,9 +14730,15 @@ } }, "node_modules/postcss-discard-overridden": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz", "integrity": "sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz", + "integrity": "sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" @@ -13133,9 +14748,15 @@ } }, "node_modules/postcss-double-position-gradients": { +<<<<<<< HEAD "version": "5.0.3", "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.3.tgz", "integrity": "sha512-QKYpwmaSm6HcdS0ndAuWSNNMv78R1oSySoh3mYBmctHWr2KWcwPJVakdOyU4lvFVW0GRu9wfIQwGeM4p3xU9ow==", +======= + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.6.tgz", + "integrity": "sha512-QJ+089FKMaqDxOhhIHsJrh4IP7h4PIHNC5jZP5PMmnfUScNu8Hji2lskqpFWCvu+5sj+2EJFyzKd13sLEWOZmQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -13148,7 +14769,12 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/postcss-progressive-custom-properties": "^3.0.3", +======= + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -13240,9 +14866,15 @@ } }, "node_modules/postcss-image-set-function": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-6.0.2.tgz", "integrity": "sha512-/O1xwqpJiz/apxGQi7UUfv1xUcorvkHZfvCYHPpRxxZj2WvjD0rg0+/+c+u5/Do5CpUg3XvfYxMrhcnjW1ArDQ==", +======= + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-6.0.3.tgz", + "integrity": "sha512-i2bXrBYzfbRzFnm+pVuxVePSTCRiNmlfssGI4H0tJQvDue+yywXwUxe68VyzXs7cGtMaH6MCLY6IbCShrSroCw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -13255,6 +14887,10 @@ } ], "dependencies": { +<<<<<<< HEAD +======= + "@csstools/utilities": "^1.0.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -13282,9 +14918,15 @@ } }, "node_modules/postcss-lab-function": { +<<<<<<< HEAD "version": "6.0.9", "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-6.0.9.tgz", "integrity": "sha512-PKFAVTBEWJYsoSTD7Kp/OzeiMsXaLX39Pv75XgUyF5VrbMfeTw+JqCGsvDP3dPhclh6BemdCFHcjXBG9gO4UCg==", +======= + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-6.0.13.tgz", + "integrity": "sha512-tzEThi3prSyomnVqaAU+k/YJib4rxeeTKVfMt+mPcEugFgp0t6xRjoc7fzaWCoEwYLC6GxGLD8/Ugx8COCqabw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -13297,10 +14939,18 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/css-color-parser": "^1.5.1", "@csstools/css-parser-algorithms": "^2.5.0", "@csstools/css-tokenizer": "^2.2.3", "@csstools/postcss-progressive-custom-properties": "^3.0.3" +======= + "@csstools/css-color-parser": "^1.6.3", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/postcss-progressive-custom-properties": "^3.2.0", + "@csstools/utilities": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" @@ -13310,9 +14960,15 @@ } }, "node_modules/postcss-load-config": { +<<<<<<< HEAD "version": "5.0.2", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-5.0.2.tgz", "integrity": "sha512-Q8QR3FYbqOKa0bnC1UQ2bFq9/ulHX5Bi34muzitMr8aDtUelO5xKeJEYC/5smE0jNE9zdB/NBnOwXKexELbRlw==", +======= + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-5.0.3.tgz", + "integrity": "sha512-90pBBI5apUVruIEdCxZic93Wm+i9fTrp7TXbgdUCH+/L+2WnfpITSpq5dFU/IPvbv7aNiMlQISpUkAm3fEcvgQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -13392,6 +15048,7 @@ } }, "node_modules/postcss-merge-longhand": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.2.tgz", "integrity": "sha512-+yfVB7gEM8SrCo9w2lCApKIEzrTKl5yS1F4yGhV3kSim6JzbfLGJyhR1B6X+6vOT0U33Mgx7iv4X9MVWuaSAfw==", @@ -13399,6 +15056,15 @@ "dependencies": { "postcss-value-parser": "^4.2.0", "stylehacks": "^6.0.2" +======= + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz", + "integrity": "sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.2.0", + "stylehacks": "^6.1.1" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18.0" @@ -13408,6 +15074,7 @@ } }, "node_modules/postcss-merge-rules": { +<<<<<<< HEAD "version": "6.0.3", "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.3.tgz", "integrity": "sha512-yfkDqSHGohy8sGYIJwBmIGDv4K4/WrJPX355XrxQb/CSsT4Kc/RxDi6akqn5s9bap85AWgv21ArcUWwWdGNSHA==", @@ -13417,6 +15084,17 @@ "caniuse-api": "^3.0.0", "cssnano-utils": "^4.0.1", "postcss-selector-parser": "^6.0.15" +======= + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz", + "integrity": "sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ==", + "dev": true, + "dependencies": { + "browserslist": "^4.23.0", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^4.0.2", + "postcss-selector-parser": "^6.0.16" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18.0" @@ -13426,9 +15104,15 @@ } }, "node_modules/postcss-minify-font-values": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz", "integrity": "sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w==", +======= + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz", + "integrity": "sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -13441,6 +15125,7 @@ } }, "node_modules/postcss-minify-gradients": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz", "integrity": "sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w==", @@ -13448,6 +15133,15 @@ "dependencies": { "colord": "^2.9.1", "cssnano-utils": "^4.0.1", +======= + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz", + "integrity": "sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==", + "dev": true, + "dependencies": { + "colord": "^2.9.3", + "cssnano-utils": "^4.0.2", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -13458,6 +15152,7 @@ } }, "node_modules/postcss-minify-params": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.2.tgz", "integrity": "sha512-zwQtbrPEBDj+ApELZ6QylLf2/c5zmASoOuA4DzolyVGdV38iR2I5QRMsZcHkcdkZzxpN8RS4cN7LPskOkTwTZw==", @@ -13465,6 +15160,15 @@ "dependencies": { "browserslist": "^4.22.2", "cssnano-utils": "^4.0.1", +======= + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz", + "integrity": "sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==", + "dev": true, + "dependencies": { + "browserslist": "^4.23.0", + "cssnano-utils": "^4.0.2", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -13475,12 +15179,21 @@ } }, "node_modules/postcss-minify-selectors": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.2.tgz", "integrity": "sha512-0b+m+w7OAvZejPQdN2GjsXLv5o0jqYHX3aoV0e7RBKPCsB7TYG5KKWBFhGnB/iP3213Ts8c5H4wLPLMm7z28Sg==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.15" +======= + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz", + "integrity": "sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ==", + "dev": true, + "dependencies": { + "postcss-selector-parser": "^6.0.16" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18.0" @@ -13490,9 +15203,15 @@ } }, "node_modules/postcss-modules-extract-imports": { +<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", +======= + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", + "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": "^10 || ^12 || >= 14" @@ -13502,9 +15221,15 @@ } }, "node_modules/postcss-modules-local-by-default": { +<<<<<<< HEAD "version": "4.0.3", "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz", "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==", +======= + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", + "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "icss-utils": "^5.0.0", @@ -13519,9 +15244,15 @@ } }, "node_modules/postcss-modules-scope": { +<<<<<<< HEAD "version": "3.1.0", "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.0.tgz", "integrity": "sha512-SaIbK8XW+MZbd0xHPf7kdfA/3eOt7vxJ72IRecn3EzuZVLr1r0orzf0MX/pN8m+NMDoo6X/SQd8oeKqGZd8PXg==", +======= + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", + "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.4" @@ -13549,9 +15280,15 @@ } }, "node_modules/postcss-nesting": { +<<<<<<< HEAD "version": "12.0.2", "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.0.2.tgz", "integrity": "sha512-63PpJHSeNs93S3ZUIyi+7kKx4JqOIEJ6QYtG3x+0qA4J03+4n0iwsyA1GAHyWxsHYljQS4/4ZK1o2sMi70b5wQ==", +======= + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.1.1.tgz", + "integrity": "sha512-qc74KvIAQNa5ujZKG1UV286dhaDW6basbUy2i9AzNU/T8C9hpvGu9NZzm1SfePe2yP7sPYgpA8d4sPVopn2Hhw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -13564,7 +15301,12 @@ } ], "dependencies": { +<<<<<<< HEAD "@csstools/selector-specificity": "^3.0.1", +======= + "@csstools/selector-resolve-nested": "^1.1.0", + "@csstools/selector-specificity": "^3.0.3", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-selector-parser": "^6.0.13" }, "engines": { @@ -13575,9 +15317,15 @@ } }, "node_modules/postcss-normalize-charset": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz", "integrity": "sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz", + "integrity": "sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" @@ -13587,9 +15335,15 @@ } }, "node_modules/postcss-normalize-display-values": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz", "integrity": "sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz", + "integrity": "sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -13602,9 +15356,15 @@ } }, "node_modules/postcss-normalize-positions": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz", "integrity": "sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz", + "integrity": "sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -13617,9 +15377,15 @@ } }, "node_modules/postcss-normalize-repeat-style": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz", "integrity": "sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz", + "integrity": "sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -13632,9 +15398,15 @@ } }, "node_modules/postcss-normalize-string": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz", "integrity": "sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz", + "integrity": "sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -13647,9 +15419,15 @@ } }, "node_modules/postcss-normalize-timing-functions": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz", "integrity": "sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz", + "integrity": "sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -13662,12 +15440,21 @@ } }, "node_modules/postcss-normalize-unicode": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.2.tgz", "integrity": "sha512-Ff2VdAYCTGyMUwpevTZPZ4w0+mPjbZzLLyoLh/RMpqUqeQKZ+xMm31hkxBavDcGKcxm6ACzGk0nBfZ8LZkStKA==", "dev": true, "dependencies": { "browserslist": "^4.22.2", +======= + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz", + "integrity": "sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==", + "dev": true, + "dependencies": { + "browserslist": "^4.23.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -13678,9 +15465,15 @@ } }, "node_modules/postcss-normalize-url": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz", "integrity": "sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz", + "integrity": "sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -13693,9 +15486,15 @@ } }, "node_modules/postcss-normalize-whitespace": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz", "integrity": "sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz", + "integrity": "sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -13730,12 +15529,21 @@ } }, "node_modules/postcss-ordered-values": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz", "integrity": "sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA==", "dev": true, "dependencies": { "cssnano-utils": "^4.0.1", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz", + "integrity": "sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==", + "dev": true, + "dependencies": { + "cssnano-utils": "^4.0.2", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "postcss-value-parser": "^4.2.0" }, "engines": { @@ -13914,12 +15722,21 @@ } }, "node_modules/postcss-reduce-initial": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.2.tgz", "integrity": "sha512-YGKalhNlCLcjcLvjU5nF8FyeCTkCO5UtvJEt0hrPZVCTtRLSOH4z00T1UntQPj4dUmIYZgMj8qK77JbSX95hSw==", "dev": true, "dependencies": { "browserslist": "^4.22.2", +======= + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz", + "integrity": "sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==", + "dev": true, + "dependencies": { + "browserslist": "^4.23.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "caniuse-api": "^3.0.0" }, "engines": { @@ -13930,9 +15747,15 @@ } }, "node_modules/postcss-reduce-transforms": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz", "integrity": "sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ==", +======= + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz", + "integrity": "sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -13954,10 +15777,27 @@ } }, "node_modules/postcss-reporter": { +<<<<<<< HEAD "version": "7.0.5", "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.5.tgz", "integrity": "sha512-glWg7VZBilooZGOFPhN9msJ3FQs19Hie7l5a/eE6WglzYqVeH3ong3ShFcp9kDWJT1g2Y/wd59cocf9XxBtkWA==", "dev": true, +======= + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.1.0.tgz", + "integrity": "sha512-/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dependencies": { "picocolors": "^1.0.0", "thenby": "^1.3.4" @@ -13965,37 +15805,68 @@ "engines": { "node": ">=10" }, +<<<<<<< HEAD "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" }, +======= +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "peerDependencies": { "postcss": "^8.1.0" } }, "node_modules/postcss-selector-not": { +<<<<<<< HEAD "version": "7.0.1", "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-7.0.1.tgz", "integrity": "sha512-1zT5C27b/zeJhchN7fP0kBr16Cc61mu7Si9uWWLoA3Px/D9tIJPKchJCkUH3tPO5D0pCFmGeApAv8XpXBQJ8SQ==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.10" +======= + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-7.0.2.tgz", + "integrity": "sha512-/SSxf/90Obye49VZIfc0ls4H0P6i6V1iHv0pzZH8SdgvZOPFkF37ef1r5cyWcMflJSFJ5bfuoluTnFnBBFiuSA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "dependencies": { + "postcss-selector-parser": "^6.0.13" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18" }, +<<<<<<< HEAD "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, +======= +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "peerDependencies": { "postcss": "^8.4" } }, "node_modules/postcss-selector-parser": { +<<<<<<< HEAD "version": "6.0.15", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz", "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==", +======= + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", + "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -14006,9 +15877,15 @@ } }, "node_modules/postcss-svgo": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.2.tgz", "integrity": "sha512-IH5R9SjkTkh0kfFOQDImyy1+mTCb+E830+9SV1O+AaDcoHTvfsvt6WwJeo7KwcHbFnevZVCsXhDmjFiGVuwqFQ==", +======= + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz", + "integrity": "sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0", @@ -14179,12 +16056,21 @@ } }, "node_modules/postcss-unique-selectors": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.2.tgz", "integrity": "sha512-8IZGQ94nechdG7Y9Sh9FlIY2b4uS8/k8kdKRX040XHsS3B6d1HrJAkXrBSsSu4SuARruSsUjW3nlSw8BHkaAYQ==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.15" +======= + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz", + "integrity": "sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg==", + "dev": true, + "dependencies": { + "postcss-selector-parser": "^6.0.16" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18.0" @@ -14354,9 +16240,15 @@ } }, "node_modules/pure-rand": { +<<<<<<< HEAD "version": "6.0.4", "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz", "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==", +======= + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "funding": [ { @@ -14578,6 +16470,7 @@ } }, "node_modules/regexp.prototype.flags": { +<<<<<<< HEAD "version": "1.5.1", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", @@ -14586,6 +16479,17 @@ "call-bind": "^1.0.2", "define-properties": "^1.2.0", "set-function-name": "^2.0.0" +======= + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -14640,6 +16544,7 @@ "sprintf-js": "~1.0.2" } }, +<<<<<<< HEAD "node_modules/remarkable/node_modules/autolinker": { "version": "0.28.1", "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.28.1.tgz", @@ -14649,6 +16554,8 @@ "gulp-header": "^1.7.1" } }, +======= +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/renderkid": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", @@ -14818,9 +16725,15 @@ } }, "node_modules/rfdc": { +<<<<<<< HEAD "version": "1.3.0", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", +======= + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", + "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true }, "node_modules/rimraf": { @@ -14889,6 +16802,7 @@ "dev": true }, "node_modules/safe-array-concat": { +<<<<<<< HEAD "version": "1.0.1", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", @@ -14896,6 +16810,15 @@ "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1", +======= + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -14933,6 +16856,7 @@ ] }, "node_modules/safe-regex-test": { +<<<<<<< HEAD "version": "1.0.2", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.2.tgz", "integrity": "sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==", @@ -14940,6 +16864,15 @@ "dependencies": { "call-bind": "^1.0.5", "get-intrinsic": "^1.2.2", +======= + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "is-regex": "^1.1.4" }, "engines": { @@ -15055,9 +16988,15 @@ } }, "node_modules/semver": { +<<<<<<< HEAD "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", +======= + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -15069,6 +17008,19 @@ "node": ">=10" } }, +<<<<<<< HEAD +======= + "node_modules/semver-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz", + "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=6" + } + }, +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/semver-truncate": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz", @@ -15264,6 +17216,7 @@ "dev": true }, "node_modules/set-function-length": { +<<<<<<< HEAD "version": "1.1.1", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", @@ -15273,12 +17226,26 @@ "get-intrinsic": "^1.2.1", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.0" +======= + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" } }, "node_modules/set-function-name": { +<<<<<<< HEAD "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", @@ -15287,6 +17254,17 @@ "define-data-property": "^1.0.1", "functions-have-names": "^1.2.3", "has-property-descriptors": "^1.0.0" +======= + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -15362,6 +17340,7 @@ } }, "node_modules/side-channel": { +<<<<<<< HEAD "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", @@ -15370,6 +17349,20 @@ "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", "object-inspect": "^1.9.0" +======= + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -15480,9 +17473,15 @@ } }, "node_modules/source-map-js": { +<<<<<<< HEAD "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", +======= + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "engines": { "node": ">=0.10.0" @@ -15657,6 +17656,7 @@ } }, "node_modules/string.prototype.trim": { +<<<<<<< HEAD "version": "1.2.8", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", @@ -15665,6 +17665,17 @@ "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" +======= + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-object-atoms": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -15674,6 +17685,7 @@ } }, "node_modules/string.prototype.trimend": { +<<<<<<< HEAD "version": "1.0.7", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", @@ -15682,12 +17694,23 @@ "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" +======= + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { +<<<<<<< HEAD "version": "1.0.7", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", @@ -15696,6 +17719,19 @@ "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" +======= + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -15803,6 +17839,7 @@ "optional": true }, "node_modules/stylehacks": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.2.tgz", "integrity": "sha512-00zvJGnCu64EpMjX8b5iCZ3us2Ptyw8+toEkb92VdmkEaRaSGBNKAoK6aWZckhXxmQP8zWiTaFaiMGIU8Ve8sg==", @@ -15810,6 +17847,15 @@ "dependencies": { "browserslist": "^4.22.2", "postcss-selector-parser": "^6.0.15" +======= + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz", + "integrity": "sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==", + "dev": true, + "dependencies": { + "browserslist": "^4.23.0", + "postcss-selector-parser": "^6.0.16" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": "^14 || ^16 || >=18.0" @@ -15902,6 +17948,7 @@ "node": ">= 0.8.0" } }, +<<<<<<< HEAD "node_modules/tar-stream/node_modules/bl": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", @@ -15913,6 +17960,8 @@ "safe-buffer": "^5.1.1" } }, +======= +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/temp-dir": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", @@ -15938,9 +17987,15 @@ } }, "node_modules/terser": { +<<<<<<< HEAD "version": "5.26.0", "resolved": "https://registry.npmjs.org/terser/-/terser-5.26.0.tgz", "integrity": "sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==", +======= + "version": "5.30.3", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.30.3.tgz", + "integrity": "sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -16250,12 +18305,21 @@ } }, "node_modules/ts-api-utils": { +<<<<<<< HEAD "version": "1.0.3", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", "dev": true, "engines": { "node": ">=16.13.0" +======= + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", + "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", + "dev": true, + "engines": { + "node": ">=16" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "peerDependencies": { "typescript": ">=4.2.0" @@ -16505,6 +18569,7 @@ } }, "node_modules/typed-array-buffer": { +<<<<<<< HEAD "version": "1.0.0", "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", @@ -16513,12 +18578,23 @@ "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1", "is-typed-array": "^1.1.10" +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" } }, "node_modules/typed-array-byte-length": { +<<<<<<< HEAD "version": "1.0.0", "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", @@ -16528,6 +18604,18 @@ "for-each": "^0.3.3", "has-proto": "^1.0.1", "is-typed-array": "^1.1.10" +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -16537,6 +18625,7 @@ } }, "node_modules/typed-array-byte-offset": { +<<<<<<< HEAD "version": "1.0.0", "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", @@ -16547,6 +18636,19 @@ "for-each": "^0.3.3", "has-proto": "^1.0.1", "is-typed-array": "^1.1.10" +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -16556,6 +18658,7 @@ } }, "node_modules/typed-array-length": { +<<<<<<< HEAD "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", @@ -16564,6 +18667,22 @@ "call-bind": "^1.0.2", "for-each": "^0.3.3", "is-typed-array": "^1.1.9" +======= + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -16627,6 +18746,7 @@ "through": "^2.3.8" } }, +<<<<<<< HEAD "node_modules/unbzip2-stream/node_modules/buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", @@ -16652,6 +18772,8 @@ "ieee754": "^1.1.13" } }, +======= +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", @@ -16903,9 +19025,15 @@ } }, "node_modules/watchpack": { +<<<<<<< HEAD "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz", + "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", @@ -17253,6 +19381,7 @@ "dev": true }, "node_modules/which-typed-array": { +<<<<<<< HEAD "version": "1.1.13", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", @@ -17263,6 +19392,18 @@ "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" +======= + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.2" +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 }, "engines": { "node": ">= 0.4" @@ -17331,9 +19472,15 @@ "dev": true }, "node_modules/wrap-ansi/node_modules/string-width": { +<<<<<<< HEAD "version": "7.0.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz", "integrity": "sha512-GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw==", +======= + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", + "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", +>>>>>>> b517e40e5c7752cf028fe22bea6e53e7f53a7a47 "dev": true, "dependencies": { "emoji-regex": "^10.3.0", diff --git a/package.json b/package.json index e06134f..64a24d1 100644 --- a/package.json +++ b/package.json @@ -36,32 +36,33 @@ }, "scripts": { "eslint": "eslint --ignore-path .gitignore \"**/*.{js,jsx,ts,tsx,json}\"", - "lint:check": "yarn run eslint", - "lint:fix": "yarn run eslint --fix", + "lint:staged": "lint-staged", + "lint:check": "eslint", + "lint:fix": "eslint --fix", "prettier": "prettier --ignore-path .gitignore '**/*.+(js|jsx|ts|tsx|json|css|html|md|mdx)'", - "format:check": "yarn run prettier --check", - "format:fix": "yarn run prettier --write", - "build": "yarn run build:css && yarn run build:templates && yarn run build:commonjs && yarn run build:esm && yarn run build:bundles && yarn run build:website", + "format:check": "npm run prettier --check", + "format:fix": "npm run prettier --write", + "build": "npm run build:css && npm run build:templates && npm run build:commonjs && npm run build:esm && npm run build:bundles && npm run build:website", "build:commonjs": "rm -rf lib; tsc -p tsconfig.json --outDir lib", "build:esm": "rm -rf lib-esm; tsc -p tsconfig.json -m ESNext --outDir lib-esm", "build:bundles": "rm -rf ./bundles/js; webpack --mode production --config webpack.bundles.ts", "build:css": "rm -rf ./bundles/css; postcss --config ./postcss.config.js --no-map -o ./bundles/css/diff2html.min.css ./src/ui/css/diff2html.css", "build:templates": "ts-node ./scripts/hulk.ts --wrapper ts --variable 'defaultTemplates' ./src/templates/*.mustache > ./src/diff2html-templates.ts", "build:website": "rm -rf docs; webpack --mode production --config webpack.website.ts", - "gen": "yarn run gen:toc", + "gen": "npm run gen:toc", "gen:toc-base": "markdown-toc --maxdepth 3 --bullets='-' -i", - "gen:toc": "yarn run gen:toc-base README.md", + "gen:toc": "npm run gen:toc-base README.md", "test": "is-ci 'test:coverage' 'test:watch'", "test:coverage": "jest --coverage", "test:watch": "jest --watch", "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --watch", - "coverage:open": "yarn run test:coverage && open ./coverage/index.html", + "coverage:open": "npm run test:coverage && open ./coverage/index.html", "coverage:push": "curl -Ls https://coverage.codacy.com/get.sh | bash", - "validate": "yarn run build:templates && yarn run format:check && yarn run lint:check && yarn run build && yarn run test:coverage", - "fix": "yarn run format:fix && yarn run lint:fix", - "start": "yarn run start:website", + "validate": "npm run build:templates && npm run format:check && npm run lint:check && npm run build && npm run test:coverage", + "fix": "npm run format:fix && npm run lint:fix", + "start": "npm run start:website", "start:website": "webpack serve --mode development --config webpack.website.ts", - "preversion": "yarn run validate", + "preversion": "npm run validate", "version": "git add -A package.json", "prepare": "husky install" }, @@ -77,7 +78,7 @@ "prettier --write" ], "README.md": [ - "yarn run gen:toc-base" + "npm run gen:toc-base" ] }, "dependencies": {