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.

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

chore: add backports to 0.4000.0 rc.3 #432

Merged
merged 10 commits into from
Dec 12, 2024

Conversation

c12i
Copy link
Collaborator

@c12i c12i commented Dec 10, 2024

A mirror of #410.

Significant backports include:

Additional fixe

c12i and others added 9 commits December 10, 2024 15:55
* Add skip_config_check global flag to scaffolding

* Prefer not writing the scaffold config for nixified custom templates

* Fix rustfmt warning
* Remove dependency to holochain

* Add rust-cache

* Add cachix nix config

* Add ci job concurrency options

* Update cachix configurations

* Run rust checks/tests outside nix

* add missing components

* Cache rust builds

* Bump holochain deps

* Update rustdocs

* Build cargo deps separately

* refactor flake

* Update maintenance docs

* Add extraPullNames input to cachix actions

* Add nix_build step

* Extend extra-substituters and public-keys in nixConfig

* Fix ci workflow

* Bump client-js version
* Fix misplaced doc comments

* Slightly refactor link_type integrity codegen
* feat: Add a new template subcommand to create new custom template bases
from existing templates

* Remove call to wrapCustoTemplate in scaffolding nix flake

* Update custom template docs
* Bump holochain playground

* Update ui core dependencies

* Update lit dependencies

* Fix cli output lines

* Fix broken css import in lit template

* Revert custom-template changes

* Fix vue templates

* Increase testTimeout

* Remove eslint from lit template

* Fix lit CI failure

* Add missing shared styles
…on-0.4

chore: backport svelte race condition to 0.4 and release 0.4000.0-rc.1
* Add go back functionality for hc scaffold entry-type

* address PR comments

* Ensure the fields vec is not empty on change

* Improve text spacing

* Simplify prompt
@c12i c12i requested review from matthme and pdaoust December 10, 2024 13:56
Copy link
Collaborator

@matthme matthme left a comment

Choose a reason for hiding this comment

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

I'm getting better at speed-testing scaffolding ;)
Looks good from the testing that I've done with the 4 different UI frameworks. And I did not spot something obviously wrong in the code changes.

Copy link
Collaborator

@pdaoust pdaoust left a comment

Choose a reason for hiding this comment

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

I'm not going to let my suggested changes be blockers; fine to go ahead with this as-is. I could create PRs for the suggestions later.

I only tested the npm/Svelte combination but it worked great!

Cargo.toml Show resolved Hide resolved
- Version bumps for `flake.nix`, `flake.lock` and `Cargo.lock` files should target the maintenance branches directly.
- Version bumps for dependencies of Scaffolding in the `Cargo.toml`. For dependencies that are still on the same version as on `develop` it would be valid to target `develop` and back-port but you'll end up with a tricky lock file merge anyway.
- Version bumps to Scaffolding itself don't make sense on `develop` so they should be made directly on the maintenance branches.
- Bug fixes that are specific to a particular version of Holochain. This should be rare, but if Holochain were to introduce an API change between 0.1.x and 0.1.x+1 but NOT make that change for Holochain 0.2.x then the PR for Scaffolding would target `develop-0.1` directly.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Curious if these extra two spaces in these three bullet points are accidental?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is my editor that did the formatting for me. Can fix this with a separate PR since this is an upstream change from develop

src/cli/custom-template/README.md Show resolved Hide resolved
src/lib.rs Show resolved Hide resolved
@@ -97,10 +97,19 @@
//! To create a custom template, execute these steps:
//!
//! 1. Run this command:
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is such good info to have. One thing that I don't understand is what does hc scaffold template clone do? Would it be worth mentioning it here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

hc scaffold template clone will create a template from the current template you are using, pretty meta but this was how it was originally defined

src/scaffold/entry_type/fields.rs Show resolved Hide resolved
@c12i c12i merged commit 5b3e8d5 into develop-0.4 Dec 12, 2024
11 checks passed
@c12i c12i deleted the chore/add-backports-to-0.4000.0-rc.3 branch December 12, 2024 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants