Merge branch 'main' into sh/gh-pages-plugin

garnix-io · Nov 16, 2023 · 825e420 · 825e420
2 parents c32d5a4 + cdd3d80
commit 825e420
Show file tree

Hide file tree

Showing 36 changed files with 1,891 additions and 356 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,6 @@ node_modules/
 /website/dist/
 /website/public/install.sh
 /website/public/nix-installer*
+/ts/internal/nixpkgs
 /ts/nixpkgs.ts
 /.golden/*/actual
diff --git a/.golden/adds_a_description_attribute_from_the_nix_package/golden b/.golden/adds_a_description_attribute_from_the_nix_package/golden
diff --git a/.golden/extracts_top-level_derivations/golden b/.golden/extracts_top-level_derivations/golden
diff --git a/.golden/generates_nice_JSDoc_comments/golden b/.golden/generates_nice_JSDoc_comments/golden
diff --git a/.golden/ignores_attributes_that_are_marked_broken/golden b/.golden/ignores_attributes_that_are_marked_broken/golden
diff --git a/.golden/ignores_attributes_that_throw/golden b/.golden/ignores_attributes_that_throw/golden
diff --git a/.golden/ignores_things_that_are_not_derivations/golden b/.golden/ignores_things_that_are_not_derivations/golden
diff --git a/.golden/removes_conflicts_due_to_sanitization/golden b/.golden/removes_conflicts_due_to_sanitization/golden
diff --git a/.golden/sanitizes_package_names/golden b/.golden/sanitizes_package_names/golden
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@
   provides a nice way to bundle up more complex project modifications into a
   single declaration. It also allows to use `Plugin`s from other sources,
   including third-party libraries.
+- Expose some useful nested nix packages in the garn `nixpkgs.ts` package.
+- Add `garn.javascript.vite`, a `Plugin` that adds fields for bundling vite projects into a `Package`.
 
 ## v0.0.15
 

diff --git a/examples/vite-frontend/flake.lock b/examples/vite-frontend/flake.lock