|
|
|
@ -845,9 +845,6 @@
@@ -845,9 +845,6 @@
|
|
|
|
|
"debug" "^4.1.0" |
|
|
|
|
"globals" "^11.1.0" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": |
|
|
|
|
======= |
|
|
|
|
"@babel/traverse@^7.16.0": |
|
|
|
|
"integrity" "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz" |
|
|
|
@ -863,8 +860,7 @@
@@ -863,8 +860,7 @@
|
|
|
|
|
"debug" "^4.1.0" |
|
|
|
|
"globals" "^11.1.0" |
|
|
|
|
|
|
|
|
|
"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0": |
|
|
|
|
>>>>>>> a5954e752fd707785b4bb7ffbfedfd4744b4b5a4 |
|
|
|
|
"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": |
|
|
|
|
"integrity" "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz" |
|
|
|
|
"version" "7.15.0" |
|
|
|
@ -2932,11 +2928,7 @@
@@ -2932,11 +2928,7 @@
|
|
|
|
|
"resolved" "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz" |
|
|
|
|
"version" "0.1.1" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"css-select@^2.0.0", "css-select@^2.0.2": |
|
|
|
|
======= |
|
|
|
|
"css-select@^2.0.0", "css-select@^2.1.0": |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"integrity" "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz" |
|
|
|
|
"version" "2.1.0" |
|
|
|
@ -2946,7 +2938,6 @@
@@ -2946,7 +2938,6 @@
|
|
|
|
|
"domutils" "^1.7.0" |
|
|
|
|
"nth-check" "^1.0.2" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"css-tree@^1.0.0-alpha.37", "css-tree@1.0.0-alpha.37": |
|
|
|
|
"integrity" "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz" |
|
|
|
@ -2956,9 +2947,6 @@
@@ -2956,9 +2947,6 @@
|
|
|
|
|
"source-map" "^0.6.1" |
|
|
|
|
|
|
|
|
|
"css-tree@^1.1.2": |
|
|
|
|
======= |
|
|
|
|
"css-tree@^1.0.0-alpha.39", "css-tree@^1.1.2": |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"integrity" "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz" |
|
|
|
|
"version" "1.1.3" |
|
|
|
@ -2966,17 +2954,6 @@
@@ -2966,17 +2954,6 @@
|
|
|
|
|
"mdn-data" "2.0.14" |
|
|
|
|
"source-map" "^0.6.1" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
======= |
|
|
|
|
"css-tree@1.0.0-alpha.37": |
|
|
|
|
"integrity" "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz" |
|
|
|
|
"version" "1.0.0-alpha.37" |
|
|
|
|
dependencies: |
|
|
|
|
"mdn-data" "2.0.4" |
|
|
|
|
"source-map" "^0.6.1" |
|
|
|
|
|
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"css-what@^3.2.1": |
|
|
|
|
"integrity" "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz" |
|
|
|
@ -3350,11 +3327,7 @@
@@ -3350,11 +3327,7 @@
|
|
|
|
|
"resolved" "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" |
|
|
|
|
"version" "2.2.0" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"envinfo@^7.7.2": |
|
|
|
|
======= |
|
|
|
|
"envinfo@^7.5.0", "envinfo@^7.7.2": |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"integrity" "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz" |
|
|
|
|
"version" "7.8.1" |
|
|
|
@ -4648,11 +4621,7 @@
@@ -4648,11 +4621,7 @@
|
|
|
|
|
"resolved" "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz" |
|
|
|
|
"version" "1.0.1" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"is-stream@^1.1.0": |
|
|
|
|
======= |
|
|
|
|
"is-stream@^1.0.1", "is-stream@^1.1.0": |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"integrity" "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" |
|
|
|
|
"resolved" "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" |
|
|
|
|
"version" "1.1.0" |
|
|
|
@ -5351,13 +5320,6 @@
@@ -5351,13 +5320,6 @@
|
|
|
|
|
"array-includes" "^3.1.2" |
|
|
|
|
"object.assign" "^4.1.2" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
======= |
|
|
|
|
"kind-of@^1.1.0": |
|
|
|
|
"integrity" "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=" |
|
|
|
|
"resolved" "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz" |
|
|
|
|
"version" "1.1.0" |
|
|
|
|
|
|
|
|
|
"kind-of@^2.0.1": |
|
|
|
|
"integrity" "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=" |
|
|
|
|
"resolved" "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz" |
|
|
|
@ -5365,7 +5327,6 @@
@@ -5365,7 +5327,6 @@
|
|
|
|
|
dependencies: |
|
|
|
|
"is-buffer" "^1.0.2" |
|
|
|
|
|
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"kind-of@^3.0.2": |
|
|
|
|
"integrity" "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=" |
|
|
|
|
"resolved" "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" |
|
|
|
@ -5605,18 +5566,6 @@
@@ -5605,18 +5566,6 @@
|
|
|
|
|
"integrity" "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz" |
|
|
|
|
"version" "2.0.4" |
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
======= |
|
|
|
|
|
|
|
|
|
"mem@^4.3.0": |
|
|
|
|
"integrity" "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz" |
|
|
|
|
"version" "4.3.0" |
|
|
|
|
dependencies: |
|
|
|
|
"map-age-cleaner" "^0.1.1" |
|
|
|
|
"mimic-fn" "^2.0.0" |
|
|
|
|
"p-is-promise" "^2.0.0" |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
|
|
|
|
|
"merge-deep@^3.0.2": |
|
|
|
|
"integrity" "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==" |
|
|
|
@ -6022,11 +5971,7 @@
@@ -6022,11 +5971,7 @@
|
|
|
|
|
"resolved" "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz" |
|
|
|
|
"version" "0.5.3" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"mkdirp@^0.5.1", "mkdirp@^0.5.5", "mkdirp@~0.5.1": |
|
|
|
|
======= |
|
|
|
|
"mkdirp@^0.5.1", "mkdirp@~0.5.1": |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"integrity" "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" |
|
|
|
|
"version" "0.5.5" |
|
|
|
@ -6227,14 +6172,6 @@
@@ -6227,14 +6172,6 @@
|
|
|
|
|
"version" "1.0.2" |
|
|
|
|
dependencies: |
|
|
|
|
"boolbase" "~1.0.0" |
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
======= |
|
|
|
|
|
|
|
|
|
"nuget-exe@5.8.0": |
|
|
|
|
"integrity" "sha512-m95SBWa+SJNOfR0GTwdQ3OwK2915Ts3XvajYx0iaOZYydwvz6reJyptiNGf+HQhvTe5viNiRAmGXxNww9obZjw==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/nuget-exe/-/nuget-exe-5.8.0.tgz" |
|
|
|
|
"version" "5.8.0" |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
|
|
|
|
|
"nullthrows@^1.1.1": |
|
|
|
|
"integrity" "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==" |
|
|
|
@ -6969,7 +6906,6 @@
@@ -6969,7 +6906,6 @@
|
|
|
|
|
"resolved" "https://registry.npmjs.org/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz" |
|
|
|
|
"version" "3.2.0" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"react-native-svg-app-icon@^0.5.0": |
|
|
|
|
"integrity" "sha512-f6U0MCNlPiDXhuBeLp0znZxfEwfpJMagpqyJcG/M2yW5Gf1YGpRt8nh3K3aRhWPwfF9jY18AtbiKWiRJYzR4LQ==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/react-native-svg-app-icon/-/react-native-svg-app-icon-0.5.0.tgz" |
|
|
|
@ -6979,14 +6915,6 @@
@@ -6979,14 +6915,6 @@
|
|
|
|
|
"sharp" ">=0.23.0" |
|
|
|
|
"svg2vectordrawable" "2.6.26" |
|
|
|
|
|
|
|
|
|
"react-native-svg@*", "react-native-svg@9.13": |
|
|
|
|
"integrity" "sha512-vjjuJhEhQCwWjqsgWyGy6/C/LIBM2REDxB40FU1PMhi8T3zQUwUHnA6M15pJKlQG8vaZyA+QnLyIVhjtujRgig==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/react-native-svg/-/react-native-svg-9.13.6.tgz" |
|
|
|
|
"version" "9.13.6" |
|
|
|
|
dependencies: |
|
|
|
|
"css-select" "^2.0.2" |
|
|
|
|
"css-tree" "^1.0.0-alpha.37" |
|
|
|
|
======= |
|
|
|
|
"react-native-svg-transformer@^0.14.3": |
|
|
|
|
"integrity" "sha512-agDGdMeeBAsWEgg/u7mjtR2Z3c8smGCLep/n3svwifut9dpswZCP+bSIrU8ekg6RNtxAJL+eGJbWjJ38vWxw6g==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/react-native-svg-transformer/-/react-native-svg-transformer-0.14.3.tgz" |
|
|
|
@ -6997,14 +6925,13 @@
@@ -6997,14 +6925,13 @@
|
|
|
|
|
"path-dirname" "^1.0.2" |
|
|
|
|
"semver" "^5.6.0" |
|
|
|
|
|
|
|
|
|
"react-native-svg@^12.1.1", "react-native-svg@>=6.5.1": |
|
|
|
|
"integrity" "sha512-NIAJ8jCnXGCqGWXkkJ1GTzO4a3Md5at5sagYV8Vh4MXYnL4z5Rh428Wahjhh+LIjx40EE5xM5YtwyJBqOIba2Q==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/react-native-svg/-/react-native-svg-12.1.1.tgz" |
|
|
|
|
"version" "12.1.1" |
|
|
|
|
"react-native-svg@*", "react-native-svg@>=6.5.1", "react-native-svg@9.13": |
|
|
|
|
"integrity" "sha512-vjjuJhEhQCwWjqsgWyGy6/C/LIBM2REDxB40FU1PMhi8T3zQUwUHnA6M15pJKlQG8vaZyA+QnLyIVhjtujRgig==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/react-native-svg/-/react-native-svg-9.13.6.tgz" |
|
|
|
|
"version" "9.13.6" |
|
|
|
|
dependencies: |
|
|
|
|
"css-select" "^2.1.0" |
|
|
|
|
"css-tree" "^1.0.0-alpha.39" |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"css-select" "^2.0.2" |
|
|
|
|
"css-tree" "^1.0.0-alpha.37" |
|
|
|
|
|
|
|
|
|
"react-native-tab-view@^3.1.1": |
|
|
|
|
"integrity" "sha512-M5pRN6utQfytKWoKlKVzg5NbkYu308qNoW1khGTtEOTs1k14p2dHJ/BWOJoJYHKbPVUyZldbG9MFT7gUl4YHnw==" |
|
|
|
@ -7025,50 +6952,10 @@
@@ -7025,50 +6952,10 @@
|
|
|
|
|
"prop-types" "^15.7.2" |
|
|
|
|
"yargs" "^16.1.1" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"react-native@*", "react-native@^0.0.0-0 || ^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || ^0.64.0 || ^0.65.0 || 1000.0.0", "react-native@^0.62.0", "react-native@>=0.40.0", "react-native@>=0.42.0", "react-native@>=0.48.4", "react-native@>=0.50.0", "react-native@>=0.57", "react-native@>=0.57.0", "react-native@>=0.59", "react-native@>=0.59.0-rc.0 <1.0.x", "react-native@>=0.61.5", "react-native@>=0.63.3", "react-native@>=0.64.0-rc.0 || 0.0.0-*", "react-native@0.63.2", "react-native@0.64.2": |
|
|
|
|
======= |
|
|
|
|
"react-native@*", "react-native@^0.0.0-0 || ^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || ^0.64.0 || ^0.65.0 || 1000.0.0", "react-native@^0.62.0", "react-native@>=0.40.0", "react-native@>=0.42.0", "react-native@>=0.48.4", "react-native@>=0.50.0", "react-native@>=0.57", "react-native@>=0.57.0", "react-native@>=0.59", "react-native@>=0.61.5", "react-native@>=0.63.3", "react-native@>=0.64.0-rc.0 || 0.0.0-*", "react-native@0.63.2", "react-native@0.64.2": |
|
|
|
|
>>>>>>> 180634a49afd70734cd081cadf40bb94e4110d84 |
|
|
|
|
======= |
|
|
|
|
"react-native-windows@^0.63.3", "react-native-windows@>=0.62.0": |
|
|
|
|
"integrity" "sha512-AhLQP0dzX4jhtv9AsR5KF+BIlccKKPzTSmivg3ZUirqQxXwDDMjtIGwgFnp1WyH8cFoUEvpuyNnHsU3f7LxEyg==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/react-native-windows/-/react-native-windows-0.63.41.tgz" |
|
|
|
|
"version" "0.63.41" |
|
|
|
|
dependencies: |
|
|
|
|
"@babel/runtime" "^7.8.4" |
|
|
|
|
"@react-native-windows/cli" "0.63.14" |
|
|
|
|
"abort-controller" "^3.0.0" |
|
|
|
|
"anser" "^1.4.9" |
|
|
|
|
"base64-js" "^1.1.2" |
|
|
|
|
"event-target-shim" "^5.0.1" |
|
|
|
|
"fbjs" "^1.0.0" |
|
|
|
|
"fbjs-scripts" "^1.1.0" |
|
|
|
|
"invariant" "^2.2.4" |
|
|
|
|
"nullthrows" "^1.1.1" |
|
|
|
|
"pretty-format" "^24.9.0" |
|
|
|
|
"promise" "^8.0.3" |
|
|
|
|
"prop-types" "^15.7.2" |
|
|
|
|
"react-devtools-core" "^4.6.0" |
|
|
|
|
"regenerator-runtime" "^0.13.2" |
|
|
|
|
"scheduler" "0.19.1" |
|
|
|
|
"stacktrace-parser" "^0.1.3" |
|
|
|
|
"use-subscription" "^1.0.0" |
|
|
|
|
"whatwg-fetch" "^3.0.0" |
|
|
|
|
|
|
|
|
|
"react-native@*", "react-native@^0.0.0-0 || ^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || ^0.64.0 || ^0.65.0 || 1000.0.0", "react-native@^0.62.0", "react-native@^0.63.0-0", "react-native@>=0.40.0", "react-native@>=0.42.0", "react-native@>=0.45.0", "react-native@>=0.48.4", "react-native@>=0.50.0", "react-native@>=0.57", "react-native@>=0.57.0", "react-native@>=0.59", "react-native@>=0.61.5", "react-native@>=0.63.3", "react-native@>=0.64.0-rc.0 || 0.0.0-*", "react-native@0.63.2", "react-native@0.64.2": |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"integrity" "sha512-Ty/fFHld9DcYsFZujXYdeVjEhvSeQcwuTGXezyoOkxfiGEGrpL/uwUZvMzwShnU4zbbTKDu2PAm/uwuOittRGA==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/react-native/-/react-native-0.64.2.tgz" |
|
|
|
|
"version" "0.64.2" |
|
|
|
|
======= |
|
|
|
|
"react-native@*", "react-native@^0.0.0-0 || ^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || ^0.64.0 || ^0.65.0 || 1000.0.0", "react-native@^0.62.0", "react-native@^0.64.3", "react-native@>=0.40.0", "react-native@>=0.42.0", "react-native@>=0.48.4", "react-native@>=0.50.0", "react-native@>=0.57", "react-native@>=0.57.0", "react-native@>=0.59", "react-native@>=0.59.0-rc.0 <1.0.x", "react-native@>=0.61.5", "react-native@>=0.63.3", "react-native@>=0.64.0-rc.0 || 0.0.0-*", "react-native@0.63.2": |
|
|
|
|
"react-native@*", "react-native@^0.0.0-0 || ^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || ^0.64.0 || ^0.65.0 || 1000.0.0", "react-native@^0.62.0", "react-native@^0.64.3", "react-native@>=0.40.0", "react-native@>=0.42.0", "react-native@>=0.45.0", "react-native@>=0.48.4", "react-native@>=0.50.0", "react-native@>=0.57", "react-native@>=0.57.0", "react-native@>=0.59", "react-native@>=0.59.0-rc.0 <1.0.x", "react-native@>=0.61.5", "react-native@>=0.63.3", "react-native@>=0.64.0-rc.0 || 0.0.0-*", "react-native@0.63.2": |
|
|
|
|
"integrity" "sha512-2OEU74U0Ek1/WeBzPbg6XDsCfjF/9fhrNX/5TFgEiBKd5mNc9LOZ/OlMmkb7iues/ZZ/oc51SbEfLRQdcW0fVw==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/react-native/-/react-native-0.64.3.tgz" |
|
|
|
|
"version" "0.64.3" |
|
|
|
|
>>>>>>> a5954e752fd707785b4bb7ffbfedfd4744b4b5a4 |
|
|
|
|
dependencies: |
|
|
|
|
"@jest/create-cache-key-function" "^26.5.0" |
|
|
|
|
"@react-native-community/cli" "^5.0.1-alpha.1" |
|
|
|
@ -7967,14 +7854,6 @@
@@ -7967,14 +7854,6 @@
|
|
|
|
|
"integrity" "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz" |
|
|
|
|
"version" "0.1.8" |
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
======= |
|
|
|
|
|
|
|
|
|
"stack-chain@^1.3.7": |
|
|
|
|
"integrity" "sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=" |
|
|
|
|
"resolved" "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz" |
|
|
|
|
"version" "1.3.7" |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
|
|
|
|
|
"stack-utils@^2.0.2": |
|
|
|
|
"integrity" "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==" |
|
|
|
@ -8178,12 +8057,16 @@
@@ -8178,12 +8057,16 @@
|
|
|
|
|
"has-flag" "^4.0.0" |
|
|
|
|
"supports-color" "^7.0.0" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"svg-arc-to-cubic-bezier@^3.0.0": |
|
|
|
|
"integrity" "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz" |
|
|
|
|
"version" "3.2.0" |
|
|
|
|
|
|
|
|
|
"svg-parser@^2.0.0": |
|
|
|
|
"integrity" "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz" |
|
|
|
|
"version" "2.0.4" |
|
|
|
|
|
|
|
|
|
"svg-path-bounds@^1.0.1": |
|
|
|
|
"integrity" "sha512-H4/uAgLWrppIC0kHsb2/dWUYSmb4GE5UqH06uqWBcg6LBjX2fu0A8+JrO2/FJPZiSsNOKZAhyFFgsLTdYUvSqQ==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/svg-path-bounds/-/svg-path-bounds-1.0.2.tgz" |
|
|
|
@ -8205,15 +8088,7 @@
@@ -8205,15 +8088,7 @@
|
|
|
|
|
"svgo" "^1.3.2" |
|
|
|
|
"svgpath" "^2.3.0" |
|
|
|
|
|
|
|
|
|
"svgo@^1.3.2": |
|
|
|
|
======= |
|
|
|
|
"svg-parser@^2.0.0": |
|
|
|
|
"integrity" "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz" |
|
|
|
|
"version" "2.0.4" |
|
|
|
|
|
|
|
|
|
"svgo@^1.2.2": |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"svgo@^1.2.2", "svgo@^1.3.2": |
|
|
|
|
"integrity" "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz" |
|
|
|
|
"version" "1.3.2" |
|
|
|
@ -8232,14 +8107,11 @@
@@ -8232,14 +8107,11 @@
|
|
|
|
|
"unquote" "~1.1.1" |
|
|
|
|
"util.promisify" "~1.0.0" |
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
"svgpath@^2.3.0": |
|
|
|
|
"integrity" "sha512-wNz6lCoj+99GMoyU7SozTfPqiLHz6WcJYZ30Z+F4lF/gPtxWHBCpZ4DhoDI0+oZ0dObKyYsJdSPGbL2mJq/qCg==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/svgpath/-/svgpath-2.3.1.tgz" |
|
|
|
|
"version" "2.3.1" |
|
|
|
|
|
|
|
|
|
======= |
|
|
|
|
>>>>>>> 5c88dcd605bcf2ca73fbcaa22888e15c8feca86d |
|
|
|
|
"symbol-tree@^3.2.4": |
|
|
|
|
"integrity" "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" |
|
|
|
|
"resolved" "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz" |
|
|
|
|