Skip to content

F
fns_front_2
Commit b70bf61e authored by Zhang Xiaojie's avatar Zhang Xiaojie
Browse files
Options

Merge branch 'dev' of gitlab.33.cn:chenqikuai/fns_front_2 into dev

parents 73e83fe8 c7a57c71
Hide whitespace changes
Inline Side-by-side
Showing with 318 additions and 0 deletions
package-lock.json
View file @ b70bf61e
...@@ -1280,12 +1280,17 @@ ...@@ -1280,12 +1280,17 @@
"@nodelib/fs.scandir": { "@nodelib/fs.scandir": {
"version": "2.1.5", "version": "2.1.5",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622792738877&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz", "resolved": "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622792738877&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz",
"integrity": "sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U=", "integrity": "sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U=",
======= =======
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"@nodelib/fs.stat": "2.0.5", "@nodelib/fs.stat": "2.0.5",
...@@ -1295,12 +1300,17 @@ ...@@ -1295,12 +1300,17 @@
"@nodelib/fs.stat": { "@nodelib/fs.stat": {
"version": "2.0.5", "version": "2.0.5",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz", "resolved": "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz",
"integrity": "sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos=", "integrity": "sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos=",
======= =======
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
} }
} }
...@@ -1314,12 +1324,17 @@ ...@@ -1314,12 +1324,17 @@
"@nodelib/fs.walk": { "@nodelib/fs.walk": {
"version": "1.2.8", "version": "1.2.8",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz", "resolved": "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz",
"integrity": "sha1-6Vc36LtnRt3t9pxVaVNJTxlv5po=", "integrity": "sha1-6Vc36LtnRt3t9pxVaVNJTxlv5po=",
======= =======
"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"@nodelib/fs.scandir": "2.1.5", "@nodelib/fs.scandir": "2.1.5",
...@@ -1954,12 +1969,17 @@ ...@@ -1954,12 +1969,17 @@
"ansi-styles": { "ansi-styles": {
"version": "4.3.0", "version": "4.3.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
======= =======
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -1969,12 +1989,17 @@ ...@@ -1969,12 +1989,17 @@
"chalk": { "chalk": {
"version": "4.1.2", "version": "4.1.2",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz", "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
======= =======
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -1985,12 +2010,17 @@ ...@@ -1985,12 +2010,17 @@
"color-convert": { "color-convert": {
"version": "2.0.1", "version": "2.0.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz", "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
======= =======
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2000,24 +2030,34 @@ ...@@ -2000,24 +2030,34 @@
"color-name": { "color-name": {
"version": "1.1.4", "version": "1.1.4",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
======= =======
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"fork-ts-checker-webpack-plugin-v5": { "fork-ts-checker-webpack-plugin-v5": {
"version": "npm:fork-ts-checker-webpack-plugin@5.2.1", "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-5.2.1.tgz", "resolved": "https://registry.nlark.com/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-5.2.1.tgz",
"integrity": "sha1-eTJthpeXkG+osk4qvPlCH8gFRQ0=", "integrity": "sha1-eTJthpeXkG+osk4qvPlCH8gFRQ0=",
======= =======
"resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz", "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
"integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==", "integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
"integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2037,12 +2077,17 @@ ...@@ -2037,12 +2077,17 @@
"fs-extra": { "fs-extra": {
"version": "9.1.0", "version": "9.1.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-9.1.0.tgz", "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-9.1.0.tgz",
"integrity": "sha1-WVRGDHZKjaIJS6NVS/g55rmnyG0=", "integrity": "sha1-WVRGDHZKjaIJS6NVS/g55rmnyG0=",
======= =======
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
"integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
"integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2055,24 +2100,34 @@ ...@@ -2055,24 +2100,34 @@
"has-flag": { "has-flag": {
"version": "4.0.0", "version": "4.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz", "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
======= =======
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"jsonfile": { "jsonfile": {
"version": "6.1.0", "version": "6.1.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz", "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz",
"integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=", "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=",
======= =======
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2083,12 +2138,17 @@ ...@@ -2083,12 +2138,17 @@
"lru-cache": { "lru-cache": {
"version": "6.0.0", "version": "6.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz", "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz",
"integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=", "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=",
======= =======
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2098,12 +2158,17 @@ ...@@ -2098,12 +2158,17 @@
"schema-utils": { "schema-utils": {
"version": "2.7.0", "version": "2.7.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1626694835325&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz", "resolved": "https://registry.nlark.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1626694835325&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz",
"integrity": "sha1-FxUfdtjq5n+793lgwzxnatn078c=", "integrity": "sha1-FxUfdtjq5n+793lgwzxnatn078c=",
======= =======
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
"integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
"integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2115,12 +2180,17 @@ ...@@ -2115,12 +2180,17 @@
"semver": { "semver": {
"version": "7.3.5", "version": "7.3.5",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz", "resolved": "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz",
"integrity": "sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc=", "integrity": "sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc=",
======= =======
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2130,12 +2200,17 @@ ...@@ -2130,12 +2200,17 @@
"supports-color": { "supports-color": {
"version": "7.2.0", "version": "7.2.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz", "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
======= =======
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2145,24 +2220,34 @@ ...@@ -2145,24 +2220,34 @@
"universalify": { "universalify": {
"version": "2.0.0", "version": "2.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz",
"integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=", "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=",
======= =======
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"yallist": { "yallist": {
"version": "4.0.0", "version": "4.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz", "resolved": "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz",
"integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=", "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=",
======= =======
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true "optional": true
} }
...@@ -2247,12 +2332,17 @@ ...@@ -2247,12 +2332,17 @@
"ansi-styles": { "ansi-styles": {
"version": "4.3.0", "version": "4.3.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
======= =======
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2262,12 +2352,17 @@ ...@@ -2262,12 +2352,17 @@
"chalk": { "chalk": {
"version": "4.1.2", "version": "4.1.2",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz", "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
======= =======
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2278,12 +2373,17 @@ ...@@ -2278,12 +2373,17 @@
"color-convert": { "color-convert": {
"version": "2.0.1", "version": "2.0.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz", "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
======= =======
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2293,12 +2393,17 @@ ...@@ -2293,12 +2393,17 @@
"color-name": { "color-name": {
"version": "1.1.4", "version": "1.1.4",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
======= =======
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true "optional": true
}, },
...@@ -2325,24 +2430,34 @@ ...@@ -2325,24 +2430,34 @@
"has-flag": { "has-flag": {
"version": "4.0.0", "version": "4.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz", "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
======= =======
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"loader-utils": { "loader-utils": {
"version": "2.0.0", "version": "2.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
======= =======
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2369,12 +2484,17 @@ ...@@ -2369,12 +2484,17 @@
"supports-color": { "supports-color": {
"version": "7.2.0", "version": "7.2.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz", "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
======= =======
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -2384,12 +2504,17 @@ ...@@ -2384,12 +2504,17 @@
"vue-loader-v16": { "vue-loader-v16": {
"version": "npm:vue-loader@16.8.1", "version": "npm:vue-loader@16.8.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.1.tgz?cache=0&sync_timestamp=1632350159599&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.1.tgz", "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.1.tgz?cache=0&sync_timestamp=1632350159599&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.1.tgz",
"integrity": "sha1-NU8SvAiXlUFYtxWQ+AApVxOneS0=", "integrity": "sha1-NU8SvAiXlUFYtxWQ+AApVxOneS0=",
======= =======
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
"integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==", "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
"integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -3966,12 +4091,17 @@ ...@@ -3966,12 +4091,17 @@
"callsites": { "callsites": {
"version": "3.1.0", "version": "3.1.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz", "resolved": "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz",
"integrity": "sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M=", "integrity": "sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M=",
======= =======
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"camel-case": { "camel-case": {
...@@ -4952,12 +5082,17 @@ ...@@ -4952,12 +5082,17 @@
"css-unit-converter": { "css-unit-converter": {
"version": "1.1.2", "version": "1.1.2",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/css-unit-converter/download/css-unit-converter-1.1.2.tgz", "resolved": "https://registry.nlark.com/css-unit-converter/download/css-unit-converter-1.1.2.tgz",
"integrity": "sha1-THf1oZVObb/2BpXsshTjJwQ2qyE=", "integrity": "sha1-THf1oZVObb/2BpXsshTjJwQ2qyE=",
======= =======
"resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz", "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
"integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==", "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
"integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"css-what": { "css-what": {
...@@ -5513,12 +5648,17 @@ ...@@ -5513,12 +5648,17 @@
"didyoumean": { "didyoumean": {
"version": "1.2.2", "version": "1.2.2",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz?cache=0&sync_timestamp=1624543452248&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdidyoumean%2Fdownload%2Fdidyoumean-1.2.2.tgz", "resolved": "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz?cache=0&sync_timestamp=1624543452248&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdidyoumean%2Fdownload%2Fdidyoumean-1.2.2.tgz",
"integrity": "sha1-mJNG/+noObRVXs9WZu3qDT6K0Dc=", "integrity": "sha1-mJNG/+noObRVXs9WZu3qDT6K0Dc=",
======= =======
"resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
"integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
"integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"diff": { "diff": {
...@@ -7335,12 +7475,17 @@ ...@@ -7335,12 +7475,17 @@
"import-fresh": { "import-fresh": {
"version": "3.3.0", "version": "3.3.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469579940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz", "resolved": "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469579940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz",
"integrity": "sha1-NxYsJfy566oublPVtNiM4X2eDCs=", "integrity": "sha1-NxYsJfy566oublPVtNiM4X2eDCs=",
======= =======
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"parent-module": "^1.0.0", "parent-module": "^1.0.0",
...@@ -8710,12 +8855,17 @@ ...@@ -8710,12 +8855,17 @@
"modern-normalize": { "modern-normalize": {
"version": "1.1.0", "version": "1.1.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/modern-normalize/download/modern-normalize-1.1.0.tgz", "resolved": "https://registry.nlark.com/modern-normalize/download/modern-normalize-1.1.0.tgz",
"integrity": "sha1-2o6AFA2SIUJr1PclxuESg9NPkLc=", "integrity": "sha1-2o6AFA2SIUJr1PclxuESg9NPkLc=",
======= =======
"resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz", "resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz",
"integrity": "sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==", "integrity": "sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz",
"integrity": "sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"move-concurrently": { "move-concurrently": {
...@@ -8783,12 +8933,17 @@ ...@@ -8783,12 +8933,17 @@
"nanocolors": { "nanocolors": {
"version": "0.2.9", "version": "0.2.9",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npmmirror.com/nanocolors/download/nanocolors-0.2.9.tgz?cache=0&sync_timestamp=1632653708031&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnanocolors%2Fdownload%2Fnanocolors-0.2.9.tgz", "resolved": "https://registry.npmmirror.com/nanocolors/download/nanocolors-0.2.9.tgz?cache=0&sync_timestamp=1632653708031&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnanocolors%2Fdownload%2Fnanocolors-0.2.9.tgz",
"integrity": "sha1-MZxeenNXGr1g5NJzFQwsuVAXrFs=", "integrity": "sha1-MZxeenNXGr1g5NJzFQwsuVAXrFs=",
======= =======
"resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.9.tgz", "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.9.tgz",
"integrity": "sha512-aymgS4Xe0LMqHOHl7jSUEkFh/6O/pcF0j61dBtreQZ1nmbyYdYjSYSJzz0iPLbKPkMtSmdRgyBGywNZGjKOEfw==", "integrity": "sha512-aymgS4Xe0LMqHOHl7jSUEkFh/6O/pcF0j61dBtreQZ1nmbyYdYjSYSJzz0iPLbKPkMtSmdRgyBGywNZGjKOEfw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.9.tgz",
"integrity": "sha512-aymgS4Xe0LMqHOHl7jSUEkFh/6O/pcF0j61dBtreQZ1nmbyYdYjSYSJzz0iPLbKPkMtSmdRgyBGywNZGjKOEfw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"nanoid": { "nanoid": {
...@@ -8883,12 +9038,17 @@ ...@@ -8883,12 +9038,17 @@
"node-emoji": { "node-emoji": {
"version": "1.11.0", "version": "1.11.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672555671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz", "resolved": "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672555671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz",
"integrity": "sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw=", "integrity": "sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw=",
======= =======
"resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
"integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
"integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"lodash": "^4.17.21" "lodash": "^4.17.21"
...@@ -9695,12 +9855,17 @@ ...@@ -9695,12 +9855,17 @@
"path-type": { "path-type": {
"version": "4.0.0", "version": "4.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz", "resolved": "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz",
"integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=", "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=",
======= =======
"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"pause-stream": { "pause-stream": {
...@@ -9942,10 +10107,14 @@ ...@@ -9942,10 +10107,14 @@
"postcss-functions": { "postcss-functions": {
"version": "3.0.0", "version": "3.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/postcss-functions/download/postcss-functions-3.0.0.tgz", "resolved": "https://registry.npm.taobao.org/postcss-functions/download/postcss-functions-3.0.0.tgz",
======= =======
"resolved": "https://registry.npmjs.org/postcss-functions/-/postcss-functions-3.0.0.tgz", "resolved": "https://registry.npmjs.org/postcss-functions/-/postcss-functions-3.0.0.tgz",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/postcss-functions/-/postcss-functions-3.0.0.tgz",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"integrity": "sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=", "integrity": "sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9958,12 +10127,17 @@ ...@@ -9958,12 +10127,17 @@
"postcss": { "postcss": {
"version": "6.0.23", "version": "6.0.23",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npmmirror.com/postcss/download/postcss-6.0.23.tgz?cache=0&sync_timestamp=1632555261973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss%2Fdownload%2Fpostcss-6.0.23.tgz", "resolved": "https://registry.npmmirror.com/postcss/download/postcss-6.0.23.tgz?cache=0&sync_timestamp=1632555261973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss%2Fdownload%2Fpostcss-6.0.23.tgz",
"integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
======= =======
"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "^2.4.1", "chalk": "^2.4.1",
...@@ -9974,12 +10148,17 @@ ...@@ -9974,12 +10148,17 @@
"postcss-value-parser": { "postcss-value-parser": {
"version": "3.3.1", "version": "3.3.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz", "resolved": "https://registry.nlark.com/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz",
"integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=", "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
======= =======
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
} }
} }
...@@ -9987,12 +10166,17 @@ ...@@ -9987,12 +10166,17 @@
"postcss-js": { "postcss-js": {
"version": "2.0.3", "version": "2.0.3",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/postcss-js/download/postcss-js-2.0.3.tgz", "resolved": "https://registry.nlark.com/postcss-js/download/postcss-js-2.0.3.tgz",
"integrity": "sha1-qW8PI/89CM7H3FsRvxHF+Ad82rk=", "integrity": "sha1-qW8PI/89CM7H3FsRvxHF+Ad82rk=",
======= =======
"resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-2.0.3.tgz", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-2.0.3.tgz",
"integrity": "sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==", "integrity": "sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-2.0.3.tgz",
"integrity": "sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"camelcase-css": "^2.0.1", "camelcase-css": "^2.0.1",
...@@ -10250,12 +10434,17 @@ ...@@ -10250,12 +10434,17 @@
"postcss-nested": { "postcss-nested": {
"version": "4.2.3", "version": "4.2.3",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/postcss-nested/download/postcss-nested-4.2.3.tgz?cache=0&sync_timestamp=1627468122159&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-4.2.3.tgz", "resolved": "https://registry.nlark.com/postcss-nested/download/postcss-nested-4.2.3.tgz?cache=0&sync_timestamp=1627468122159&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-4.2.3.tgz",
"integrity": "sha1-xvJVsKcgVJd20iDQDEtwzSRBNvY=", "integrity": "sha1-xvJVsKcgVJd20iDQDEtwzSRBNvY=",
======= =======
"resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.3.tgz", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.3.tgz",
"integrity": "sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==", "integrity": "sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.3.tgz",
"integrity": "sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"postcss": "^7.0.32", "postcss": "^7.0.32",
...@@ -10750,10 +10939,14 @@ ...@@ -10750,10 +10939,14 @@
"pretty-hrtime": { "pretty-hrtime": {
"version": "1.0.3", "version": "1.0.3",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/pretty-hrtime/download/pretty-hrtime-1.0.3.tgz", "resolved": "https://registry.nlark.com/pretty-hrtime/download/pretty-hrtime-1.0.3.tgz",
======= =======
"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
"dev": true "dev": true
}, },
...@@ -10921,12 +11114,17 @@ ...@@ -10921,12 +11114,17 @@
"purgecss": { "purgecss": {
"version": "4.0.3", "version": "4.0.3",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/purgecss/download/purgecss-4.0.3.tgz", "resolved": "https://registry.npm.taobao.org/purgecss/download/purgecss-4.0.3.tgz",
"integrity": "sha1-gUe0KfnAnbcZ4F1kkI6otnKRN0I=", "integrity": "sha1-gUe0KfnAnbcZ4F1kkI6otnKRN0I=",
======= =======
"resolved": "https://registry.npmjs.org/purgecss/-/purgecss-4.0.3.tgz", "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-4.0.3.tgz",
"integrity": "sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw==", "integrity": "sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/purgecss/-/purgecss-4.0.3.tgz",
"integrity": "sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "^6.0.0", "commander": "^6.0.0",
...@@ -10938,23 +11136,33 @@ ...@@ -10938,23 +11136,33 @@
"commander": { "commander": {
"version": "6.2.1", "version": "6.2.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/commander/download/commander-6.2.1.tgz", "resolved": "https://registry.nlark.com/commander/download/commander-6.2.1.tgz",
"integrity": "sha1-B5LraC37wyWZm7K4T93duhEKxzw=", "integrity": "sha1-B5LraC37wyWZm7K4T93duhEKxzw=",
======= =======
"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"postcss": { "postcss": {
"version": "8.3.8", "version": "8.3.8",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npmmirror.com/postcss/download/postcss-8.3.8.tgz?cache=0&sync_timestamp=1632555261973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss%2Fdownload%2Fpostcss-8.3.8.tgz", "resolved": "https://registry.npmmirror.com/postcss/download/postcss-8.3.8.tgz?cache=0&sync_timestamp=1632555261973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss%2Fdownload%2Fpostcss-8.3.8.tgz",
"integrity": "sha1-nr4qEnOWtLRXCun3dw5/uD2yusE=", "integrity": "sha1-nr4qEnOWtLRXCun3dw5/uD2yusE=",
======= =======
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.8.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.8.tgz",
"integrity": "sha512-GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA==", "integrity": "sha512-GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.8.tgz",
"integrity": "sha512-GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"nanocolors": "^0.2.2", "nanocolors": "^0.2.2",
...@@ -11200,12 +11408,17 @@ ...@@ -11200,12 +11408,17 @@
"postcss-value-parser": { "postcss-value-parser": {
"version": "3.3.1", "version": "3.3.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz", "resolved": "https://registry.nlark.com/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz",
"integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=", "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
======= =======
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
} }
} }
...@@ -11527,12 +11740,17 @@ ...@@ -11527,12 +11740,17 @@
"resolve-from": { "resolve-from": {
"version": "4.0.0", "version": "4.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz", "resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz",
"integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=", "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
======= =======
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"resolve-url": { "resolve-url": {
...@@ -11601,12 +11819,17 @@ ...@@ -11601,12 +11819,17 @@
"run-parallel": { "run-parallel": {
"version": "1.2.0", "version": "1.2.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/run-parallel/download/run-parallel-1.2.0.tgz", "resolved": "https://registry.nlark.com/run-parallel/download/run-parallel-1.2.0.tgz",
"integrity": "sha1-ZtE2jae9+SHrnZW9GpIp5/IaQ+4=", "integrity": "sha1-ZtE2jae9+SHrnZW9GpIp5/IaQ+4=",
======= =======
"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"queue-microtask": "^1.2.2" "queue-microtask": "^1.2.2"
...@@ -12844,23 +13067,33 @@ ...@@ -12844,23 +13067,33 @@
"@nodelib/fs.stat": { "@nodelib/fs.stat": {
"version": "2.0.5", "version": "2.0.5",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz", "resolved": "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz",
"integrity": "sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos=", "integrity": "sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos=",
======= =======
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"ansi-styles": { "ansi-styles": {
"version": "4.3.0", "version": "4.3.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
======= =======
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"color-convert": "^2.0.1" "color-convert": "^2.0.1"
...@@ -12869,12 +13102,17 @@ ...@@ -12869,12 +13102,17 @@
"braces": { "braces": {
"version": "3.0.2", "version": "3.0.2",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/braces/download/braces-3.0.2.tgz", "resolved": "https://registry.nlark.com/braces/download/braces-3.0.2.tgz",
"integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=", "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=",
======= =======
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"fill-range": "^7.0.1" "fill-range": "^7.0.1"
...@@ -12883,12 +13121,17 @@ ...@@ -12883,12 +13121,17 @@
"chalk": { "chalk": {
"version": "4.1.2", "version": "4.1.2",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz", "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
======= =======
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"ansi-styles": "^4.1.0", "ansi-styles": "^4.1.0",
...@@ -12898,12 +13141,17 @@ ...@@ -12898,12 +13141,17 @@
"color": { "color": {
"version": "4.0.1", "version": "4.0.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/color/download/color-4.0.1.tgz?cache=0&sync_timestamp=1628104040071&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcolor%2Fdownload%2Fcolor-4.0.1.tgz", "resolved": "https://registry.nlark.com/color/download/color-4.0.1.tgz?cache=0&sync_timestamp=1628104040071&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcolor%2Fdownload%2Fcolor-4.0.1.tgz",
"integrity": "sha1-Id9EzRAkWpGxzPW6AxYJsOEOfWc=", "integrity": "sha1-Id9EzRAkWpGxzPW6AxYJsOEOfWc=",
======= =======
"resolved": "https://registry.npmjs.org/color/-/color-4.0.1.tgz", "resolved": "https://registry.npmjs.org/color/-/color-4.0.1.tgz",
"integrity": "sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==", "integrity": "sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/color/-/color-4.0.1.tgz",
"integrity": "sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"color-convert": "^2.0.1", "color-convert": "^2.0.1",
...@@ -12913,12 +13161,17 @@ ...@@ -12913,12 +13161,17 @@
"color-convert": { "color-convert": {
"version": "2.0.1", "version": "2.0.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz", "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
======= =======
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"color-name": "~1.1.4" "color-name": "~1.1.4"
...@@ -12933,12 +13186,17 @@ ...@@ -12933,12 +13186,17 @@
"cosmiconfig": { "cosmiconfig": {
"version": "7.0.1", "version": "7.0.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz", "resolved": "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz",
"integrity": "sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0=", "integrity": "sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0=",
======= =======
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"@types/parse-json": "^4.0.0", "@types/parse-json": "^4.0.0",
...@@ -12964,12 +13222,17 @@ ...@@ -12964,12 +13222,17 @@
"glob-parent": { "glob-parent": {
"version": "5.1.2", "version": "5.1.2",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1626760165717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz", "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1626760165717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz",
"integrity": "sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ=", "integrity": "sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ=",
======= =======
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"is-glob": "^4.0.1" "is-glob": "^4.0.1"
...@@ -13000,12 +13263,17 @@ ...@@ -13000,12 +13263,17 @@
"glob-parent": { "glob-parent": {
"version": "6.0.1", "version": "6.0.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-6.0.1.tgz?cache=0&sync_timestamp=1626760165717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.1.tgz", "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-6.0.1.tgz?cache=0&sync_timestamp=1626760165717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.1.tgz",
"integrity": "sha1-QgVPaF62pE56fRialu+kClSXGqc=", "integrity": "sha1-QgVPaF62pE56fRialu+kClSXGqc=",
======= =======
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz",
"integrity": "sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==", "integrity": "sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz",
"integrity": "sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"is-glob": "^4.0.1" "is-glob": "^4.0.1"
...@@ -13014,23 +13282,33 @@ ...@@ -13014,23 +13282,33 @@
"has-flag": { "has-flag": {
"version": "4.0.0", "version": "4.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz", "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
======= =======
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"import-cwd": { "import-cwd": {
"version": "3.0.0", "version": "3.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/import-cwd/download/import-cwd-3.0.0.tgz", "resolved": "https://registry.nlark.com/import-cwd/download/import-cwd-3.0.0.tgz",
"integrity": "sha1-IIRVR3GAFRJuqbNna3WS+4vUz5I=", "integrity": "sha1-IIRVR3GAFRJuqbNna3WS+4vUz5I=",
======= =======
"resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
"integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==", "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
"integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"import-from": "^3.0.0" "import-from": "^3.0.0"
...@@ -13054,12 +13332,17 @@ ...@@ -13054,12 +13332,17 @@
"jsonfile": { "jsonfile": {
"version": "6.1.0", "version": "6.1.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz", "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz",
"integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=", "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=",
======= =======
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"graceful-fs": "^4.1.6", "graceful-fs": "^4.1.6",
...@@ -13069,12 +13352,17 @@ ...@@ -13069,12 +13352,17 @@
"micromatch": { "micromatch": {
"version": "4.0.4", "version": "4.0.4",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/micromatch/download/micromatch-4.0.4.tgz", "resolved": "https://registry.nlark.com/micromatch/download/micromatch-4.0.4.tgz",
"integrity": "sha1-iW1Rnf6dsl/OlM63pQCRm/iB6/k=", "integrity": "sha1-iW1Rnf6dsl/OlM63pQCRm/iB6/k=",
======= =======
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"braces": "^3.0.1", "braces": "^3.0.1",
...@@ -13095,23 +13383,33 @@ ...@@ -13095,23 +13383,33 @@
"resolve-from": { "resolve-from": {
"version": "5.0.0", "version": "5.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz", "resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz",
"integrity": "sha1-w1IlhD3493bfIcV1V7wIfp39/Gk=", "integrity": "sha1-w1IlhD3493bfIcV1V7wIfp39/Gk=",
======= =======
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"supports-color": { "supports-color": {
"version": "7.2.0", "version": "7.2.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz", "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
======= =======
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"has-flag": "^4.0.0" "has-flag": "^4.0.0"
...@@ -13120,12 +13418,17 @@ ...@@ -13120,12 +13418,17 @@
"to-regex-range": { "to-regex-range": {
"version": "5.0.1", "version": "5.0.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/to-regex-range/download/to-regex-range-5.0.1.tgz", "resolved": "https://registry.nlark.com/to-regex-range/download/to-regex-range-5.0.1.tgz",
"integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=", "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=",
======= =======
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"is-number": "^7.0.0" "is-number": "^7.0.0"
...@@ -13134,12 +13437,17 @@ ...@@ -13134,12 +13437,17 @@
"universalify": { "universalify": {
"version": "2.0.0", "version": "2.0.0",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz",
"integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=", "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=",
======= =======
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
} }
} }
...@@ -13367,12 +13675,17 @@ ...@@ -13367,12 +13675,17 @@
"tmp": { "tmp": {
"version": "0.2.1", "version": "0.2.1",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz", "resolved": "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz",
"integrity": "sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ=", "integrity": "sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ=",
======= =======
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true, "dev": true,
"requires": { "requires": {
"rimraf": "^3.0.0" "rimraf": "^3.0.0"
...@@ -15055,12 +15368,17 @@ ...@@ -15055,12 +15368,17 @@
"yaml": { "yaml": {
"version": "1.10.2", "version": "1.10.2",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
"resolved": "https://registry.nlark.com/yaml/download/yaml-1.10.2.tgz", "resolved": "https://registry.nlark.com/yaml/download/yaml-1.10.2.tgz",
"integrity": "sha1-IwHF/78StGfejaIzOkWeKeeSDks=", "integrity": "sha1-IwHF/78StGfejaIzOkWeKeeSDks=",
======= =======
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad >>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
=======
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
"dev": true "dev": true
}, },
"yargs": { "yargs": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment