Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.

Commit 2673707

Browse files
committed
fix: resolve merge conflicts
2 parents 576a7f1 + f8688e9 commit 2673707

File tree

2 files changed

+29
-21
lines changed

2 files changed

+29
-21
lines changed

CONTRIBUTING.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,16 @@ git clone https://github.com/<your_github_username>/chakra-ui-vue-next.git
1818
cd chakra-ui
1919
```
2020

21-
3. Setup all the dependencies and packages by running `yarn bootstrap`. This
21+
3. Build components
22+
```bash
23+
yarn build
24+
```
25+
26+
4. Setup all the dependencies and packages by running `yarn bootstrap`. This
2227
command will install dependencies and bootstrap the repo using `lerna`
28+
```bash
29+
yarn bootstrap
30+
```
2331

2432
> If you run into any issues during this step, kindly reach out to the Chakra UI
2533
> Vue team here:[https://discord.gg/cMpMfvxa](https://discord.gg/cMpMfvxa)

yarn.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4406,15 +4406,15 @@ browser-process-hrtime@^1.0.0:
44064406
integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
44074407

44084408
browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3:
4409-
version "4.16.3"
4410-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
4411-
integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
4409+
version "4.16.6"
4410+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
4411+
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
44124412
dependencies:
4413-
caniuse-lite "^1.0.30001181"
4414-
colorette "^1.2.1"
4415-
electron-to-chromium "^1.3.649"
4413+
caniuse-lite "^1.0.30001219"
4414+
colorette "^1.2.2"
4415+
electron-to-chromium "^1.3.723"
44164416
escalade "^3.1.1"
4417-
node-releases "^1.1.70"
4417+
node-releases "^1.1.71"
44184418

44194419
browserslist@^4.16.6:
44204420
version "4.16.6"
@@ -4670,10 +4670,10 @@ caniuse-api@^3.0.0:
46704670
lodash.memoize "^4.1.2"
46714671
lodash.uniq "^4.5.0"
46724672

4673-
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001181:
4674-
version "1.0.30001207"
4675-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz#364d47d35a3007e528f69adb6fecb07c2bb2cc50"
4676-
integrity sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw==
4673+
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219:
4674+
version "1.0.30001230"
4675+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71"
4676+
integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==
46774677

46784678
caniuse-lite@^1.0.30001219:
46794679
version "1.0.30001221"
@@ -5074,7 +5074,7 @@ color@^3.0.0:
50745074
color-convert "^1.9.1"
50755075
color-string "^1.5.4"
50765076

5077-
colorette@^1.2.1, colorette@^1.2.2:
5077+
colorette@^1.2.2:
50785078
version "1.2.2"
50795079
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
50805080
integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
@@ -6245,10 +6245,10 @@ ejs@^3.1.3:
62456245
dependencies:
62466246
jake "^10.6.1"
62476247

6248-
electron-to-chromium@^1.3.649:
6249-
version "1.3.709"
6250-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.709.tgz#d7be0b5686a2fdfe8bad898faa3a428d04d8f656"
6251-
integrity sha512-LolItk2/ikSGQ7SN8UkuKVNMBZp3RG7Itgaxj1npsHRzQobj9JjMneZOZfLhtwlYBe5fCJ75k+cVCiDFUs23oA==
6248+
electron-to-chromium@^1.3.723:
6249+
version "1.3.739"
6250+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz#f07756aa92cabd5a6eec6f491525a64fe62f98b9"
6251+
integrity sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==
62526252

62536253
electron-to-chromium@^1.3.723:
62546254
version "1.3.726"
@@ -10479,10 +10479,10 @@ node-notifier@^8.0.0:
1047910479
uuid "^8.3.0"
1048010480
which "^2.0.2"
1048110481

10482-
node-releases@^1.1.70, node-releases@^1.1.71:
10483-
version "1.1.71"
10484-
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
10485-
integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
10482+
node-releases@^1.1.71:
10483+
version "1.1.72"
10484+
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
10485+
integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
1048610486

1048710487
nopt@^4.0.1, nopt@~4.0.1:
1048810488
version "4.0.3"

0 commit comments

Comments
 (0)