|
|
@@ -1,8 +1,9 @@
|
|
1
|
1
|
{
|
|
2
|
2
|
"name": "vite-project",
|
|
3
|
3
|
"version": "0.0.0",
|
|
4
|
|
- "lockfileVersion": 2,
|
|
|
4
|
+ "lockfileVersion": 1,
|
|
5
|
5
|
"requires": true,
|
|
|
6
|
+<<<<<<< HEAD
|
|
6
|
7
|
"packages": {
|
|
7
|
8
|
"": {
|
|
8
|
9
|
"name": "vite-project",
|
|
|
@@ -5145,6 +5146,8 @@
|
|
5145
|
5146
|
"dev": true
|
|
5146
|
5147
|
}
|
|
5147
|
5148
|
},
|
|
|
5149
|
+=======
|
|
|
5150
|
+>>>>>>> :sparkles: sse push updates!
|
|
5148
|
5151
|
"dependencies": {
|
|
5149
|
5152
|
"@babel/helper-validator-identifier": {
|
|
5150
|
5153
|
"version": "7.15.7",
|
|
|
@@ -5175,11 +5178,18 @@
|
|
5175
|
5178
|
"requires": {}
|
|
5176
|
5179
|
},
|
|
5177
|
5180
|
"@css-render/vue3-ssr": {
|
|
|
5181
|
+<<<<<<< HEAD
|
|
5178
|
5182
|
"version": "0.15.9",
|
|
5179
|
5183
|
"resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.9.tgz",
|
|
5180
|
5184
|
"integrity": "sha512-b3wvEIZYjToOEAV/oUqVtcg+MPF/iSZB9VmVF7fMAAAfvVTc2kB4TZDhGZCMkGjGZxOUm1jia7q/Z9FJnJGLKw==",
|
|
5181
|
5185
|
"dev": true,
|
|
5182
|
5186
|
"requires": {}
|
|
|
5187
|
+=======
|
|
|
5188
|
+ "version": "0.15.6",
|
|
|
5189
|
+ "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.6.tgz",
|
|
|
5190
|
+ "integrity": "sha512-aBb5tIezKlM7PycXoek/46oGO3kRg5Y+FgE3RGGKwvv8CAnLhdk5b3UM0LDIRfXdI+vxA/kSgk4pz9f7nDqGjA==",
|
|
|
5191
|
+ "dev": true
|
|
|
5192
|
+>>>>>>> :sparkles: sse push updates!
|
|
5183
|
5193
|
},
|
|
5184
|
5194
|
"@csstools/convert-colors": {
|
|
5185
|
5195
|
"version": "1.4.0",
|
|
|
@@ -5331,11 +5341,18 @@
|
|
5331
|
5341
|
"dev": true
|
|
5332
|
5342
|
},
|
|
5333
|
5343
|
"@vitejs/plugin-vue": {
|
|
|
5344
|
+<<<<<<< HEAD
|
|
5334
|
5345
|
"version": "2.2.4",
|
|
5335
|
5346
|
"resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-2.2.4.tgz",
|
|
5336
|
5347
|
"integrity": "sha512-ev9AOlp0ljCaDkFZF3JwC/pD2N4Hh+r5srl5JHM6BKg5+99jiiK0rE/XaRs3pVm1wzyKkjUy/StBSoXX5fFzcw==",
|
|
5337
|
5348
|
"dev": true,
|
|
5338
|
5349
|
"requires": {}
|
|
|
5350
|
+=======
|
|
|
5351
|
+ "version": "1.2.2",
|
|
|
5352
|
+ "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.2.2.tgz",
|
|
|
5353
|
+ "integrity": "sha512-5BI2WFfs/Z0pAV4S/IQf1oH3bmFYlL5ATMBHgTt1Lf7hAnfpNd5oUAAs6hZPfk3QhvyUQgtk0rJBlabwNFcBJQ==",
|
|
|
5354
|
+ "dev": true
|
|
|
5355
|
+>>>>>>> :sparkles: sse push updates!
|
|
5339
|
5356
|
},
|
|
5340
|
5357
|
"@vue/compiler-core": {
|
|
5341
|
5358
|
"version": "3.2.31",
|
|
|
@@ -5462,8 +5479,7 @@
|
|
5462
|
5479
|
"version": "0.12.1",
|
|
5463
|
5480
|
"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.1.tgz",
|
|
5464
|
5481
|
"integrity": "sha512-QL3ny+wX8c6Xm1/EZylbgzdoDolye+VpCXRhI2hug9dJTP3OUJ3lmiKN3CsVV3mOJKwFi0nsstbgob0vG7aoIw==",
|
|
5465
|
|
- "dev": true,
|
|
5466
|
|
- "requires": {}
|
|
|
5482
|
+ "dev": true
|
|
5467
|
5483
|
}
|
|
5468
|
5484
|
}
|
|
5469
|
5485
|
},
|
|
|
@@ -5480,8 +5496,7 @@
|
|
5480
|
5496
|
"version": "0.12.1",
|
|
5481
|
5497
|
"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.1.tgz",
|
|
5482
|
5498
|
"integrity": "sha512-QL3ny+wX8c6Xm1/EZylbgzdoDolye+VpCXRhI2hug9dJTP3OUJ3lmiKN3CsVV3mOJKwFi0nsstbgob0vG7aoIw==",
|
|
5483
|
|
- "dev": true,
|
|
5484
|
|
- "requires": {}
|
|
|
5499
|
+ "dev": true
|
|
5485
|
5500
|
}
|
|
5486
|
5501
|
}
|
|
5487
|
5502
|
},
|
|
|
@@ -5495,8 +5510,7 @@
|
|
5495
|
5510
|
"version": "5.3.2",
|
|
5496
|
5511
|
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
|
|
5497
|
5512
|
"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
|
|
5498
|
|
- "dev": true,
|
|
5499
|
|
- "requires": {}
|
|
|
5513
|
+ "dev": true
|
|
5500
|
5514
|
},
|
|
5501
|
5515
|
"ajv": {
|
|
5502
|
5516
|
"version": "6.12.6",
|
|
|
@@ -5884,11 +5898,18 @@
|
|
5884
|
5898
|
"dev": true
|
|
5885
|
5899
|
},
|
|
5886
|
5900
|
"date-fns-tz": {
|
|
|
5901
|
+<<<<<<< HEAD
|
|
5887
|
5902
|
"version": "1.3.0",
|
|
5888
|
5903
|
"resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.0.tgz",
|
|
5889
|
5904
|
"integrity": "sha512-r6ye6PmGEvkF467/41qzU71oGwv9kHTnV3vtSZdyV6VThwPID47ZH7FtR7zQWrhgOUWkYySm2ems2w6ZfNUqoA==",
|
|
5890
|
5905
|
"dev": true,
|
|
5891
|
5906
|
"requires": {}
|
|
|
5907
|
+=======
|
|
|
5908
|
+ "version": "1.1.6",
|
|
|
5909
|
+ "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.1.6.tgz",
|
|
|
5910
|
+ "integrity": "sha512-nyy+URfFI3KUY7udEJozcoftju+KduaqkVfwyTIE0traBiVye09QnyWKLZK7drRr5h9B7sPJITmQnS3U6YOdQg==",
|
|
|
5911
|
+ "dev": true
|
|
|
5912
|
+>>>>>>> :sparkles: sse push updates!
|
|
5892
|
5913
|
},
|
|
5893
|
5914
|
"debug": {
|
|
5894
|
5915
|
"version": "4.3.2",
|
|
|
@@ -6252,11 +6273,18 @@
|
|
6252
|
6273
|
}
|
|
6253
|
6274
|
},
|
|
6254
|
6275
|
"eslint-config-prettier": {
|
|
|
6276
|
+<<<<<<< HEAD
|
|
6255
|
6277
|
"version": "8.5.0",
|
|
6256
|
6278
|
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
|
|
6257
|
6279
|
"integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
|
|
6258
|
6280
|
"dev": true,
|
|
6259
|
6281
|
"requires": {}
|
|
|
6282
|
+=======
|
|
|
6283
|
+ "version": "8.3.0",
|
|
|
6284
|
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
|
|
|
6285
|
+ "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
|
|
|
6286
|
+ "dev": true
|
|
|
6287
|
+>>>>>>> :sparkles: sse push updates!
|
|
6260
|
6288
|
},
|
|
6261
|
6289
|
"eslint-plugin-vue": {
|
|
6262
|
6290
|
"version": "8.5.0",
|
|
|
@@ -6628,6 +6656,21 @@
|
|
6628
|
6656
|
"safer-buffer": ">= 2.1.2 < 3"
|
|
6629
|
6657
|
}
|
|
6630
|
6658
|
},
|
|
|
6659
|
+<<<<<<< HEAD
|
|
|
6660
|
+=======
|
|
|
6661
|
+ "icss-replace-symbols": {
|
|
|
6662
|
+ "version": "1.1.0",
|
|
|
6663
|
+ "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
|
|
|
6664
|
+ "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
|
|
|
6665
|
+ "dev": true
|
|
|
6666
|
+ },
|
|
|
6667
|
+ "icss-utils": {
|
|
|
6668
|
+ "version": "5.1.0",
|
|
|
6669
|
+ "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
|
|
|
6670
|
+ "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
|
|
|
6671
|
+ "dev": true
|
|
|
6672
|
+ },
|
|
|
6673
|
+>>>>>>> :sparkles: sse push updates!
|
|
6631
|
6674
|
"ignore": {
|
|
6632
|
6675
|
"version": "5.2.0",
|
|
6633
|
6676
|
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
|
|
|
@@ -7070,7 +7113,12 @@
|
|
7070
|
7113
|
"nanoid": {
|
|
7071
|
7114
|
"version": "3.3.1",
|
|
7072
|
7115
|
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
|
|
|
7116
|
+<<<<<<< HEAD
|
|
7073
|
7117
|
"integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
|
|
|
7118
|
+=======
|
|
|
7119
|
+ "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
|
|
|
7120
|
+ "dev": true
|
|
|
7121
|
+>>>>>>> :sparkles: sse push updates!
|
|
7074
|
7122
|
},
|
|
7075
|
7123
|
"natural-compare": {
|
|
7076
|
7124
|
"version": "1.4.0",
|
|
|
@@ -7847,6 +7895,60 @@
|
|
7847
|
7895
|
}
|
|
7848
|
7896
|
}
|
|
7849
|
7897
|
},
|
|
|
7898
|
+<<<<<<< HEAD
|
|
|
7899
|
+=======
|
|
|
7900
|
+ "postcss-modules": {
|
|
|
7901
|
+ "version": "4.0.0",
|
|
|
7902
|
+ "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.0.0.tgz",
|
|
|
7903
|
+ "integrity": "sha512-ghS/ovDzDqARm4Zj6L2ntadjyQMoyJmi0JkLlYtH2QFLrvNlxH5OAVRPWPeKilB0pY7SbuhO173KOWkPAxRJcw==",
|
|
|
7904
|
+ "dev": true,
|
|
|
7905
|
+ "requires": {
|
|
|
7906
|
+ "generic-names": "^2.0.1",
|
|
|
7907
|
+ "icss-replace-symbols": "^1.1.0",
|
|
|
7908
|
+ "lodash.camelcase": "^4.3.0",
|
|
|
7909
|
+ "postcss-modules-extract-imports": "^3.0.0",
|
|
|
7910
|
+ "postcss-modules-local-by-default": "^4.0.0",
|
|
|
7911
|
+ "postcss-modules-scope": "^3.0.0",
|
|
|
7912
|
+ "postcss-modules-values": "^4.0.0",
|
|
|
7913
|
+ "string-hash": "^1.1.1"
|
|
|
7914
|
+ }
|
|
|
7915
|
+ },
|
|
|
7916
|
+ "postcss-modules-extract-imports": {
|
|
|
7917
|
+ "version": "3.0.0",
|
|
|
7918
|
+ "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
|
|
|
7919
|
+ "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
|
|
|
7920
|
+ "dev": true
|
|
|
7921
|
+ },
|
|
|
7922
|
+ "postcss-modules-local-by-default": {
|
|
|
7923
|
+ "version": "4.0.0",
|
|
|
7924
|
+ "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
|
|
|
7925
|
+ "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
|
|
|
7926
|
+ "dev": true,
|
|
|
7927
|
+ "requires": {
|
|
|
7928
|
+ "icss-utils": "^5.0.0",
|
|
|
7929
|
+ "postcss-selector-parser": "^6.0.2",
|
|
|
7930
|
+ "postcss-value-parser": "^4.1.0"
|
|
|
7931
|
+ }
|
|
|
7932
|
+ },
|
|
|
7933
|
+ "postcss-modules-scope": {
|
|
|
7934
|
+ "version": "3.0.0",
|
|
|
7935
|
+ "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
|
|
|
7936
|
+ "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
|
|
|
7937
|
+ "dev": true,
|
|
|
7938
|
+ "requires": {
|
|
|
7939
|
+ "postcss-selector-parser": "^6.0.4"
|
|
|
7940
|
+ }
|
|
|
7941
|
+ },
|
|
|
7942
|
+ "postcss-modules-values": {
|
|
|
7943
|
+ "version": "4.0.0",
|
|
|
7944
|
+ "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
|
|
|
7945
|
+ "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
|
|
|
7946
|
+ "dev": true,
|
|
|
7947
|
+ "requires": {
|
|
|
7948
|
+ "icss-utils": "^5.0.0"
|
|
|
7949
|
+ }
|
|
|
7950
|
+ },
|
|
|
7951
|
+>>>>>>> :sparkles: sse push updates!
|
|
7850
|
7952
|
"postcss-nested": {
|
|
7851
|
7953
|
"version": "4.2.3",
|
|
7852
|
7954
|
"resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.3.tgz",
|