git.iko.soy/urbit.org
on master help sign in
fix more packagelock.json issues
6ce83c4Gordon
package-lock.json−24
compare with master
unifiedsplit
@@ -87,7 +87,6 @@
87 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
87 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
88 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
88 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
89 },
89 },
90−<<<<<<< HEAD
91 "node_modules/@next/swc-android-arm-eabi": {
90 "node_modules/@next/swc-android-arm-eabi": {
92 "version": "12.2.5",
91 "version": "12.2.5",
93 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
92 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
@@ -118,8 +117,6 @@
118 "node": ">= 10"
117 "node": ">= 10"
119 }
118 }
120 },
119 },
121−=======
122−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
123 "node_modules/@next/swc-darwin-arm64": {
120 "node_modules/@next/swc-darwin-arm64": {
124 "version": "12.2.5",
121 "version": "12.2.5",
125 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
122 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
@@ -135,7 +132,6 @@
135 "node": ">= 10"
132 "node": ">= 10"
136 }
133 }
137 },
134 },
138−<<<<<<< HEAD
139 "node_modules/@next/swc-darwin-x64": {
135 "node_modules/@next/swc-darwin-x64": {
140 "version": "12.2.5",
136 "version": "12.2.5",
141 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
137 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
@@ -286,8 +282,6 @@
286 "node": ">= 10"
282 "node": ">= 10"
287 }
283 }
288 },
284 },
289−=======
290−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
291 "node_modules/@nodelib/fs.scandir": {
285 "node_modules/@nodelib/fs.scandir": {
292 "version": "2.1.5",
286 "version": "2.1.5",
293 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
287 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -364,15 +358,9 @@
364 "dev": true
358 "dev": true
365 },
359 },
366 "node_modules/@urbit/foundation-design-system": {
360 "node_modules/@urbit/foundation-design-system": {
367−<<<<<<< HEAD
368 "version": "0.4.1",
361 "version": "0.4.1",
369 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
362 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
370 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
363 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
371−=======
372− "version": "0.3.0",
373− "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.3.0.tgz",
374− "integrity": "sha512-ulboVEzctsoGnYz4N6Q83MBx95nMz2ybBB3sOg7c6ip5bz774H06LzDAGT/tpkR92HTzQnZ5gux0Kx0whsnuww==",
375−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
376 "dependencies": {
364 "dependencies": {
377 "@iarna/toml": "^2.2.5",
365 "@iarna/toml": "^2.2.5",
378 "core-js": "^3.23.1",
366 "core-js": "^3.23.1",
@@ -3189,7 +3177,6 @@
3189 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
3177 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
3190 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
3178 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
3191 },
3179 },
3192−<<<<<<< HEAD
3193 "@next/swc-android-arm-eabi": {
3180 "@next/swc-android-arm-eabi": {
3194 "version": "12.2.5",
3181 "version": "12.2.5",
3195 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
3182 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
@@ -3202,15 +3189,12 @@
3202 "integrity": "sha512-vMj0efliXmC5b7p+wfcQCX0AfU8IypjkzT64GiKJD9PgiA3IILNiGJr1fw2lyUDHkjeWx/5HMlMEpLnTsQslwg==",
3189 "integrity": "sha512-vMj0efliXmC5b7p+wfcQCX0AfU8IypjkzT64GiKJD9PgiA3IILNiGJr1fw2lyUDHkjeWx/5HMlMEpLnTsQslwg==",
3203 "optional": true
3190 "optional": true
3204 },
3191 },
3205−=======
3206−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
3207 "@next/swc-darwin-arm64": {
3192 "@next/swc-darwin-arm64": {
3208 "version": "12.2.5",
3193 "version": "12.2.5",
3209 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
3194 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
3210 "integrity": "sha512-VOPWbO5EFr6snla/WcxUKtvzGVShfs302TEMOtzYyWni6f9zuOetijJvVh9CCTzInnXAZMtHyNhefijA4HMYLg==",
3195 "integrity": "sha512-VOPWbO5EFr6snla/WcxUKtvzGVShfs302TEMOtzYyWni6f9zuOetijJvVh9CCTzInnXAZMtHyNhefijA4HMYLg==",
3211 "optional": true
3196 "optional": true
3212 },
3197 },
3213−<<<<<<< HEAD
3214 "@next/swc-darwin-x64": {
3198 "@next/swc-darwin-x64": {
3215 "version": "12.2.5",
3199 "version": "12.2.5",
3216 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
3200 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
@@ -3271,8 +3255,6 @@
3271 "integrity": "sha512-7h5/ahY7NeaO2xygqVrSG/Y8Vs4cdjxIjowTZ5W6CKoTKn7tmnuxlUc2h74x06FKmbhAd9agOjr/AOKyxYYm9Q==",
3255 "integrity": "sha512-7h5/ahY7NeaO2xygqVrSG/Y8Vs4cdjxIjowTZ5W6CKoTKn7tmnuxlUc2h74x06FKmbhAd9agOjr/AOKyxYYm9Q==",
3272 "optional": true
3256 "optional": true
3273 },
3257 },
3274−=======
3275−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
3276 "@nodelib/fs.scandir": {
3258 "@nodelib/fs.scandir": {
3277 "version": "2.1.5",
3259 "version": "2.1.5",
3278 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
3260 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3333,15 +3315,9 @@
3333 "dev": true
3315 "dev": true
3334 },
3316 },
3335 "@urbit/foundation-design-system": {
3317 "@urbit/foundation-design-system": {
3336−<<<<<<< HEAD
3337 "version": "0.4.1",
3318 "version": "0.4.1",
3338 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
3319 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
3339 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
3320 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
3340−=======
3341− "version": "0.3.0",
3342− "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.3.0.tgz",
3343− "integrity": "sha512-ulboVEzctsoGnYz4N6Q83MBx95nMz2ybBB3sOg7c6ip5bz774H06LzDAGT/tpkR92HTzQnZ5gux0Kx0whsnuww==",
3344−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
3345 "requires": {
3321 "requires": {
3346 "@iarna/toml": "^2.2.5",
3322 "@iarna/toml": "^2.2.5",
3347 "core-js": "^3.23.1",
3323 "core-js": "^3.23.1",