diff --git a/cmd/dagger/cmd/doc.go b/cmd/dagger/cmd/doc.go index dcdc3f3f..eee6c296 100644 --- a/cmd/dagger/cmd/doc.go +++ b/cmd/dagger/cmd/doc.go @@ -21,7 +21,7 @@ import ( "go.dagger.io/dagger/cmd/dagger/logger" "go.dagger.io/dagger/compiler" "go.dagger.io/dagger/environment" - "go.dagger.io/dagger/stdlib" + "go.dagger.io/dagger/pkg" "golang.org/x/term" ) @@ -315,7 +315,7 @@ func init() { func loadCode(packageName string) (*compiler.Value, error) { sources := map[string]fs.FS{ - stdlib.Path: stdlib.FS, + path.Join("cue.mod", "pkg"): pkg.FS, } src, err := compiler.Build("/config", sources, packageName) @@ -333,20 +333,23 @@ func walkStdlib(ctx context.Context, output, format string) { lg.Info().Str("output", output).Msg("generating stdlib") packages := map[string]*Package{} - err := fs.WalkDir(stdlib.FS, ".", func(p string, d fs.DirEntry, err error) error { + err := fs.WalkDir(pkg.FS, pkg.AlphaModule, func(p string, d fs.DirEntry, err error) error { if err != nil { return err } - if p == "." || !d.IsDir() || d.Name() == "cue.mod" { + + if p == "." || d.Name() == pkg.AlphaModule || !d.IsDir() || d.Name() == "cue.mod" { return nil } + p = strings.TrimPrefix(p, pkg.AlphaModule+"/") + // Ignore tests directories if d.Name() == "tests" { return nil } - pkgName := fmt.Sprintf("%s/%s", stdlib.ModuleName, p) + pkgName := fmt.Sprintf("%s/%s", pkg.AlphaModule, p) lg.Info().Str("package", pkgName).Str("format", format).Msg("generating doc") val, err := loadCode(pkgName) if err != nil { diff --git a/mod/mod.go b/mod/mod.go index 84f58912..49fabc22 100644 --- a/mod/mod.go +++ b/mod/mod.go @@ -9,7 +9,7 @@ import ( "github.com/gofrs/flock" "github.com/rs/zerolog/log" - "go.dagger.io/dagger/stdlib" + "go.dagger.io/dagger/pkg" ) const ( @@ -17,7 +17,7 @@ const ( ) func isUniverse(repoName string) bool { - return strings.HasPrefix(strings.ToLower(repoName), stdlib.ModuleName) + return strings.HasPrefix(strings.ToLower(repoName), pkg.AlphaModule) } // IsUniverseLatest check that current universe is up-to-date or no @@ -32,7 +32,7 @@ func IsUniverseLatest(ctx context.Context, workspace string) (bool, error) { return false, err } - req, err := newRequire("alpha.dagger.io", UniverseVersionConstraint) + req, err := newRequire(pkg.AlphaModule, UniverseVersionConstraint) if err != nil { return false, err } diff --git a/mod/require.go b/mod/require.go index 529e93da..d5061fa2 100644 --- a/mod/require.go +++ b/mod/require.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "go.dagger.io/dagger/stdlib" + "go.dagger.io/dagger/pkg" ) type Require struct { @@ -27,7 +27,7 @@ func newRequire(repoName, versionConstraint string) (*Require, error) { switch { case strings.HasPrefix(repoName, "github.com"): return parseGithubRepoName(repoName, versionConstraint) - case strings.HasPrefix(repoName, stdlib.ModuleName): + case strings.HasPrefix(repoName, pkg.AlphaModule): return parseDaggerRepoName(repoName, versionConstraint) case strings.Contains(repoName, ".git"): return parseGitRepoName(repoName, versionConstraint) @@ -56,7 +56,7 @@ func parseGithubRepoName(repoName, versionConstraint string) (*Require, error) { }, nil } -var daggerRepoNameRegex = regexp.MustCompile(stdlib.ModuleName + `([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`) +var daggerRepoNameRegex = regexp.MustCompile(pkg.AlphaModule + `([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`) func parseDaggerRepoName(repoName, versionConstraint string) (*Require, error) { repoMatches := daggerRepoNameRegex.FindStringSubmatch(repoName) @@ -66,7 +66,7 @@ func parseDaggerRepoName(repoName, versionConstraint string) (*Require, error) { } return &Require{ - repo: stdlib.ModuleName, + repo: pkg.AlphaModule, path: repoMatches[1], version: repoMatches[2], versionConstraint: versionConstraint, diff --git a/stdlib/.dagger/env/alpine/.gitignore b/pkg/alpha.dagger.io/.dagger/env/alpine/.gitignore similarity index 100% rename from stdlib/.dagger/env/alpine/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/alpine/.gitignore diff --git a/stdlib/.dagger/env/alpine/values.yaml b/pkg/alpha.dagger.io/.dagger/env/alpine/values.yaml similarity index 100% rename from stdlib/.dagger/env/alpine/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/alpine/values.yaml diff --git a/stdlib/.dagger/env/argocd-infra/.gitignore b/pkg/alpha.dagger.io/.dagger/env/argocd-infra/.gitignore similarity index 100% rename from stdlib/.dagger/env/argocd-infra/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/argocd-infra/.gitignore diff --git a/stdlib/.dagger/env/argocd-infra/values.yaml b/pkg/alpha.dagger.io/.dagger/env/argocd-infra/values.yaml similarity index 100% rename from stdlib/.dagger/env/argocd-infra/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/argocd-infra/values.yaml diff --git a/stdlib/.dagger/env/argocd/.gitignore b/pkg/alpha.dagger.io/.dagger/env/argocd/.gitignore similarity index 100% rename from stdlib/.dagger/env/argocd/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/argocd/.gitignore diff --git a/stdlib/.dagger/env/argocd/values.yaml b/pkg/alpha.dagger.io/.dagger/env/argocd/values.yaml similarity index 100% rename from stdlib/.dagger/env/argocd/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/argocd/values.yaml diff --git a/stdlib/.dagger/env/aws-ecr-localstack/.gitignore b/pkg/alpha.dagger.io/.dagger/env/aws-ecr-localstack/.gitignore similarity index 100% rename from stdlib/.dagger/env/aws-ecr-localstack/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/aws-ecr-localstack/.gitignore diff --git a/stdlib/.dagger/env/aws-ecr-localstack/values.yaml b/pkg/alpha.dagger.io/.dagger/env/aws-ecr-localstack/values.yaml similarity index 100% rename from stdlib/.dagger/env/aws-ecr-localstack/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/aws-ecr-localstack/values.yaml diff --git a/stdlib/.dagger/env/aws-ecr/.gitignore b/pkg/alpha.dagger.io/.dagger/env/aws-ecr/.gitignore similarity index 100% rename from stdlib/.dagger/env/aws-ecr/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/aws-ecr/.gitignore diff --git a/stdlib/.dagger/env/aws-ecr/values.yaml b/pkg/alpha.dagger.io/.dagger/env/aws-ecr/values.yaml similarity index 100% rename from stdlib/.dagger/env/aws-ecr/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/aws-ecr/values.yaml diff --git a/stdlib/.dagger/env/aws-eks/.gitignore b/pkg/alpha.dagger.io/.dagger/env/aws-eks/.gitignore similarity index 100% rename from stdlib/.dagger/env/aws-eks/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/aws-eks/.gitignore diff --git a/stdlib/.dagger/env/aws-eks/values.yaml b/pkg/alpha.dagger.io/.dagger/env/aws-eks/values.yaml similarity index 100% rename from stdlib/.dagger/env/aws-eks/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/aws-eks/values.yaml diff --git a/stdlib/.dagger/env/aws-s3-localstack/.gitignore b/pkg/alpha.dagger.io/.dagger/env/aws-s3-localstack/.gitignore similarity index 100% rename from stdlib/.dagger/env/aws-s3-localstack/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/aws-s3-localstack/.gitignore diff --git a/stdlib/.dagger/env/aws-s3-localstack/values.yaml b/pkg/alpha.dagger.io/.dagger/env/aws-s3-localstack/values.yaml similarity index 100% rename from stdlib/.dagger/env/aws-s3-localstack/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/aws-s3-localstack/values.yaml diff --git a/stdlib/.dagger/env/aws-s3/.gitignore b/pkg/alpha.dagger.io/.dagger/env/aws-s3/.gitignore similarity index 100% rename from stdlib/.dagger/env/aws-s3/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/aws-s3/.gitignore diff --git a/stdlib/.dagger/env/aws-s3/values.yaml b/pkg/alpha.dagger.io/.dagger/env/aws-s3/values.yaml similarity index 100% rename from stdlib/.dagger/env/aws-s3/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/aws-s3/values.yaml diff --git a/stdlib/.dagger/env/azure-resourcegroup/.gitignore b/pkg/alpha.dagger.io/.dagger/env/azure-resourcegroup/.gitignore similarity index 100% rename from stdlib/.dagger/env/azure-resourcegroup/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/azure-resourcegroup/.gitignore diff --git a/stdlib/.dagger/env/azure-resourcegroup/values.yaml b/pkg/alpha.dagger.io/.dagger/env/azure-resourcegroup/values.yaml similarity index 100% rename from stdlib/.dagger/env/azure-resourcegroup/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/azure-resourcegroup/values.yaml diff --git a/stdlib/.dagger/env/bats/.gitignore b/pkg/alpha.dagger.io/.dagger/env/bats/.gitignore similarity index 100% rename from stdlib/.dagger/env/bats/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/bats/.gitignore diff --git a/stdlib/.dagger/env/bats/values.yaml b/pkg/alpha.dagger.io/.dagger/env/bats/values.yaml similarity index 100% rename from stdlib/.dagger/env/bats/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/bats/values.yaml diff --git a/stdlib/.dagger/env/docker-build/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-build/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-build/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-build/.gitignore diff --git a/stdlib/.dagger/env/docker-build/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-build/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-build/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-build/values.yaml diff --git a/stdlib/.dagger/env/docker-command-ssh-key-passphrase/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-command-ssh-key-passphrase/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-command-ssh-key-passphrase/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-command-ssh-key-passphrase/.gitignore diff --git a/stdlib/.dagger/env/docker-command-ssh-key-passphrase/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-command-ssh-key-passphrase/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-command-ssh-key-passphrase/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-command-ssh-key-passphrase/values.yaml diff --git a/stdlib/.dagger/env/docker-command-ssh-wrong-key-passphrase/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-command-ssh-wrong-key-passphrase/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-command-ssh-wrong-key-passphrase/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-command-ssh-wrong-key-passphrase/.gitignore diff --git a/stdlib/.dagger/env/docker-command-ssh-wrong-key-passphrase/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-command-ssh-wrong-key-passphrase/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-command-ssh-wrong-key-passphrase/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-command-ssh-wrong-key-passphrase/values.yaml diff --git a/stdlib/.dagger/env/docker-command-ssh/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-command-ssh/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-command-ssh/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-command-ssh/.gitignore diff --git a/stdlib/.dagger/env/docker-command-ssh/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-command-ssh/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-command-ssh/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-command-ssh/values.yaml diff --git a/stdlib/.dagger/env/docker-compose/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-compose/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-compose/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-compose/.gitignore diff --git a/stdlib/.dagger/env/docker-compose/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-compose/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-compose/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-compose/values.yaml diff --git a/stdlib/.dagger/env/docker-load/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-load/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-load/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-load/.gitignore diff --git a/stdlib/.dagger/env/docker-load/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-load/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-load/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-load/values.yaml diff --git a/stdlib/.dagger/env/docker-pull/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-pull/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-pull/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-pull/.gitignore diff --git a/stdlib/.dagger/env/docker-pull/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-pull/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-pull/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-pull/values.yaml diff --git a/stdlib/.dagger/env/docker-push-invalid-creds/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-push-invalid-creds/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-push-invalid-creds/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-push-invalid-creds/.gitignore diff --git a/stdlib/.dagger/env/docker-push-invalid-creds/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-push-invalid-creds/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-push-invalid-creds/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-push-invalid-creds/values.yaml diff --git a/stdlib/.dagger/env/docker-push-multi-registry/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-push-multi-registry/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-push-multi-registry/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-push-multi-registry/.gitignore diff --git a/stdlib/.dagger/env/docker-push-multi-registry/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-push-multi-registry/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-push-multi-registry/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-push-multi-registry/values.yaml diff --git a/stdlib/.dagger/env/docker-push/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-push/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-push/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-push/.gitignore diff --git a/stdlib/.dagger/env/docker-push/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-push/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-push/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-push/values.yaml diff --git a/stdlib/.dagger/env/docker-run-local/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-run-local/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-run-local/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-run-local/.gitignore diff --git a/stdlib/.dagger/env/docker-run-local/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-run-local/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-run-local/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-run-local/values.yaml diff --git a/stdlib/.dagger/env/docker-run-ports/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-run-ports/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-run-ports/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-run-ports/.gitignore diff --git a/stdlib/.dagger/env/docker-run-ports/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-run-ports/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-run-ports/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-run-ports/values.yaml diff --git a/stdlib/.dagger/env/docker-run-ssh/.gitignore b/pkg/alpha.dagger.io/.dagger/env/docker-run-ssh/.gitignore similarity index 100% rename from stdlib/.dagger/env/docker-run-ssh/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/docker-run-ssh/.gitignore diff --git a/stdlib/.dagger/env/docker-run-ssh/values.yaml b/pkg/alpha.dagger.io/.dagger/env/docker-run-ssh/values.yaml similarity index 100% rename from stdlib/.dagger/env/docker-run-ssh/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/docker-run-ssh/values.yaml diff --git a/stdlib/.dagger/env/git-commit/.gitignore b/pkg/alpha.dagger.io/.dagger/env/git-commit/.gitignore similarity index 100% rename from stdlib/.dagger/env/git-commit/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/git-commit/.gitignore diff --git a/stdlib/.dagger/env/git-commit/values.yaml b/pkg/alpha.dagger.io/.dagger/env/git-commit/values.yaml similarity index 100% rename from stdlib/.dagger/env/git-commit/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/git-commit/values.yaml diff --git a/stdlib/.dagger/env/git-repo/.gitignore b/pkg/alpha.dagger.io/.dagger/env/git-repo/.gitignore similarity index 100% rename from stdlib/.dagger/env/git-repo/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/git-repo/.gitignore diff --git a/stdlib/.dagger/env/git-repo/values.yaml b/pkg/alpha.dagger.io/.dagger/env/git-repo/values.yaml similarity index 100% rename from stdlib/.dagger/env/git-repo/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/git-repo/values.yaml diff --git a/stdlib/.dagger/env/go/.gitignore b/pkg/alpha.dagger.io/.dagger/env/go/.gitignore similarity index 100% rename from stdlib/.dagger/env/go/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/go/.gitignore diff --git a/stdlib/.dagger/env/go/values.yaml b/pkg/alpha.dagger.io/.dagger/env/go/values.yaml similarity index 100% rename from stdlib/.dagger/env/go/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/go/values.yaml diff --git a/stdlib/.dagger/env/google-cloudrun/.gitignore b/pkg/alpha.dagger.io/.dagger/env/google-cloudrun/.gitignore similarity index 100% rename from stdlib/.dagger/env/google-cloudrun/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/google-cloudrun/.gitignore diff --git a/stdlib/.dagger/env/google-cloudrun/values.yaml b/pkg/alpha.dagger.io/.dagger/env/google-cloudrun/values.yaml similarity index 100% rename from stdlib/.dagger/env/google-cloudrun/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/google-cloudrun/values.yaml diff --git a/stdlib/.dagger/env/google-gcr/.gitignore b/pkg/alpha.dagger.io/.dagger/env/google-gcr/.gitignore similarity index 100% rename from stdlib/.dagger/env/google-gcr/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/google-gcr/.gitignore diff --git a/stdlib/.dagger/env/google-gcr/values.yaml b/pkg/alpha.dagger.io/.dagger/env/google-gcr/values.yaml similarity index 100% rename from stdlib/.dagger/env/google-gcr/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/google-gcr/values.yaml diff --git a/stdlib/.dagger/env/google-gcs/.gitignore b/pkg/alpha.dagger.io/.dagger/env/google-gcs/.gitignore similarity index 100% rename from stdlib/.dagger/env/google-gcs/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/google-gcs/.gitignore diff --git a/stdlib/.dagger/env/google-gcs/values.yaml b/pkg/alpha.dagger.io/.dagger/env/google-gcs/values.yaml similarity index 100% rename from stdlib/.dagger/env/google-gcs/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/google-gcs/values.yaml diff --git a/stdlib/.dagger/env/google-gke/.gitignore b/pkg/alpha.dagger.io/.dagger/env/google-gke/.gitignore similarity index 100% rename from stdlib/.dagger/env/google-gke/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/google-gke/.gitignore diff --git a/stdlib/.dagger/env/google-gke/values.yaml b/pkg/alpha.dagger.io/.dagger/env/google-gke/values.yaml similarity index 100% rename from stdlib/.dagger/env/google-gke/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/google-gke/values.yaml diff --git a/stdlib/.dagger/env/google-secretmanager/.gitignore b/pkg/alpha.dagger.io/.dagger/env/google-secretmanager/.gitignore similarity index 100% rename from stdlib/.dagger/env/google-secretmanager/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/google-secretmanager/.gitignore diff --git a/stdlib/.dagger/env/google-secretmanager/values.yaml b/pkg/alpha.dagger.io/.dagger/env/google-secretmanager/values.yaml similarity index 100% rename from stdlib/.dagger/env/google-secretmanager/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/google-secretmanager/values.yaml diff --git a/stdlib/.dagger/env/graphql/.gitignore b/pkg/alpha.dagger.io/.dagger/env/graphql/.gitignore similarity index 100% rename from stdlib/.dagger/env/graphql/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/graphql/.gitignore diff --git a/stdlib/.dagger/env/graphql/values.yaml b/pkg/alpha.dagger.io/.dagger/env/graphql/values.yaml similarity index 100% rename from stdlib/.dagger/env/graphql/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/graphql/values.yaml diff --git a/stdlib/.dagger/env/http/.gitignore b/pkg/alpha.dagger.io/.dagger/env/http/.gitignore similarity index 100% rename from stdlib/.dagger/env/http/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/http/.gitignore diff --git a/stdlib/.dagger/env/http/values.yaml b/pkg/alpha.dagger.io/.dagger/env/http/values.yaml similarity index 100% rename from stdlib/.dagger/env/http/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/http/values.yaml diff --git a/stdlib/.dagger/env/java-maven/.gitignore b/pkg/alpha.dagger.io/.dagger/env/java-maven/.gitignore similarity index 100% rename from stdlib/.dagger/env/java-maven/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/java-maven/.gitignore diff --git a/stdlib/.dagger/env/java-maven/values.yaml b/pkg/alpha.dagger.io/.dagger/env/java-maven/values.yaml similarity index 100% rename from stdlib/.dagger/env/java-maven/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/java-maven/values.yaml diff --git a/stdlib/.dagger/env/js-yarn/.gitignore b/pkg/alpha.dagger.io/.dagger/env/js-yarn/.gitignore similarity index 100% rename from stdlib/.dagger/env/js-yarn/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/js-yarn/.gitignore diff --git a/stdlib/.dagger/env/js-yarn/values.yaml b/pkg/alpha.dagger.io/.dagger/env/js-yarn/values.yaml similarity index 100% rename from stdlib/.dagger/env/js-yarn/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/js-yarn/values.yaml diff --git a/stdlib/.dagger/env/kubernetes-deployment/.gitignore b/pkg/alpha.dagger.io/.dagger/env/kubernetes-deployment/.gitignore similarity index 100% rename from stdlib/.dagger/env/kubernetes-deployment/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/kubernetes-deployment/.gitignore diff --git a/stdlib/.dagger/env/kubernetes-deployment/values.yaml b/pkg/alpha.dagger.io/.dagger/env/kubernetes-deployment/values.yaml similarity index 100% rename from stdlib/.dagger/env/kubernetes-deployment/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/kubernetes-deployment/values.yaml diff --git a/stdlib/.dagger/env/kubernetes-helm/.gitignore b/pkg/alpha.dagger.io/.dagger/env/kubernetes-helm/.gitignore similarity index 100% rename from stdlib/.dagger/env/kubernetes-helm/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/kubernetes-helm/.gitignore diff --git a/stdlib/.dagger/env/kubernetes-helm/values.yaml b/pkg/alpha.dagger.io/.dagger/env/kubernetes-helm/values.yaml similarity index 100% rename from stdlib/.dagger/env/kubernetes-helm/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/kubernetes-helm/values.yaml diff --git a/stdlib/.dagger/env/kubernetes-kustomize/.gitignore b/pkg/alpha.dagger.io/.dagger/env/kubernetes-kustomize/.gitignore similarity index 100% rename from stdlib/.dagger/env/kubernetes-kustomize/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/kubernetes-kustomize/.gitignore diff --git a/stdlib/.dagger/env/kubernetes-kustomize/values.yaml b/pkg/alpha.dagger.io/.dagger/env/kubernetes-kustomize/values.yaml similarity index 100% rename from stdlib/.dagger/env/kubernetes-kustomize/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/kubernetes-kustomize/values.yaml diff --git a/stdlib/.dagger/env/netlify/.gitignore b/pkg/alpha.dagger.io/.dagger/env/netlify/.gitignore similarity index 100% rename from stdlib/.dagger/env/netlify/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/netlify/.gitignore diff --git a/stdlib/.dagger/env/netlify/values.yaml b/pkg/alpha.dagger.io/.dagger/env/netlify/values.yaml similarity index 100% rename from stdlib/.dagger/env/netlify/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/netlify/values.yaml diff --git a/stdlib/.dagger/env/os-container/.gitignore b/pkg/alpha.dagger.io/.dagger/env/os-container/.gitignore similarity index 100% rename from stdlib/.dagger/env/os-container/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/os-container/.gitignore diff --git a/stdlib/.dagger/env/os-container/values.yaml b/pkg/alpha.dagger.io/.dagger/env/os-container/values.yaml similarity index 100% rename from stdlib/.dagger/env/os-container/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/os-container/values.yaml diff --git a/stdlib/.dagger/env/os/.gitignore b/pkg/alpha.dagger.io/.dagger/env/os/.gitignore similarity index 100% rename from stdlib/.dagger/env/os/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/os/.gitignore diff --git a/stdlib/.dagger/env/os/values.yaml b/pkg/alpha.dagger.io/.dagger/env/os/values.yaml similarity index 100% rename from stdlib/.dagger/env/os/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/os/values.yaml diff --git a/stdlib/.dagger/env/sanity-check/.gitignore b/pkg/alpha.dagger.io/.dagger/env/sanity-check/.gitignore similarity index 100% rename from stdlib/.dagger/env/sanity-check/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/sanity-check/.gitignore diff --git a/stdlib/.dagger/env/sanity-check/plan/cue.mod/module.cue b/pkg/alpha.dagger.io/.dagger/env/sanity-check/plan/cue.mod/module.cue similarity index 100% rename from stdlib/.dagger/env/sanity-check/plan/cue.mod/module.cue rename to pkg/alpha.dagger.io/.dagger/env/sanity-check/plan/cue.mod/module.cue diff --git a/stdlib/.dagger/env/sanity-check/plan/cue.mod/pkg/.gitignore b/pkg/alpha.dagger.io/.dagger/env/sanity-check/plan/cue.mod/pkg/.gitignore similarity index 100% rename from stdlib/.dagger/env/sanity-check/plan/cue.mod/pkg/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/sanity-check/plan/cue.mod/pkg/.gitignore diff --git a/stdlib/.dagger/env/sanity-check/plan/main.cue b/pkg/alpha.dagger.io/.dagger/env/sanity-check/plan/main.cue similarity index 100% rename from stdlib/.dagger/env/sanity-check/plan/main.cue rename to pkg/alpha.dagger.io/.dagger/env/sanity-check/plan/main.cue diff --git a/stdlib/.dagger/env/sanity-check/values.yaml b/pkg/alpha.dagger.io/.dagger/env/sanity-check/values.yaml similarity index 100% rename from stdlib/.dagger/env/sanity-check/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/sanity-check/values.yaml diff --git a/stdlib/.dagger/env/terraform/.gitignore b/pkg/alpha.dagger.io/.dagger/env/terraform/.gitignore similarity index 100% rename from stdlib/.dagger/env/terraform/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/terraform/.gitignore diff --git a/stdlib/.dagger/env/terraform/values.yaml b/pkg/alpha.dagger.io/.dagger/env/terraform/values.yaml similarity index 100% rename from stdlib/.dagger/env/terraform/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/terraform/values.yaml diff --git a/stdlib/.dagger/env/trivy/.gitignore b/pkg/alpha.dagger.io/.dagger/env/trivy/.gitignore similarity index 100% rename from stdlib/.dagger/env/trivy/.gitignore rename to pkg/alpha.dagger.io/.dagger/env/trivy/.gitignore diff --git a/stdlib/.dagger/env/trivy/values.yaml b/pkg/alpha.dagger.io/.dagger/env/trivy/values.yaml similarity index 100% rename from stdlib/.dagger/env/trivy/values.yaml rename to pkg/alpha.dagger.io/.dagger/env/trivy/values.yaml diff --git a/stdlib/.gitignore b/pkg/alpha.dagger.io/.gitignore similarity index 100% rename from stdlib/.gitignore rename to pkg/alpha.dagger.io/.gitignore diff --git a/stdlib/alpine/alpine.cue b/pkg/alpha.dagger.io/alpine/alpine.cue similarity index 100% rename from stdlib/alpine/alpine.cue rename to pkg/alpha.dagger.io/alpine/alpine.cue diff --git a/stdlib/alpine/tests/alpine.cue b/pkg/alpha.dagger.io/alpine/tests/alpine.cue similarity index 100% rename from stdlib/alpine/tests/alpine.cue rename to pkg/alpha.dagger.io/alpine/tests/alpine.cue diff --git a/stdlib/argocd/app.cue b/pkg/alpha.dagger.io/argocd/app.cue similarity index 100% rename from stdlib/argocd/app.cue rename to pkg/alpha.dagger.io/argocd/app.cue diff --git a/stdlib/argocd/argocd.cue b/pkg/alpha.dagger.io/argocd/argocd.cue similarity index 100% rename from stdlib/argocd/argocd.cue rename to pkg/alpha.dagger.io/argocd/argocd.cue diff --git a/stdlib/argocd/status.cue b/pkg/alpha.dagger.io/argocd/status.cue similarity index 100% rename from stdlib/argocd/status.cue rename to pkg/alpha.dagger.io/argocd/status.cue diff --git a/stdlib/argocd/sync.cue b/pkg/alpha.dagger.io/argocd/sync.cue similarity index 100% rename from stdlib/argocd/sync.cue rename to pkg/alpha.dagger.io/argocd/sync.cue diff --git a/stdlib/argocd/tests/argocd.cue b/pkg/alpha.dagger.io/argocd/tests/argocd.cue similarity index 100% rename from stdlib/argocd/tests/argocd.cue rename to pkg/alpha.dagger.io/argocd/tests/argocd.cue diff --git a/stdlib/argocd/tests/infra/infra.cue b/pkg/alpha.dagger.io/argocd/tests/infra/infra.cue similarity index 100% rename from stdlib/argocd/tests/infra/infra.cue rename to pkg/alpha.dagger.io/argocd/tests/infra/infra.cue diff --git a/stdlib/aws/aws.cue b/pkg/alpha.dagger.io/aws/aws.cue similarity index 100% rename from stdlib/aws/aws.cue rename to pkg/alpha.dagger.io/aws/aws.cue diff --git a/stdlib/aws/cloudformation/cloudformation.cue b/pkg/alpha.dagger.io/aws/cloudformation/cloudformation.cue similarity index 100% rename from stdlib/aws/cloudformation/cloudformation.cue rename to pkg/alpha.dagger.io/aws/cloudformation/cloudformation.cue diff --git a/stdlib/aws/cloudformation/code.cue b/pkg/alpha.dagger.io/aws/cloudformation/code.cue similarity index 100% rename from stdlib/aws/cloudformation/code.cue rename to pkg/alpha.dagger.io/aws/cloudformation/code.cue diff --git a/stdlib/aws/ecr/ecr.cue b/pkg/alpha.dagger.io/aws/ecr/ecr.cue similarity index 100% rename from stdlib/aws/ecr/ecr.cue rename to pkg/alpha.dagger.io/aws/ecr/ecr.cue diff --git a/stdlib/aws/ecr/tests/ecr.cue b/pkg/alpha.dagger.io/aws/ecr/tests/ecr.cue similarity index 100% rename from stdlib/aws/ecr/tests/ecr.cue rename to pkg/alpha.dagger.io/aws/ecr/tests/ecr.cue diff --git a/stdlib/aws/ecs/run-task.cue b/pkg/alpha.dagger.io/aws/ecs/run-task.cue similarity index 100% rename from stdlib/aws/ecs/run-task.cue rename to pkg/alpha.dagger.io/aws/ecs/run-task.cue diff --git a/stdlib/aws/eks/code.cue b/pkg/alpha.dagger.io/aws/eks/code.cue similarity index 100% rename from stdlib/aws/eks/code.cue rename to pkg/alpha.dagger.io/aws/eks/code.cue diff --git a/stdlib/aws/eks/eks.cue b/pkg/alpha.dagger.io/aws/eks/eks.cue similarity index 100% rename from stdlib/aws/eks/eks.cue rename to pkg/alpha.dagger.io/aws/eks/eks.cue diff --git a/stdlib/aws/eks/tests/eks.cue b/pkg/alpha.dagger.io/aws/eks/tests/eks.cue similarity index 100% rename from stdlib/aws/eks/tests/eks.cue rename to pkg/alpha.dagger.io/aws/eks/tests/eks.cue diff --git a/stdlib/aws/elb/elb.cue b/pkg/alpha.dagger.io/aws/elb/elb.cue similarity index 100% rename from stdlib/aws/elb/elb.cue rename to pkg/alpha.dagger.io/aws/elb/elb.cue diff --git a/stdlib/aws/rds/rds.cue b/pkg/alpha.dagger.io/aws/rds/rds.cue similarity index 100% rename from stdlib/aws/rds/rds.cue rename to pkg/alpha.dagger.io/aws/rds/rds.cue diff --git a/stdlib/aws/s3/s3.cue b/pkg/alpha.dagger.io/aws/s3/s3.cue similarity index 100% rename from stdlib/aws/s3/s3.cue rename to pkg/alpha.dagger.io/aws/s3/s3.cue diff --git a/stdlib/aws/s3/tests/s3.cue b/pkg/alpha.dagger.io/aws/s3/tests/s3.cue similarity index 100% rename from stdlib/aws/s3/tests/s3.cue rename to pkg/alpha.dagger.io/aws/s3/tests/s3.cue diff --git a/stdlib/aws/s3/tests/testdata/bar/foo.txt b/pkg/alpha.dagger.io/aws/s3/tests/testdata/bar/foo.txt similarity index 100% rename from stdlib/aws/s3/tests/testdata/bar/foo.txt rename to pkg/alpha.dagger.io/aws/s3/tests/testdata/bar/foo.txt diff --git a/stdlib/aws/s3/tests/testdata/dirFile.txt b/pkg/alpha.dagger.io/aws/s3/tests/testdata/dirFile.txt similarity index 100% rename from stdlib/aws/s3/tests/testdata/dirFile.txt rename to pkg/alpha.dagger.io/aws/s3/tests/testdata/dirFile.txt diff --git a/stdlib/aws/s3/tests/verify.cue b/pkg/alpha.dagger.io/aws/s3/tests/verify.cue similarity index 100% rename from stdlib/aws/s3/tests/verify.cue rename to pkg/alpha.dagger.io/aws/s3/tests/verify.cue diff --git a/stdlib/azure/azure.cue b/pkg/alpha.dagger.io/azure/azure.cue similarity index 100% rename from stdlib/azure/azure.cue rename to pkg/alpha.dagger.io/azure/azure.cue diff --git a/stdlib/azure/resourcegroup/rg.cue b/pkg/alpha.dagger.io/azure/resourcegroup/rg.cue similarity index 100% rename from stdlib/azure/resourcegroup/rg.cue rename to pkg/alpha.dagger.io/azure/resourcegroup/rg.cue diff --git a/stdlib/azure/resourcegroup/tests/rg.cue b/pkg/alpha.dagger.io/azure/resourcegroup/tests/rg.cue similarity index 100% rename from stdlib/azure/resourcegroup/tests/rg.cue rename to pkg/alpha.dagger.io/azure/resourcegroup/tests/rg.cue diff --git a/stdlib/azure/staticwebapp/stapp.cue b/pkg/alpha.dagger.io/azure/staticwebapp/stapp.cue similarity index 100% rename from stdlib/azure/staticwebapp/stapp.cue rename to pkg/alpha.dagger.io/azure/staticwebapp/stapp.cue diff --git a/stdlib/azure/staticwebapp/tests/stapp.cue b/pkg/alpha.dagger.io/azure/staticwebapp/tests/stapp.cue similarity index 100% rename from stdlib/azure/staticwebapp/tests/stapp.cue rename to pkg/alpha.dagger.io/azure/staticwebapp/tests/stapp.cue diff --git a/stdlib/azure/storage/st.cue b/pkg/alpha.dagger.io/azure/storage/st.cue similarity index 100% rename from stdlib/azure/storage/st.cue rename to pkg/alpha.dagger.io/azure/storage/st.cue diff --git a/stdlib/azure/storage/tests/st.cue b/pkg/alpha.dagger.io/azure/storage/tests/st.cue similarity index 100% rename from stdlib/azure/storage/tests/st.cue rename to pkg/alpha.dagger.io/azure/storage/tests/st.cue diff --git a/stdlib/bats/bats.cue b/pkg/alpha.dagger.io/bats/bats.cue similarity index 100% rename from stdlib/bats/bats.cue rename to pkg/alpha.dagger.io/bats/bats.cue diff --git a/stdlib/bats/tests/bats.cue b/pkg/alpha.dagger.io/bats/tests/bats.cue similarity index 100% rename from stdlib/bats/tests/bats.cue rename to pkg/alpha.dagger.io/bats/tests/bats.cue diff --git a/stdlib/bats/tests/testfile/mods/bats-assert/CHANGELOG.md b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/CHANGELOG.md similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-assert/CHANGELOG.md rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/CHANGELOG.md diff --git a/stdlib/bats/tests/testfile/mods/bats-assert/LICENSE b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/LICENSE similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-assert/LICENSE rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/LICENSE diff --git a/stdlib/bats/tests/testfile/mods/bats-assert/README.md b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/README.md similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-assert/README.md rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/README.md diff --git a/stdlib/bats/tests/testfile/mods/bats-assert/load.bash b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/load.bash similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-assert/load.bash rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/load.bash diff --git a/stdlib/bats/tests/testfile/mods/bats-assert/package.json b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/package.json similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-assert/package.json rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/package.json diff --git a/stdlib/bats/tests/testfile/mods/bats-assert/src/assert.bash b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/src/assert.bash similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-assert/src/assert.bash rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-assert/src/assert.bash diff --git a/stdlib/bats/tests/testfile/mods/bats-support/.travis.yml b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/.travis.yml similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-support/.travis.yml rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/.travis.yml diff --git a/stdlib/bats/tests/testfile/mods/bats-support/CHANGELOG.md b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/CHANGELOG.md similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-support/CHANGELOG.md rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/CHANGELOG.md diff --git a/stdlib/bats/tests/testfile/mods/bats-support/LICENSE b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/LICENSE similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-support/LICENSE rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/LICENSE diff --git a/stdlib/bats/tests/testfile/mods/bats-support/README.md b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/README.md similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-support/README.md rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/README.md diff --git a/stdlib/bats/tests/testfile/mods/bats-support/load.bash b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/load.bash similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-support/load.bash rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/load.bash diff --git a/stdlib/bats/tests/testfile/mods/bats-support/package.json b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/package.json similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-support/package.json rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/package.json diff --git a/stdlib/bats/tests/testfile/mods/bats-support/script/install-bats.sh b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/script/install-bats.sh similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-support/script/install-bats.sh rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/script/install-bats.sh diff --git a/stdlib/bats/tests/testfile/mods/bats-support/src/error.bash b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/src/error.bash similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-support/src/error.bash rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/src/error.bash diff --git a/stdlib/bats/tests/testfile/mods/bats-support/src/output.bash b/pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/src/output.bash similarity index 100% rename from stdlib/bats/tests/testfile/mods/bats-support/src/output.bash rename to pkg/alpha.dagger.io/bats/tests/testfile/mods/bats-support/src/output.bash diff --git a/stdlib/bats/tests/testfile/test.bats b/pkg/alpha.dagger.io/bats/tests/testfile/test.bats similarity index 100% rename from stdlib/bats/tests/testfile/test.bats rename to pkg/alpha.dagger.io/bats/tests/testfile/test.bats diff --git a/stdlib/cue.mod/module.cue b/pkg/alpha.dagger.io/cue.mod/module.cue similarity index 100% rename from stdlib/cue.mod/module.cue rename to pkg/alpha.dagger.io/cue.mod/module.cue diff --git a/stdlib/cue.mod/pkg/.gitignore b/pkg/alpha.dagger.io/cue.mod/pkg/.gitignore similarity index 100% rename from stdlib/cue.mod/pkg/.gitignore rename to pkg/alpha.dagger.io/cue.mod/pkg/.gitignore diff --git a/stdlib/dagger/dagger.cue b/pkg/alpha.dagger.io/dagger/dagger.cue similarity index 100% rename from stdlib/dagger/dagger.cue rename to pkg/alpha.dagger.io/dagger/dagger.cue diff --git a/stdlib/dagger/op/op.cue b/pkg/alpha.dagger.io/dagger/op/op.cue similarity index 100% rename from stdlib/dagger/op/op.cue rename to pkg/alpha.dagger.io/dagger/op/op.cue diff --git a/stdlib/dagger/op/op_fullop.cue b/pkg/alpha.dagger.io/dagger/op/op_fullop.cue similarity index 100% rename from stdlib/dagger/op/op_fullop.cue rename to pkg/alpha.dagger.io/dagger/op/op_fullop.cue diff --git a/stdlib/docker/command.cue b/pkg/alpha.dagger.io/docker/command.cue similarity index 100% rename from stdlib/docker/command.cue rename to pkg/alpha.dagger.io/docker/command.cue diff --git a/stdlib/docker/compose/client.cue b/pkg/alpha.dagger.io/docker/compose/client.cue similarity index 100% rename from stdlib/docker/compose/client.cue rename to pkg/alpha.dagger.io/docker/compose/client.cue diff --git a/stdlib/docker/compose/compose.cue b/pkg/alpha.dagger.io/docker/compose/compose.cue similarity index 100% rename from stdlib/docker/compose/compose.cue rename to pkg/alpha.dagger.io/docker/compose/compose.cue diff --git a/stdlib/docker/compose/tests/cleanup.cue b/pkg/alpha.dagger.io/docker/compose/tests/cleanup.cue similarity index 100% rename from stdlib/docker/compose/tests/cleanup.cue rename to pkg/alpha.dagger.io/docker/compose/tests/cleanup.cue diff --git a/stdlib/docker/compose/tests/compose.cue b/pkg/alpha.dagger.io/docker/compose/tests/compose.cue similarity index 100% rename from stdlib/docker/compose/tests/compose.cue rename to pkg/alpha.dagger.io/docker/compose/tests/compose.cue diff --git a/stdlib/docker/compose/tests/testdata/Dockerfile b/pkg/alpha.dagger.io/docker/compose/tests/testdata/Dockerfile similarity index 100% rename from stdlib/docker/compose/tests/testdata/Dockerfile rename to pkg/alpha.dagger.io/docker/compose/tests/testdata/Dockerfile diff --git a/stdlib/docker/compose/tests/testdata/docker-compose.yaml b/pkg/alpha.dagger.io/docker/compose/tests/testdata/docker-compose.yaml similarity index 100% rename from stdlib/docker/compose/tests/testdata/docker-compose.yaml rename to pkg/alpha.dagger.io/docker/compose/tests/testdata/docker-compose.yaml diff --git a/stdlib/docker/compose/tests/testdata/index.ts b/pkg/alpha.dagger.io/docker/compose/tests/testdata/index.ts similarity index 100% rename from stdlib/docker/compose/tests/testdata/index.ts rename to pkg/alpha.dagger.io/docker/compose/tests/testdata/index.ts diff --git a/stdlib/docker/compose/tests/testdata/package.json b/pkg/alpha.dagger.io/docker/compose/tests/testdata/package.json similarity index 100% rename from stdlib/docker/compose/tests/testdata/package.json rename to pkg/alpha.dagger.io/docker/compose/tests/testdata/package.json diff --git a/stdlib/docker/compose/tests/testdata/tsconfig.json b/pkg/alpha.dagger.io/docker/compose/tests/testdata/tsconfig.json similarity index 100% rename from stdlib/docker/compose/tests/testdata/tsconfig.json rename to pkg/alpha.dagger.io/docker/compose/tests/testdata/tsconfig.json diff --git a/stdlib/docker/docker.cue b/pkg/alpha.dagger.io/docker/docker.cue similarity index 100% rename from stdlib/docker/docker.cue rename to pkg/alpha.dagger.io/docker/docker.cue diff --git a/stdlib/docker/tests/build/dockerfile.cue b/pkg/alpha.dagger.io/docker/tests/build/dockerfile.cue similarity index 100% rename from stdlib/docker/tests/build/dockerfile.cue rename to pkg/alpha.dagger.io/docker/tests/build/dockerfile.cue diff --git a/stdlib/docker/tests/build/testdata/build/Dockerfile b/pkg/alpha.dagger.io/docker/tests/build/testdata/build/Dockerfile similarity index 100% rename from stdlib/docker/tests/build/testdata/build/Dockerfile rename to pkg/alpha.dagger.io/docker/tests/build/testdata/build/Dockerfile diff --git a/stdlib/docker/tests/build/testdata/dockerfile/test.txt b/pkg/alpha.dagger.io/docker/tests/build/testdata/dockerfile/test.txt similarity index 100% rename from stdlib/docker/tests/build/testdata/dockerfile/test.txt rename to pkg/alpha.dagger.io/docker/tests/build/testdata/dockerfile/test.txt diff --git a/stdlib/docker/tests/command-host/command.cue b/pkg/alpha.dagger.io/docker/tests/command-host/command.cue similarity index 100% rename from stdlib/docker/tests/command-host/command.cue rename to pkg/alpha.dagger.io/docker/tests/command-host/command.cue diff --git a/stdlib/docker/tests/command-ssh-key-passphrase/command.cue b/pkg/alpha.dagger.io/docker/tests/command-ssh-key-passphrase/command.cue similarity index 100% rename from stdlib/docker/tests/command-ssh-key-passphrase/command.cue rename to pkg/alpha.dagger.io/docker/tests/command-ssh-key-passphrase/command.cue diff --git a/stdlib/docker/tests/command-ssh-wrong-key-passphrase/command.cue b/pkg/alpha.dagger.io/docker/tests/command-ssh-wrong-key-passphrase/command.cue similarity index 100% rename from stdlib/docker/tests/command-ssh-wrong-key-passphrase/command.cue rename to pkg/alpha.dagger.io/docker/tests/command-ssh-wrong-key-passphrase/command.cue diff --git a/stdlib/docker/tests/command-ssh/command.cue b/pkg/alpha.dagger.io/docker/tests/command-ssh/command.cue similarity index 100% rename from stdlib/docker/tests/command-ssh/command.cue rename to pkg/alpha.dagger.io/docker/tests/command-ssh/command.cue diff --git a/stdlib/docker/tests/load/load.cue b/pkg/alpha.dagger.io/docker/tests/load/load.cue similarity index 100% rename from stdlib/docker/tests/load/load.cue rename to pkg/alpha.dagger.io/docker/tests/load/load.cue diff --git a/stdlib/docker/tests/load/testdata/Dockerfile b/pkg/alpha.dagger.io/docker/tests/load/testdata/Dockerfile similarity index 100% rename from stdlib/docker/tests/load/testdata/Dockerfile rename to pkg/alpha.dagger.io/docker/tests/load/testdata/Dockerfile diff --git a/stdlib/docker/tests/pull/pull.cue b/pkg/alpha.dagger.io/docker/tests/pull/pull.cue similarity index 100% rename from stdlib/docker/tests/pull/pull.cue rename to pkg/alpha.dagger.io/docker/tests/pull/pull.cue diff --git a/stdlib/docker/tests/push-invalid-creds/push.cue b/pkg/alpha.dagger.io/docker/tests/push-invalid-creds/push.cue similarity index 100% rename from stdlib/docker/tests/push-invalid-creds/push.cue rename to pkg/alpha.dagger.io/docker/tests/push-invalid-creds/push.cue diff --git a/stdlib/docker/tests/push-multi-registry/push.cue b/pkg/alpha.dagger.io/docker/tests/push-multi-registry/push.cue similarity index 100% rename from stdlib/docker/tests/push-multi-registry/push.cue rename to pkg/alpha.dagger.io/docker/tests/push-multi-registry/push.cue diff --git a/stdlib/docker/tests/push/push.cue b/pkg/alpha.dagger.io/docker/tests/push/push.cue similarity index 100% rename from stdlib/docker/tests/push/push.cue rename to pkg/alpha.dagger.io/docker/tests/push/push.cue diff --git a/stdlib/docker/tests/run-host/simple.cue b/pkg/alpha.dagger.io/docker/tests/run-host/simple.cue similarity index 100% rename from stdlib/docker/tests/run-host/simple.cue rename to pkg/alpha.dagger.io/docker/tests/run-host/simple.cue diff --git a/stdlib/docker/tests/run-local/local.cue b/pkg/alpha.dagger.io/docker/tests/run-local/local.cue similarity index 100% rename from stdlib/docker/tests/run-local/local.cue rename to pkg/alpha.dagger.io/docker/tests/run-local/local.cue diff --git a/stdlib/docker/tests/run-ports/ports.cue b/pkg/alpha.dagger.io/docker/tests/run-ports/ports.cue similarity index 100% rename from stdlib/docker/tests/run-ports/ports.cue rename to pkg/alpha.dagger.io/docker/tests/run-ports/ports.cue diff --git a/stdlib/docker/tests/run-ssh/simple.cue b/pkg/alpha.dagger.io/docker/tests/run-ssh/simple.cue similarity index 100% rename from stdlib/docker/tests/run-ssh/simple.cue rename to pkg/alpha.dagger.io/docker/tests/run-ssh/simple.cue diff --git a/stdlib/europa/README.md b/pkg/alpha.dagger.io/europa/README.md similarity index 100% rename from stdlib/europa/README.md rename to pkg/alpha.dagger.io/europa/README.md diff --git a/stdlib/europa/dagger/engine/exec.cue b/pkg/alpha.dagger.io/europa/dagger/engine/exec.cue similarity index 100% rename from stdlib/europa/dagger/engine/exec.cue rename to pkg/alpha.dagger.io/europa/dagger/engine/exec.cue diff --git a/stdlib/europa/dagger/engine/fs.cue b/pkg/alpha.dagger.io/europa/dagger/engine/fs.cue similarity index 100% rename from stdlib/europa/dagger/engine/fs.cue rename to pkg/alpha.dagger.io/europa/dagger/engine/fs.cue diff --git a/stdlib/europa/dagger/engine/git.cue b/pkg/alpha.dagger.io/europa/dagger/engine/git.cue similarity index 100% rename from stdlib/europa/dagger/engine/git.cue rename to pkg/alpha.dagger.io/europa/dagger/engine/git.cue diff --git a/stdlib/europa/dagger/engine/http.cue b/pkg/alpha.dagger.io/europa/dagger/engine/http.cue similarity index 100% rename from stdlib/europa/dagger/engine/http.cue rename to pkg/alpha.dagger.io/europa/dagger/engine/http.cue diff --git a/stdlib/europa/dagger/engine/image.cue b/pkg/alpha.dagger.io/europa/dagger/engine/image.cue similarity index 100% rename from stdlib/europa/dagger/engine/image.cue rename to pkg/alpha.dagger.io/europa/dagger/engine/image.cue diff --git a/stdlib/europa/dagger/engine/plan.cue b/pkg/alpha.dagger.io/europa/dagger/engine/plan.cue similarity index 100% rename from stdlib/europa/dagger/engine/plan.cue rename to pkg/alpha.dagger.io/europa/dagger/engine/plan.cue diff --git a/stdlib/europa/dagger/engine/secret.cue b/pkg/alpha.dagger.io/europa/dagger/engine/secret.cue similarity index 100% rename from stdlib/europa/dagger/engine/secret.cue rename to pkg/alpha.dagger.io/europa/dagger/engine/secret.cue diff --git a/stdlib/europa/dagger/engine/types.cue b/pkg/alpha.dagger.io/europa/dagger/engine/types.cue similarity index 100% rename from stdlib/europa/dagger/engine/types.cue rename to pkg/alpha.dagger.io/europa/dagger/engine/types.cue diff --git a/stdlib/europa/dagger/plan.cue b/pkg/alpha.dagger.io/europa/dagger/plan.cue similarity index 100% rename from stdlib/europa/dagger/plan.cue rename to pkg/alpha.dagger.io/europa/dagger/plan.cue diff --git a/stdlib/europa/dagger/types.cue b/pkg/alpha.dagger.io/europa/dagger/types.cue similarity index 100% rename from stdlib/europa/dagger/types.cue rename to pkg/alpha.dagger.io/europa/dagger/types.cue diff --git a/stdlib/europa/dagger/utils.cue b/pkg/alpha.dagger.io/europa/dagger/utils.cue similarity index 100% rename from stdlib/europa/dagger/utils.cue rename to pkg/alpha.dagger.io/europa/dagger/utils.cue diff --git a/stdlib/gcp/cloudrun/cloudrun.cue b/pkg/alpha.dagger.io/gcp/cloudrun/cloudrun.cue similarity index 100% rename from stdlib/gcp/cloudrun/cloudrun.cue rename to pkg/alpha.dagger.io/gcp/cloudrun/cloudrun.cue diff --git a/stdlib/gcp/cloudrun/tests/cloudrun.cue b/pkg/alpha.dagger.io/gcp/cloudrun/tests/cloudrun.cue similarity index 100% rename from stdlib/gcp/cloudrun/tests/cloudrun.cue rename to pkg/alpha.dagger.io/gcp/cloudrun/tests/cloudrun.cue diff --git a/stdlib/gcp/gcloud.cue b/pkg/alpha.dagger.io/gcp/gcloud.cue similarity index 100% rename from stdlib/gcp/gcloud.cue rename to pkg/alpha.dagger.io/gcp/gcloud.cue diff --git a/stdlib/gcp/gcp.cue b/pkg/alpha.dagger.io/gcp/gcp.cue similarity index 100% rename from stdlib/gcp/gcp.cue rename to pkg/alpha.dagger.io/gcp/gcp.cue diff --git a/stdlib/gcp/gcr/gcr.cue b/pkg/alpha.dagger.io/gcp/gcr/gcr.cue similarity index 100% rename from stdlib/gcp/gcr/gcr.cue rename to pkg/alpha.dagger.io/gcp/gcr/gcr.cue diff --git a/stdlib/gcp/gcr/tests/gcr.cue b/pkg/alpha.dagger.io/gcp/gcr/tests/gcr.cue similarity index 100% rename from stdlib/gcp/gcr/tests/gcr.cue rename to pkg/alpha.dagger.io/gcp/gcr/tests/gcr.cue diff --git a/stdlib/gcp/gcs/gcs.cue b/pkg/alpha.dagger.io/gcp/gcs/gcs.cue similarity index 100% rename from stdlib/gcp/gcs/gcs.cue rename to pkg/alpha.dagger.io/gcp/gcs/gcs.cue diff --git a/stdlib/gcp/gcs/tests/gcs.cue b/pkg/alpha.dagger.io/gcp/gcs/tests/gcs.cue similarity index 100% rename from stdlib/gcp/gcs/tests/gcs.cue rename to pkg/alpha.dagger.io/gcp/gcs/tests/gcs.cue diff --git a/stdlib/gcp/gcs/tests/testdata/bar/foo.txt b/pkg/alpha.dagger.io/gcp/gcs/tests/testdata/bar/foo.txt similarity index 100% rename from stdlib/gcp/gcs/tests/testdata/bar/foo.txt rename to pkg/alpha.dagger.io/gcp/gcs/tests/testdata/bar/foo.txt diff --git a/stdlib/gcp/gcs/tests/testdata/dirFile.txt b/pkg/alpha.dagger.io/gcp/gcs/tests/testdata/dirFile.txt similarity index 100% rename from stdlib/gcp/gcs/tests/testdata/dirFile.txt rename to pkg/alpha.dagger.io/gcp/gcs/tests/testdata/dirFile.txt diff --git a/stdlib/gcp/gcs/tests/verify.cue b/pkg/alpha.dagger.io/gcp/gcs/tests/verify.cue similarity index 100% rename from stdlib/gcp/gcs/tests/verify.cue rename to pkg/alpha.dagger.io/gcp/gcs/tests/verify.cue diff --git a/stdlib/gcp/gke/gke.cue b/pkg/alpha.dagger.io/gcp/gke/gke.cue similarity index 100% rename from stdlib/gcp/gke/gke.cue rename to pkg/alpha.dagger.io/gcp/gke/gke.cue diff --git a/stdlib/gcp/gke/tests/gke.cue b/pkg/alpha.dagger.io/gcp/gke/tests/gke.cue similarity index 100% rename from stdlib/gcp/gke/tests/gke.cue rename to pkg/alpha.dagger.io/gcp/gke/tests/gke.cue diff --git a/stdlib/gcp/secretmanager/secrets.cue b/pkg/alpha.dagger.io/gcp/secretmanager/secrets.cue similarity index 100% rename from stdlib/gcp/secretmanager/secrets.cue rename to pkg/alpha.dagger.io/gcp/secretmanager/secrets.cue diff --git a/stdlib/gcp/secretmanager/tests/secrets.cue b/pkg/alpha.dagger.io/gcp/secretmanager/tests/secrets.cue similarity index 100% rename from stdlib/gcp/secretmanager/tests/secrets.cue rename to pkg/alpha.dagger.io/gcp/secretmanager/tests/secrets.cue diff --git a/stdlib/git/commit.cue b/pkg/alpha.dagger.io/git/commit.cue similarity index 100% rename from stdlib/git/commit.cue rename to pkg/alpha.dagger.io/git/commit.cue diff --git a/stdlib/git/git.cue b/pkg/alpha.dagger.io/git/git.cue similarity index 100% rename from stdlib/git/git.cue rename to pkg/alpha.dagger.io/git/git.cue diff --git a/stdlib/git/image.cue b/pkg/alpha.dagger.io/git/image.cue similarity index 100% rename from stdlib/git/image.cue rename to pkg/alpha.dagger.io/git/image.cue diff --git a/stdlib/git/tests/commit/commit.cue b/pkg/alpha.dagger.io/git/tests/commit/commit.cue similarity index 100% rename from stdlib/git/tests/commit/commit.cue rename to pkg/alpha.dagger.io/git/tests/commit/commit.cue diff --git a/stdlib/git/tests/git/git.cue b/pkg/alpha.dagger.io/git/tests/git/git.cue similarity index 100% rename from stdlib/git/tests/git/git.cue rename to pkg/alpha.dagger.io/git/tests/git/git.cue diff --git a/stdlib/go/go.cue b/pkg/alpha.dagger.io/go/go.cue similarity index 100% rename from stdlib/go/go.cue rename to pkg/alpha.dagger.io/go/go.cue diff --git a/stdlib/go/tests/go.cue b/pkg/alpha.dagger.io/go/tests/go.cue similarity index 100% rename from stdlib/go/tests/go.cue rename to pkg/alpha.dagger.io/go/tests/go.cue diff --git a/stdlib/go/tests/testdata/go.mod b/pkg/alpha.dagger.io/go/tests/testdata/go.mod similarity index 100% rename from stdlib/go/tests/testdata/go.mod rename to pkg/alpha.dagger.io/go/tests/testdata/go.mod diff --git a/stdlib/go/tests/testdata/main.go b/pkg/alpha.dagger.io/go/tests/testdata/main.go similarity index 100% rename from stdlib/go/tests/testdata/main.go rename to pkg/alpha.dagger.io/go/tests/testdata/main.go diff --git a/stdlib/graphql/graphql.cue b/pkg/alpha.dagger.io/graphql/graphql.cue similarity index 100% rename from stdlib/graphql/graphql.cue rename to pkg/alpha.dagger.io/graphql/graphql.cue diff --git a/stdlib/graphql/tests/graphql.cue b/pkg/alpha.dagger.io/graphql/tests/graphql.cue similarity index 100% rename from stdlib/graphql/tests/graphql.cue rename to pkg/alpha.dagger.io/graphql/tests/graphql.cue diff --git a/stdlib/helpers.bash b/pkg/alpha.dagger.io/helpers.bash similarity index 100% rename from stdlib/helpers.bash rename to pkg/alpha.dagger.io/helpers.bash diff --git a/stdlib/http/http.cue b/pkg/alpha.dagger.io/http/http.cue similarity index 100% rename from stdlib/http/http.cue rename to pkg/alpha.dagger.io/http/http.cue diff --git a/stdlib/http/tests/http.cue b/pkg/alpha.dagger.io/http/tests/http.cue similarity index 100% rename from stdlib/http/tests/http.cue rename to pkg/alpha.dagger.io/http/tests/http.cue diff --git a/stdlib/io/io.cue b/pkg/alpha.dagger.io/io/io.cue similarity index 100% rename from stdlib/io/io.cue rename to pkg/alpha.dagger.io/io/io.cue diff --git a/stdlib/java/maven/maven.cue b/pkg/alpha.dagger.io/java/maven/maven.cue similarity index 100% rename from stdlib/java/maven/maven.cue rename to pkg/alpha.dagger.io/java/maven/maven.cue diff --git a/stdlib/java/maven/tests/maven.cue b/pkg/alpha.dagger.io/java/maven/tests/maven.cue similarity index 100% rename from stdlib/java/maven/tests/maven.cue rename to pkg/alpha.dagger.io/java/maven/tests/maven.cue diff --git a/stdlib/java/maven/tests/testdata/.gitignore b/pkg/alpha.dagger.io/java/maven/tests/testdata/.gitignore similarity index 100% rename from stdlib/java/maven/tests/testdata/.gitignore rename to pkg/alpha.dagger.io/java/maven/tests/testdata/.gitignore diff --git a/stdlib/java/maven/tests/testdata/pom.xml b/pkg/alpha.dagger.io/java/maven/tests/testdata/pom.xml similarity index 100% rename from stdlib/java/maven/tests/testdata/pom.xml rename to pkg/alpha.dagger.io/java/maven/tests/testdata/pom.xml diff --git a/stdlib/java/maven/tests/testdata/src/main/java/io/dagger/maven/springboottest/SpringBootTestApplication.java b/pkg/alpha.dagger.io/java/maven/tests/testdata/src/main/java/io/dagger/maven/springboottest/SpringBootTestApplication.java similarity index 100% rename from stdlib/java/maven/tests/testdata/src/main/java/io/dagger/maven/springboottest/SpringBootTestApplication.java rename to pkg/alpha.dagger.io/java/maven/tests/testdata/src/main/java/io/dagger/maven/springboottest/SpringBootTestApplication.java diff --git a/stdlib/java/maven/tests/testdata/src/main/resources/application.properties b/pkg/alpha.dagger.io/java/maven/tests/testdata/src/main/resources/application.properties similarity index 100% rename from stdlib/java/maven/tests/testdata/src/main/resources/application.properties rename to pkg/alpha.dagger.io/java/maven/tests/testdata/src/main/resources/application.properties diff --git a/stdlib/java/maven/tests/testdata/src/test/java/io/dagger/maven/springboottest/SpringBootTestApplicationTests.java b/pkg/alpha.dagger.io/java/maven/tests/testdata/src/test/java/io/dagger/maven/springboottest/SpringBootTestApplicationTests.java similarity index 100% rename from stdlib/java/maven/tests/testdata/src/test/java/io/dagger/maven/springboottest/SpringBootTestApplicationTests.java rename to pkg/alpha.dagger.io/java/maven/tests/testdata/src/test/java/io/dagger/maven/springboottest/SpringBootTestApplicationTests.java diff --git a/stdlib/js/yarn/tests/testdata/package.json b/pkg/alpha.dagger.io/js/yarn/tests/testdata/package.json similarity index 100% rename from stdlib/js/yarn/tests/testdata/package.json rename to pkg/alpha.dagger.io/js/yarn/tests/testdata/package.json diff --git a/stdlib/js/yarn/tests/testdata2/package.json b/pkg/alpha.dagger.io/js/yarn/tests/testdata2/package.json similarity index 100% rename from stdlib/js/yarn/tests/testdata2/package.json rename to pkg/alpha.dagger.io/js/yarn/tests/testdata2/package.json diff --git a/stdlib/js/yarn/tests/yarn.cue b/pkg/alpha.dagger.io/js/yarn/tests/yarn.cue similarity index 100% rename from stdlib/js/yarn/tests/yarn.cue rename to pkg/alpha.dagger.io/js/yarn/tests/yarn.cue diff --git a/stdlib/js/yarn/yarn.cue b/pkg/alpha.dagger.io/js/yarn/yarn.cue similarity index 100% rename from stdlib/js/yarn/yarn.cue rename to pkg/alpha.dagger.io/js/yarn/yarn.cue diff --git a/stdlib/kubernetes/helm/code.cue b/pkg/alpha.dagger.io/kubernetes/helm/code.cue similarity index 100% rename from stdlib/kubernetes/helm/code.cue rename to pkg/alpha.dagger.io/kubernetes/helm/code.cue diff --git a/stdlib/kubernetes/helm/helm.cue b/pkg/alpha.dagger.io/kubernetes/helm/helm.cue similarity index 100% rename from stdlib/kubernetes/helm/helm.cue rename to pkg/alpha.dagger.io/kubernetes/helm/helm.cue diff --git a/stdlib/kubernetes/helm/tests/helm.cue b/pkg/alpha.dagger.io/kubernetes/helm/tests/helm.cue similarity index 100% rename from stdlib/kubernetes/helm/tests/helm.cue rename to pkg/alpha.dagger.io/kubernetes/helm/tests/helm.cue diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/.helmignore b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/.helmignore similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/.helmignore rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/.helmignore diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/Chart.yaml b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/Chart.yaml similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/Chart.yaml rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/Chart.yaml diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/templates/NOTES.txt b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/NOTES.txt similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/templates/NOTES.txt rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/NOTES.txt diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/templates/_helpers.tpl b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/_helpers.tpl similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/templates/_helpers.tpl rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/_helpers.tpl diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/templates/deployment.yaml b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/deployment.yaml similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/templates/deployment.yaml rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/deployment.yaml diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/templates/ingress.yaml b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/ingress.yaml similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/templates/ingress.yaml rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/ingress.yaml diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/templates/service.yaml b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/service.yaml similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/templates/service.yaml rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/service.yaml diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/templates/serviceaccount.yaml b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/serviceaccount.yaml similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/templates/serviceaccount.yaml rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/serviceaccount.yaml diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/templates/tests/test-connection.yaml b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/tests/test-connection.yaml similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/templates/tests/test-connection.yaml rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/templates/tests/test-connection.yaml diff --git a/stdlib/kubernetes/helm/tests/testdata/mychart/values.yaml b/pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/values.yaml similarity index 100% rename from stdlib/kubernetes/helm/tests/testdata/mychart/values.yaml rename to pkg/alpha.dagger.io/kubernetes/helm/tests/testdata/mychart/values.yaml diff --git a/stdlib/kubernetes/helm/tests/verify.cue b/pkg/alpha.dagger.io/kubernetes/helm/tests/verify.cue similarity index 100% rename from stdlib/kubernetes/helm/tests/verify.cue rename to pkg/alpha.dagger.io/kubernetes/helm/tests/verify.cue diff --git a/stdlib/kubernetes/kubernetes.cue b/pkg/alpha.dagger.io/kubernetes/kubernetes.cue similarity index 100% rename from stdlib/kubernetes/kubernetes.cue rename to pkg/alpha.dagger.io/kubernetes/kubernetes.cue diff --git a/stdlib/kubernetes/kustomize/kustomization.cue b/pkg/alpha.dagger.io/kubernetes/kustomize/kustomization.cue similarity index 100% rename from stdlib/kubernetes/kustomize/kustomization.cue rename to pkg/alpha.dagger.io/kubernetes/kustomize/kustomization.cue diff --git a/stdlib/kubernetes/kustomize/tests/kustomize.cue b/pkg/alpha.dagger.io/kubernetes/kustomize/tests/kustomize.cue similarity index 100% rename from stdlib/kubernetes/kustomize/tests/kustomize.cue rename to pkg/alpha.dagger.io/kubernetes/kustomize/tests/kustomize.cue diff --git a/stdlib/kubernetes/kustomize/tests/testdata/deployment.yaml b/pkg/alpha.dagger.io/kubernetes/kustomize/tests/testdata/deployment.yaml similarity index 100% rename from stdlib/kubernetes/kustomize/tests/testdata/deployment.yaml rename to pkg/alpha.dagger.io/kubernetes/kustomize/tests/testdata/deployment.yaml diff --git a/stdlib/kubernetes/kustomize/tests/testdata/pod.yaml b/pkg/alpha.dagger.io/kubernetes/kustomize/tests/testdata/pod.yaml similarity index 100% rename from stdlib/kubernetes/kustomize/tests/testdata/pod.yaml rename to pkg/alpha.dagger.io/kubernetes/kustomize/tests/testdata/pod.yaml diff --git a/stdlib/kubernetes/kustomize/tests/verify.cue b/pkg/alpha.dagger.io/kubernetes/kustomize/tests/verify.cue similarity index 100% rename from stdlib/kubernetes/kustomize/tests/verify.cue rename to pkg/alpha.dagger.io/kubernetes/kustomize/tests/verify.cue diff --git a/stdlib/kubernetes/tests/kubernetes.cue b/pkg/alpha.dagger.io/kubernetes/tests/kubernetes.cue similarity index 100% rename from stdlib/kubernetes/tests/kubernetes.cue rename to pkg/alpha.dagger.io/kubernetes/tests/kubernetes.cue diff --git a/stdlib/kubernetes/tests/verify.cue b/pkg/alpha.dagger.io/kubernetes/tests/verify.cue similarity index 100% rename from stdlib/kubernetes/tests/verify.cue rename to pkg/alpha.dagger.io/kubernetes/tests/verify.cue diff --git a/stdlib/netlify/netlify.cue b/pkg/alpha.dagger.io/netlify/netlify.cue similarity index 100% rename from stdlib/netlify/netlify.cue rename to pkg/alpha.dagger.io/netlify/netlify.cue diff --git a/stdlib/netlify/netlify.sh.cue b/pkg/alpha.dagger.io/netlify/netlify.sh.cue similarity index 100% rename from stdlib/netlify/netlify.sh.cue rename to pkg/alpha.dagger.io/netlify/netlify.sh.cue diff --git a/stdlib/netlify/tests/netlify.cue b/pkg/alpha.dagger.io/netlify/tests/netlify.cue similarity index 100% rename from stdlib/netlify/tests/netlify.cue rename to pkg/alpha.dagger.io/netlify/tests/netlify.cue diff --git a/stdlib/os/container.cue b/pkg/alpha.dagger.io/os/container.cue similarity index 100% rename from stdlib/os/container.cue rename to pkg/alpha.dagger.io/os/container.cue diff --git a/stdlib/os/dir.cue b/pkg/alpha.dagger.io/os/dir.cue similarity index 100% rename from stdlib/os/dir.cue rename to pkg/alpha.dagger.io/os/dir.cue diff --git a/stdlib/os/file.cue b/pkg/alpha.dagger.io/os/file.cue similarity index 100% rename from stdlib/os/file.cue rename to pkg/alpha.dagger.io/os/file.cue diff --git a/stdlib/os/tests/container/container.cue b/pkg/alpha.dagger.io/os/tests/container/container.cue similarity index 100% rename from stdlib/os/tests/container/container.cue rename to pkg/alpha.dagger.io/os/tests/container/container.cue diff --git a/stdlib/os/tests/os/os.cue b/pkg/alpha.dagger.io/os/tests/os/os.cue similarity index 100% rename from stdlib/os/tests/os/os.cue rename to pkg/alpha.dagger.io/os/tests/os/os.cue diff --git a/stdlib/package.json b/pkg/alpha.dagger.io/package.json similarity index 100% rename from stdlib/package.json rename to pkg/alpha.dagger.io/package.json diff --git a/stdlib/random/string.cue b/pkg/alpha.dagger.io/random/string.cue similarity index 100% rename from stdlib/random/string.cue rename to pkg/alpha.dagger.io/random/string.cue diff --git a/stdlib/terraform/terraform.cue b/pkg/alpha.dagger.io/terraform/terraform.cue similarity index 100% rename from stdlib/terraform/terraform.cue rename to pkg/alpha.dagger.io/terraform/terraform.cue diff --git a/stdlib/terraform/tests/terraform.cue b/pkg/alpha.dagger.io/terraform/tests/terraform.cue similarity index 100% rename from stdlib/terraform/tests/terraform.cue rename to pkg/alpha.dagger.io/terraform/tests/terraform.cue diff --git a/stdlib/terraform/tests/testdata/test.tf b/pkg/alpha.dagger.io/terraform/tests/testdata/test.tf similarity index 100% rename from stdlib/terraform/tests/testdata/test.tf rename to pkg/alpha.dagger.io/terraform/tests/testdata/test.tf diff --git a/stdlib/trivy/image.cue b/pkg/alpha.dagger.io/trivy/image.cue similarity index 100% rename from stdlib/trivy/image.cue rename to pkg/alpha.dagger.io/trivy/image.cue diff --git a/stdlib/trivy/tests/trivy.cue b/pkg/alpha.dagger.io/trivy/tests/trivy.cue similarity index 100% rename from stdlib/trivy/tests/trivy.cue rename to pkg/alpha.dagger.io/trivy/tests/trivy.cue diff --git a/stdlib/trivy/trivy.cue b/pkg/alpha.dagger.io/trivy/trivy.cue similarity index 100% rename from stdlib/trivy/trivy.cue rename to pkg/alpha.dagger.io/trivy/trivy.cue diff --git a/stdlib/universe.bats b/pkg/alpha.dagger.io/universe.bats similarity index 100% rename from stdlib/universe.bats rename to pkg/alpha.dagger.io/universe.bats diff --git a/stdlib/yarn.lock b/pkg/alpha.dagger.io/yarn.lock similarity index 100% rename from stdlib/yarn.lock rename to pkg/alpha.dagger.io/yarn.lock diff --git a/stdlib/stdlib.go b/pkg/pkg.go similarity index 75% rename from stdlib/stdlib.go rename to pkg/pkg.go index 54f4a1f8..319b28c1 100644 --- a/stdlib/stdlib.go +++ b/pkg/pkg.go @@ -1,4 +1,4 @@ -package stdlib +package pkg import ( "context" @@ -12,12 +12,11 @@ import ( var ( // FS contains the filesystem of the stdlib. - //go:embed **/*.cue **/*/*.cue europa/dagger/*.cue europa/dagger/engine/*.cue + //go:embed alpha.dagger.io/**/*.cue alpha.dagger.io/**/*/*.cue alpha.dagger.io/europa/dagger/*.cue alpha.dagger.io/europa/dagger/engine/*.cue FS embed.FS - ModuleName = "alpha.dagger.io" - EnginePackage = fmt.Sprintf("%s/europa/dagger/engine", ModuleName) - Path = path.Join("cue.mod", "pkg", ModuleName) + AlphaModule = "alpha.dagger.io" + EnginePackage = fmt.Sprintf("%s/europa/dagger/engine", AlphaModule) ) func Vendor(ctx context.Context, dest string) error { diff --git a/plan/task/task.go b/plan/task/task.go index 9be4d546..9296668f 100644 --- a/plan/task/task.go +++ b/plan/task/task.go @@ -9,9 +9,9 @@ import ( "cuelang.org/go/cue" "go.dagger.io/dagger/compiler" "go.dagger.io/dagger/environment" + "go.dagger.io/dagger/pkg" "go.dagger.io/dagger/plancontext" "go.dagger.io/dagger/solver" - "go.dagger.io/dagger/stdlib" ) var ( @@ -20,7 +20,7 @@ var ( typePath = cue.MakePath( cue.Str("$dagger"), cue.Str("task"), - cue.Hid("_name", stdlib.EnginePackage)) + cue.Hid("_name", pkg.EnginePackage)) ) type NewFunc func() Task diff --git a/plancontext/fs.go b/plancontext/fs.go index c4adb419..ab6f09c6 100644 --- a/plancontext/fs.go +++ b/plancontext/fs.go @@ -9,14 +9,14 @@ import ( "github.com/moby/buildkit/client/llb" bkgw "github.com/moby/buildkit/frontend/gateway/client" "go.dagger.io/dagger/compiler" - "go.dagger.io/dagger/stdlib" + "go.dagger.io/dagger/pkg" ) var ( fsIDPath = cue.MakePath( cue.Str("$dagger"), cue.Str("fs"), - cue.Hid("_id", stdlib.EnginePackage), + cue.Hid("_id", pkg.EnginePackage), ) ) diff --git a/plancontext/secret.go b/plancontext/secret.go index e2e3a136..7b72126e 100644 --- a/plancontext/secret.go +++ b/plancontext/secret.go @@ -6,14 +6,14 @@ import ( "cuelang.org/go/cue" "go.dagger.io/dagger/compiler" - "go.dagger.io/dagger/stdlib" + "go.dagger.io/dagger/pkg" ) var ( secretIDPath = cue.MakePath( cue.Str("$dagger"), cue.Str("secret"), - cue.Hid("_id", stdlib.EnginePackage), + cue.Hid("_id", pkg.EnginePackage), ) ) diff --git a/plancontext/service.go b/plancontext/service.go index 1bcc0cd7..11f43ef6 100644 --- a/plancontext/service.go +++ b/plancontext/service.go @@ -6,14 +6,14 @@ import ( "cuelang.org/go/cue" "go.dagger.io/dagger/compiler" - "go.dagger.io/dagger/stdlib" + "go.dagger.io/dagger/pkg" ) var ( serviceIDPath = cue.MakePath( cue.Str("$dagger"), cue.Str("service"), - cue.Hid("_id", stdlib.EnginePackage), + cue.Hid("_id", pkg.EnginePackage), ) ) diff --git a/state/project.go b/state/project.go index 51c32227..e035d69d 100644 --- a/state/project.go +++ b/state/project.go @@ -13,8 +13,8 @@ import ( "github.com/gofrs/flock" "github.com/rs/zerolog/log" "go.dagger.io/dagger/keychain" + "go.dagger.io/dagger/pkg" "go.dagger.io/dagger/plancontext" - "go.dagger.io/dagger/stdlib" "gopkg.in/yaml.v3" ) @@ -421,7 +421,7 @@ func VendorUniverse(ctx context.Context, p string) error { // add universe and lock file to `.gitignore` if err := os.WriteFile( path.Join(p, "cue.mod", "pkg", ".gitignore"), - []byte(fmt.Sprintf("# generated by dagger\n%s\ndagger.lock\n", stdlib.ModuleName)), + []byte(fmt.Sprintf("# generated by dagger\n%s\ndagger.lock\n", pkg.AlphaModule)), 0600, ); err != nil { return err @@ -434,7 +434,7 @@ func VendorUniverse(ctx context.Context, p string) error { if err != nil { return err } - if err := stdlib.Vendor(ctx, tmp); err != nil { + if err := pkg.Vendor(ctx, tmp); err != nil { // FIXME(samalba): disabled install remote stdlib temporarily // if _, err := mod.Install(ctx, p, stdlib.ModuleName, ""); err != nil { return err @@ -446,7 +446,7 @@ func VendorUniverse(ctx context.Context, p string) error { // mv cue.mod/pkg/MODULE cue.mod/pkg/MODULE.old // mv VENDOR cue.mod/pkg/MODULE // rm -rf cue.mod/pkg/MODULE.old - newStdlib := path.Join(p, stdlib.Path) + newStdlib := path.Join(p, "cue.mod", "pkg", pkg.AlphaModule) oldStdlib := newStdlib + ".old" if err := os.RemoveAll(oldStdlib); err != nil && !errors.Is(err, os.ErrNotExist) { return err @@ -456,7 +456,7 @@ func VendorUniverse(ctx context.Context, p string) error { } defer os.RemoveAll(oldStdlib) - if err := os.Rename(tmp, newStdlib); err != nil { + if err := os.Rename(path.Join(tmp, pkg.AlphaModule), newStdlib); err != nil { return err } diff --git a/universe b/universe index 734af2f3..8d095692 120000 --- a/universe +++ b/universe @@ -1 +1 @@ -stdlib \ No newline at end of file +./pkg/alpha.dagger.io \ No newline at end of file