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

NPM: Version packages using Lerna or Nx #294

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

NPM: Version packages using Lerna or Nx #294

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8699d0e
feat(npm): introduce logic to version npm packages using lerna or nx
jackw Mar 28, 2024
756792d
feat(daggerutils): add a FileExists helper
jackw Mar 29, 2024
cd26af2
refactor(npm): check for lerna and nx config files to conditionally r…
jackw Mar 29, 2024
0dbef41
chore(npm): renamed nx release group to fixed
jackw Mar 29, 2024
388e0b8
fix yarn workspaces npm command
kminehart Apr 9, 2024
3c010b9
feat(npm): get the grafanaPackages group from nx.json
jackw Apr 12, 2024
b1e6cc3
refactor(daggerutil): update fileexists to print errors
jackw Apr 12, 2024
a8b6276
Change the NPMPackages func so that it takes advantage of caching and…
kminehart May 16, 2024
afe542e
Remove unused in NPMPackages
kminehart May 16, 2024
9ebc4ff
Remove unnecessary comment block
kminehart May 16, 2024
668cab3
reverse conditions; check for lerna.json
kminehart May 24, 2024
ff275ea
Merge branch 'main' into jackw/nx-release
jackw Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion artifacts/npm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (f *NPMPackages) BuildFile(ctx context.Context, builder *dagger.Container,
}

func (f *NPMPackages) BuildDir(ctx context.Context, builder *dagger.Container, opts *pipeline.ArtifactContainerOpts) (*dagger.Directory, error) {
return frontend.NPMPackages(builder, f.Src, strings.TrimPrefix(f.Version, "v")), nil
return frontend.NPMPackages(ctx, builder, opts.Client, opts.Log, f.Src, strings.TrimPrefix(f.Version, "v"))
}

func (f *NPMPackages) Publisher(ctx context.Context, opts *pipeline.ArtifactContainerOpts) (*dagger.Container, error) {
Expand Down
47 changes: 40 additions & 7 deletions frontend/npm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,52 @@ package frontend
import (
"context"
"fmt"
"log/slog"

"dagger.io/dagger"
"github.com/grafana/grafana-build/containers"
)

// NPMPackages returns a dagger.Directory which contains the Grafana NPM packages from the grafana source code.
func NPMPackages(builder *dagger.Container, src *dagger.Directory, ersion string) *dagger.Directory {
// NPMPackages versions and packs the npm packages into tarballs into `npm-packages` directory.
// It then returns the npm-packages directory as a dagger.Directory.
func NPMPackages(ctx context.Context, builder *dagger.Container, d *dagger.Client, log *slog.Logger, src *dagger.Directory, ersion string) (*dagger.Directory, error) {
// Check if the version of Grafana uses lerna or nx to manage package versioning.
var (
out = fmt.Sprintf("/src/npm-packages/%%s-%v.tgz", "v"+ersion)

lernaBuild = fmt.Sprintf("yarn lerna version %s --exact --no-git-tag-version --no-push --force-publish -y", ersion)
lernaPack = fmt.Sprintf("yarn lerna exec --no-private -- yarn pack --out %s", out)

nxBuild = fmt.Sprintf("yarn nx release version %s --no-git-commit --no-git-tag --no-stage-changes --group grafanaPackages", ersion)
nxPack = fmt.Sprintf("yarn nx exec --projects=$(cat nx.json | jq -r '.relase.groups.grafanaPackages.projects | join(\",\")') -- yarn pack --out %s", out)
)

return builder.WithExec([]string{"mkdir", "npm-packages"}).
WithExec([]string{"yarn", "run", "packages:build"}).
// TODO: We should probably start reusing the yarn pnp map if we can figure that out instead of rerunning yarn install everywhere.
WithExec([]string{"yarn", "run", "lerna", "version", ersion, "--exact", "--no-git-tag-version", "--no-push", "--force-publish", "-y"}).
WithExec([]string{"yarn", "lerna", "exec", "--no-private", "--", "yarn", "pack", "--out", fmt.Sprintf("/src/npm-packages/%%s-%v.tgz", "v"+ersion)}).
Directory("./npm-packages")
WithExec([]string{"yarn", "packages:build"}).
WithExec([]string{"/bin/sh", "-c", fmt.Sprintf("if [ -f .nx ]; then %s; else %s; fi", nxBuild, lernaBuild)}).
kminehart marked this conversation as resolved.
Show resolved Hide resolved
WithExec([]string{"/bin/sh", "-c", fmt.Sprintf("if [ -f .nx ]; then %s; else %s; fi", nxPack, lernaPack)}).
Directory("./npm-packages"), nil

// if hasNx {
// packages, err := containers.GetJSONValue(ctx, d, src, "nx.json", "release.groups.grafanaPackages.projects")
// if err != nil {
// return nil, err
// }

// var packagesToPack []string
// err = json.Unmarshal(([]byte)(packages), &packagesToPack)
// if err != nil {
// return nil, err
// }

// grafanaPackages := strings.Join(packagesToPack, ",")

// return builder.
// Directory("./npm-packages"), nil
// }

// log.Error("No lerna.json or nx.json found in source directory")
// return nil, fmt.Errorf("no lerna.json or nx.json found in source directory")
}

// PublishNPM publishes a npm package to the given destination.
Expand Down