diff --git a/public/.htaccess b/public/.htaccess new file mode 100644 index 0000000..83731ca --- /dev/null +++ b/public/.htaccess @@ -0,0 +1,6 @@ +RewriteEngine On +RewriteBase / +RewriteRule ^index\.html$ - [L] +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule . /index.html [L] \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 0c07a5e..dd58c96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2313,15 +2313,9 @@ acorn-jsx@^5.3.1: resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -<<<<<<< HEAD -acorn-node@^1.6.1: - version "1.8.2" - resolved "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz" -======= acorn-node@^1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== dependencies: acorn "^7.0.0" @@ -2499,15 +2493,9 @@ arg@^4.1.0: integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== arg@^5.0.1: -<<<<<<< HEAD - version "5.0.1" - resolved "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz" - integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA== -======= version "5.0.2" resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 argparse@^1.0.7: version "1.0.10" @@ -3176,11 +3164,7 @@ builtin-status-codes@^3.0.0: resolved "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz" integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= -<<<<<<< HEAD -bytes@3.0.0, bytes@^3.0.0: -======= bytes@3.0.0: ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 version "3.0.0" resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= @@ -3190,14 +3174,11 @@ bytes@3.1.1: resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz" integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== -<<<<<<< HEAD -======= bytes@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 cacache@^12.0.2: version "12.0.4" resolved "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz" @@ -3560,11 +3541,7 @@ color-name@~1.1.4: resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -<<<<<<< HEAD -color-string@^1.6.0, color-string@^1.9.0: -======= color-string@^1.6.0: ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 version "1.9.0" resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz" integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ== @@ -3572,8 +3549,6 @@ color-string@^1.6.0: color-name "^1.0.0" simple-swizzle "^0.2.2" -<<<<<<< HEAD -======= color-string@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" @@ -3582,7 +3557,6 @@ color-string@^1.9.0: color-name "^1.0.0" simple-swizzle "^0.2.2" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 color@^3.0.0: version "3.2.1" resolved "https://registry.npmjs.org/color/-/color-3.2.1.tgz" @@ -3592,15 +3566,9 @@ color@^3.0.0: color-string "^1.6.0" color@^4.0.1: -<<<<<<< HEAD - version "4.2.0" - resolved "https://registry.npmjs.org/color/-/color-4.2.0.tgz" - integrity sha512-hHTcrbvEnGjC7WBMk6ibQWFVDgEFTVmjrz2Q5HlU6ltwxv0JJN2Z8I7uRbWeQLF04dikxs8zgyZkazRJvSMtyQ== -======= version "4.2.3" resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a" integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 dependencies: color-convert "^2.0.1" color-string "^1.9.0" @@ -3629,11 +3597,7 @@ commander@^7.0.0: commander@^8.0.0: version "8.3.0" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz" -======= resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== common-tags@^1.8.0: @@ -4003,11 +3967,7 @@ css-tree@^1.1.2: css-unit-converter@^1.1.1: version "1.1.2" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz" -======= resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA== css-what@^3.2.1: @@ -4358,15 +4318,6 @@ detect-port-alt@1.1.6: debug "^2.6.0" detective@^5.2.0: -<<<<<<< HEAD - version "5.2.0" - resolved "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz" - integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg== - dependencies: - acorn-node "^1.6.1" - defined "^1.0.0" - minimist "^1.1.1" -======= version "5.2.1" resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034" integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw== @@ -4374,7 +4325,6 @@ detective@^5.2.0: acorn-node "^1.8.2" defined "^1.0.0" minimist "^1.2.6" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 didyoumean@^1.2.2: version "1.2.2" @@ -5456,15 +5406,9 @@ from2@^2.1.0: readable-stream "^2.0.0" fs-extra@^10.0.0: -<<<<<<< HEAD - version "10.0.0" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz" - integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== -======= version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -5644,20 +5588,12 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: glob-parent@^6.0.1: version "6.0.2" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz" -======= resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== dependencies: is-glob "^4.0.3" -<<<<<<< HEAD -glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: -======= glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 version "7.2.0" resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -5669,8 +5605,6 @@ glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -<<<<<<< HEAD -======= glob@^7.1.7: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -5683,7 +5617,6 @@ glob@^7.1.7: once "^1.3.0" path-is-absolute "^1.0.0" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 global-modules@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz" @@ -5966,15 +5899,9 @@ html-minifier-terser@^5.0.1: terser "^4.6.3" html-tags@^3.1.0: -<<<<<<< HEAD - version "3.1.0" - resolved "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz" - integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== -======= version "3.2.0" resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961" integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 html-webpack-plugin@4.5.0: version "4.5.0" @@ -7399,17 +7326,10 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -<<<<<<< HEAD -lilconfig@^2.0.4: - version "2.0.4" - resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz" - integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== -======= lilconfig@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25" integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 lines-and-columns@^1.1.6: version "1.2.4" @@ -7522,13 +7442,8 @@ lodash.templatesettings@^4.0.0: lodash.topath@^4.5.2: version "4.5.2" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/lodash.topath/-/lodash.topath-4.5.2.tgz" - integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak= -======= resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009" integrity sha512-1/W4dM+35DwvE/iEd1M9ekewOSTlpFekhw9mhAtrwjVqUr83/ilQiyAvmg4tVX7Unkcfl1KC+i9WdaT4B6aQcg== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 lodash.truncate@^4.4.2: version "4.4.2" @@ -7827,8 +7742,6 @@ minimatch@3.0.4, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -<<<<<<< HEAD -======= minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -7836,20 +7749,16 @@ minimatch@^3.1.1: dependencies: brace-expansion "^1.1.7" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -<<<<<<< HEAD -======= minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz" @@ -7924,11 +7833,7 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: modern-normalize@^1.1.0: version "1.1.0" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz" -======= resolved "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.1.0.tgz#da8e80140d9221426bd4f725c6e11283d34f90b7" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA== moment@^2.26.0: @@ -7996,14 +7901,11 @@ nanoid@^3.1.30: resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz" integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== -<<<<<<< HEAD -======= nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz" @@ -8063,11 +7965,7 @@ no-case@^3.0.4: node-emoji@^1.11.0: version "1.11.0" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz" -======= resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A== dependencies: lodash "^4.17.21" @@ -8229,11 +8127,7 @@ object-copy@^0.1.0: object-hash@^2.2.0: version "2.2.0" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz" -======= resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== object-inspect@^1.11.0, object-inspect@^1.9.0: @@ -8932,13 +8826,8 @@ postcss-font-variant@^4.0.0: postcss-functions@^3: version "3.0.0" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/postcss-functions/-/postcss-functions-3.0.0.tgz" - integrity sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4= -======= resolved "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-3.0.0.tgz#0e94d01444700a481de20de4d55fb2640564250e" integrity sha512-N5yWXWKA+uhpLQ9ZhBRl2bIAdM6oVJYpDojuI1nF2SzXBimJcdjFwiAouBVbO5VuOF3qA6BSFWFc3wXbbj72XQ== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 dependencies: glob "^7.1.2" object-assign "^4.1.1" @@ -8969,11 +8858,7 @@ postcss-initial@^3.0.0: postcss-js@^2: version "2.0.3" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/postcss-js/-/postcss-js-2.0.3.tgz" -======= resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.3.tgz#a96f0f23ff3d08cec7dc5b11bf11c5f8077cdab9" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w== dependencies: camelcase-css "^2.0.1" @@ -8997,19 +8882,11 @@ postcss-load-config@^2.0.0: import-cwd "^2.0.0" postcss-load-config@^3.1.0: -<<<<<<< HEAD - version "3.1.1" - resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz" - integrity sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg== - dependencies: - lilconfig "^2.0.4" -======= version "3.1.4" resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== dependencies: lilconfig "^2.0.5" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 yaml "^1.10.2" postcss-loader@3.0.0: @@ -9133,11 +9010,7 @@ postcss-modules-values@^3.0.0: postcss-nested@^4: version "4.2.3" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.3.tgz" -======= resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw== dependencies: postcss "^7.0.32" @@ -9448,11 +9321,7 @@ postcss@7.0.36: postcss@^6.0.9: version "6.0.23" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz" -======= resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== dependencies: chalk "^2.4.1" @@ -9467,11 +9336,7 @@ postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, po picocolors "^0.2.1" source-map "^0.6.1" -<<<<<<< HEAD -postcss@^8.1.0, postcss@^8.3.5: -======= postcss@^8.1.0: ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 version "8.4.5" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz" integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg== @@ -9480,8 +9345,6 @@ postcss@^8.1.0: picocolors "^1.0.0" source-map-js "^1.0.1" -<<<<<<< HEAD -======= postcss@^8.3.5: version "8.4.14" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" @@ -9491,7 +9354,6 @@ postcss@^8.3.5: picocolors "^1.0.0" source-map-js "^1.0.2" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 potpack@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/potpack/-/potpack-1.0.2.tgz" @@ -9546,13 +9408,8 @@ pretty-format@^27.0.0, pretty-format@^27.4.6: pretty-hrtime@^1.0.3: version "1.0.3" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz" - integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= -======= resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A== ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 process-nextick-args@~2.0.0: version "2.0.1" @@ -9675,11 +9532,7 @@ punycode@^2.1.0, punycode@^2.1.1: purgecss@^4.0.3: version "4.1.3" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/purgecss/-/purgecss-4.1.3.tgz" -======= resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.3.tgz#683f6a133c8c4de7aa82fe2746d1393b214918f7" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-99cKy4s+VZoXnPxaoM23e5ABcP851nC2y2GROkkjS8eJaJtlciGavd7iYAw2V84WeBqggZ12l8ef44G99HmTaw== dependencies: commander "^8.0.0" @@ -10095,11 +9948,7 @@ redent@^3.0.0: reduce-css-calc@^2.1.8: version "2.1.8" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz" -======= resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz#7ef8761a28d614980dc0c982f772c93f7a99de03" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg== dependencies: css-unit-converter "^1.1.1" @@ -10874,11 +10723,7 @@ source-list-map@^2.0.0: resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -<<<<<<< HEAD -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1: -======= "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 version "1.0.2" resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -11329,11 +11174,7 @@ table@^6.0.9: "tailwindcss@npm:@tailwindcss/postcss7-compat@^2.2.17": version "2.2.17" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/@tailwindcss/postcss7-compat/-/postcss7-compat-2.2.17.tgz" -======= resolved "https://registry.yarnpkg.com/@tailwindcss/postcss7-compat/-/postcss7-compat-2.2.17.tgz#dc78f3880a2af84163150ff426a39e42b9ae8922" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-3h2svqQAqYHxRZ1KjsJjZOVTQ04m29LjfrLjXyZZEJuvUuJN+BCIF9GI8vhE1s0plS0mogd6E6YLg6mu4Wv/Vw== dependencies: arg "^5.0.1" @@ -11522,11 +11363,7 @@ tmp@^0.0.33: tmp@^0.2.1: version "0.2.1" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz" -======= resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" ->>>>>>> e26ec812048f56943cda3afa8dc7abd57006b3c0 integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== dependencies: rimraf "^3.0.0"