@@ -12,7 +12,11 @@
12 "@socialgouv/matomo-next": "^1.3.0",
12 "@socialgouv/matomo-next": "^1.3.0",
13 "@tailwindcss/aspect-ratio": "^0.4.0",
13 "@tailwindcss/aspect-ratio": "^0.4.0",
14 "@tlon/sigil-js": "^1.4.5",
14 "@tlon/sigil-js": "^1.4.5",
15 "@urbit/foundation-design-system": "^0.4.1",
16 "@urbit/foundation-design-system": "^0.4.1",
18+ "@urbit/foundation-design-system": "^0.3.0",
19+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
16 "@urbit/markdoc": "^0.1.4",
20 "@urbit/markdoc": "^0.1.4",
17 "axios": "^0.26.1",
21 "axios": "^0.26.1",
18 "buffer": "^6.0.3",
22 "buffer": "^6.0.3",
@@ -87,6 +91,7 @@
87 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
91 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
88 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
92 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
90 "node_modules/@next/swc-android-arm-eabi": {
95 "node_modules/@next/swc-android-arm-eabi": {
91 "version": "12.2.5",
96 "version": "12.2.5",
92 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
97 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
@@ -117,6 +122,8 @@
117 "node": ">= 10"
122 "node": ">= 10"
126+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
120 "node_modules/@next/swc-darwin-arm64": {
127 "node_modules/@next/swc-darwin-arm64": {
121 "version": "12.2.5",
128 "version": "12.2.5",
122 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
129 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
@@ -132,6 +139,7 @@
132 "node": ">= 10"
139 "node": ">= 10"
135 "node_modules/@next/swc-darwin-x64": {
143 "node_modules/@next/swc-darwin-x64": {
136 "version": "12.2.5",
144 "version": "12.2.5",
137 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
145 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
@@ -282,6 +290,8 @@
282 "node": ">= 10"
290 "node": ">= 10"
294+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
285 "node_modules/@nodelib/fs.scandir": {
295 "node_modules/@nodelib/fs.scandir": {
286 "version": "2.1.5",
296 "version": "2.1.5",
287 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
297 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -358,9 +368,15 @@
358 "dev": true
368 "dev": true
360 "node_modules/@urbit/foundation-design-system": {
370 "node_modules/@urbit/foundation-design-system": {
361 "version": "0.4.1",
372 "version": "0.4.1",
362 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
373 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
363 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
374 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
377+ "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.3.0.tgz",
378+ "integrity": "sha512-ulboVEzctsoGnYz4N6Q83MBx95nMz2ybBB3sOg7c6ip5bz774H06LzDAGT/tpkR92HTzQnZ5gux0Kx0whsnuww==",
379+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
364 "dependencies": {
380 "dependencies": {
365 "@iarna/toml": "^2.2.5",
381 "@iarna/toml": "^2.2.5",
366 "core-js": "^3.23.1",
382 "core-js": "^3.23.1",
@@ -3177,6 +3193,7 @@
3177 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
3193 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
3178 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
3194 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
3180 "@next/swc-android-arm-eabi": {
3197 "@next/swc-android-arm-eabi": {
3181 "version": "12.2.5",
3198 "version": "12.2.5",
3182 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
3199 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
@@ -3189,12 +3206,15 @@
3189 "integrity": "sha512-vMj0efliXmC5b7p+wfcQCX0AfU8IypjkzT64GiKJD9PgiA3IILNiGJr1fw2lyUDHkjeWx/5HMlMEpLnTsQslwg==",
3206 "integrity": "sha512-vMj0efliXmC5b7p+wfcQCX0AfU8IypjkzT64GiKJD9PgiA3IILNiGJr1fw2lyUDHkjeWx/5HMlMEpLnTsQslwg==",
3190 "optional": true
3207 "optional": true
3210+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
3192 "@next/swc-darwin-arm64": {
3211 "@next/swc-darwin-arm64": {
3193 "version": "12.2.5",
3212 "version": "12.2.5",
3194 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
3213 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
3195 "integrity": "sha512-VOPWbO5EFr6snla/WcxUKtvzGVShfs302TEMOtzYyWni6f9zuOetijJvVh9CCTzInnXAZMtHyNhefijA4HMYLg==",
3214 "integrity": "sha512-VOPWbO5EFr6snla/WcxUKtvzGVShfs302TEMOtzYyWni6f9zuOetijJvVh9CCTzInnXAZMtHyNhefijA4HMYLg==",
3196 "optional": true
3215 "optional": true
3198 "@next/swc-darwin-x64": {
3218 "@next/swc-darwin-x64": {
3199 "version": "12.2.5",
3219 "version": "12.2.5",
3200 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
3220 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
@@ -3255,6 +3275,8 @@
3255 "integrity": "sha512-7h5/ahY7NeaO2xygqVrSG/Y8Vs4cdjxIjowTZ5W6CKoTKn7tmnuxlUc2h74x06FKmbhAd9agOjr/AOKyxYYm9Q==",
3275 "integrity": "sha512-7h5/ahY7NeaO2xygqVrSG/Y8Vs4cdjxIjowTZ5W6CKoTKn7tmnuxlUc2h74x06FKmbhAd9agOjr/AOKyxYYm9Q==",
3256 "optional": true
3276 "optional": true
3279+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
3258 "@nodelib/fs.scandir": {
3280 "@nodelib/fs.scandir": {
3259 "version": "2.1.5",
3281 "version": "2.1.5",
3260 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
3282 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3315,9 +3337,15 @@
3315 "dev": true
3337 "dev": true
3317 "@urbit/foundation-design-system": {
3339 "@urbit/foundation-design-system": {
3318 "version": "0.4.1",
3341 "version": "0.4.1",
3319 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
3342 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
3320 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
3343 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
3345+ "version": "0.3.0",
3346+ "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.3.0.tgz",
3347+ "integrity": "sha512-ulboVEzctsoGnYz4N6Q83MBx95nMz2ybBB3sOg7c6ip5bz774H06LzDAGT/tpkR92HTzQnZ5gux0Kx0whsnuww==",
3348+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
3321 "requires": {
3349 "requires": {
3322 "@iarna/toml": "^2.2.5",
3350 "@iarna/toml": "^2.2.5",
3323 "core-js": "^3.23.1",
3351 "core-js": "^3.23.1",