How to add new design components after ```design-system``` directory was relocated
i have created an icon and stored it in lib/design-system/src/icons
but how am i supposed to create these .js and .map.js files in
lib/design-system/dist/cjs/icons (this is the location we reach when we click the import path from any file.)
15 Replies
These files are generated automatically during build
Don't forget to export newly added icon in index.ts in icons directory
@madd, you just advanced to level 9!
it is throwing this error
@madd
@Uzair
it worked for me
Did you clean the repo and did npm run setup:project ?
nope but i tried pnpm run build
and it worked created those files and the changes in ui were as expected
but now i am getting conflicts in my PR in pnpm-lock.yaml file
how can i resolve that
?
@Pawan Jain
conflict can only be resolved manually
one by one
check what you changed
if you understand hindi
you can follow this video
https://www.youtube.com/watch?v=l03tGz4pXoQ
Piyush Garg
YouTube
How to Resolve Merge Conflicts in Git | Open Source Bootcamp
FREE Open Source BootCamp: https://www.youtube.com/playlist?list=PLinedj3B30sAT6CotNj0iffhRV89SkNK9
Join the Discord Server: https://discord.gg/kRSRxBQ6xf
#opensource #webdevelopment #coding #programming #github #opensourcesoftware #nodejs #vscode #git
the resolve conflict button is disabled
@Uzair, you just advanced to level 2!
on my pr
@Pawan Jain
You can resolve merge conflict in local machine
updated message
so i tried fetching from next in local machine and then tried merging this branch and there werent any conflicts
could this pnpm-lock conflict arise from
this
?
or git will change LF to CRLF next time it touches pnpm-lock.yaml
this error i got when commiting
ok so i discarded commits in remote fetched resolved conflict and re commited
and it seems to not have any conflict now