Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use npm package imports, update highlightjs #39

Merged
merged 4 commits into from
Mar 3, 2023
Merged

feat: use npm package imports, update highlightjs #39

merged 4 commits into from
Mar 3, 2023

Conversation

nekowinston
Copy link
Contributor

@nekowinston nekowinston commented Feb 21, 2023 •
edited
Loading

This PR changes the build process to use the @catppuccin/palette and @catppuccin/highlightjs NPM packages.

I've also added bin/ to the .gitignore since it seems auto-generated.
Turns out I've built it to the wrong directory before, should be fixed with 912f1ba

nekowinston
nekowinston commented Feb 21, 2023
View reviewed changes
Copy link
Contributor Author

@nekowinston nekowinston left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found some issues upstream, will change them before this is ready to merge.

src/bin/assets/catppuccin-highlight.css Outdated Show resolved Hide resolved
src/bin/assets/catppuccin-highlight.css Outdated Show resolved Hide resolved
@nekowinston nekowinston marked this pull request as draft February 21, 2023 10:01
@nekowinston
Copy link
Contributor Author

@sgoudham this is now ready for review, upstream has been fixed with catppuccin/highlightjs@b4458e9.

@nekowinston nekowinston marked this pull request as ready for review February 22, 2023 19:06
sgoudham
sgoudham approved these changes Feb 28, 2023
View reviewed changes
Copy link
Contributor

@sgoudham sgoudham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just so I'm clear on the build process now, you'd be running something like npm build (my memory fails me but I think that's the task) and then cargo build --release?

@nekowinston
Copy link
Contributor Author

Yeah, npm run build in the project root will produce the CSS that's included in this PR.

@sgoudham sgoudham merged commit 98cf81a into main Mar 3, 2023
@sgoudham sgoudham deleted the feat/use-npm-packages-update-highlightjs branch March 3, 2023 00:43
@nekowinston
Copy link
Contributor Author

#39 (comment)

Do you want me to give this a shot? It would involve adding an NPM build step to the CI. I'm also happy to take on #2.

@sgoudham
Copy link
Contributor

sgoudham commented Mar 6, 2023

#39 (comment)

Do you want me to give this a shot? It would involve adding an NPM build step to the CI. I'm also happy to take on #2.

I'd really appreciate that @nekowinston, I really haven't the time for this so it would mean a lot ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sgoudham sgoudham sgoudham approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@nekowinston @sgoudham