diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index bbfe8259..c38b3ff7 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/etc/scripts/actions/build.ts b/etc/scripts/actions/build.ts index 65f1c1a0..7f39daa4 100755 --- a/etc/scripts/actions/build.ts +++ b/etc/scripts/actions/build.ts @@ -3,7 +3,7 @@ import "zx/globals"; import { cleanBuild } from "@n8v/scripts/utils/clean-build"; import { getBuildNumber } from "@n8v/scripts/utils/get-build-number"; import { getRev } from "@n8v/scripts/utils/get-rev"; -import { workDirs } from "@n8v/scripts/utils/work-dir"; +import { workDirs } from "@n8v/scripts/utils/work-dirs"; import fs from "fs-extra"; $.verbose = true; diff --git a/etc/scripts/actions/lint.ts b/etc/scripts/actions/lint.ts index 8dc15699..611e9870 100755 --- a/etc/scripts/actions/lint.ts +++ b/etc/scripts/actions/lint.ts @@ -1,7 +1,7 @@ #!/usr/bin/env -S yarn dlx tsx import "zx/globals"; import { pipeOutput } from "@n8v/scripts/utils/pipe-output"; -import { workDirs } from "@n8v/scripts/utils/work-dir"; +import { workDirs } from "@n8v/scripts/utils/work-dirs"; $.verbose = true; cd(workDirs.path); diff --git a/etc/scripts/actions/publish.ts b/etc/scripts/actions/publish.ts index e8cb3ec5..b9e26c53 100755 --- a/etc/scripts/actions/publish.ts +++ b/etc/scripts/actions/publish.ts @@ -1,7 +1,7 @@ #!/usr/bin/env -S yarn dlx tsx import "zx/globals"; import { getPublishRemote } from "@n8v/scripts/utils/get-publish-remote"; -import { workDirs } from "@n8v/scripts/utils/work-dir"; +import { workDirs } from "@n8v/scripts/utils/work-dirs"; const Constants = { user: { diff --git a/etc/scripts/actions/test.ts b/etc/scripts/actions/test.ts index da2bfe2f..cd12bcda 100755 --- a/etc/scripts/actions/test.ts +++ b/etc/scripts/actions/test.ts @@ -1,7 +1,7 @@ #!/usr/bin/env -S yarn dlx tsx import "zx/globals"; import { pipeOutput } from "@n8v/scripts/utils/pipe-output"; -import { workDirs } from "@n8v/scripts/utils/work-dir"; +import { workDirs } from "@n8v/scripts/utils/work-dirs"; $.verbose = true; cd(workDirs.apps.app.path); diff --git a/etc/scripts/package.json b/etc/scripts/package.json index 9846b003..647f2193 100755 --- a/etc/scripts/package.json +++ b/etc/scripts/package.json @@ -3,7 +3,6 @@ "packageManager": "yarn@4.2.2", "type": "module", "devDependencies": { - "@types/luxon": "^3.4.2", "tsx": "^4.19.2", "typescript": "^5.7.3", "zx": "^8.3.0" diff --git a/etc/scripts/utils/clean-build.ts b/etc/scripts/utils/clean-build.ts index 7c8ad92b..97722885 100755 --- a/etc/scripts/utils/clean-build.ts +++ b/etc/scripts/utils/clean-build.ts @@ -1,5 +1,5 @@ import "zx/globals"; -import { workDirs } from "@n8v/scripts/utils/work-dir"; +import { workDirs } from "@n8v/scripts/utils/work-dirs"; import fs from "fs-extra"; $.verbose = true; diff --git a/etc/scripts/utils/clean-cache.ts b/etc/scripts/utils/clean-cache.ts index ade89bb6..33f0243e 100755 --- a/etc/scripts/utils/clean-cache.ts +++ b/etc/scripts/utils/clean-cache.ts @@ -1,5 +1,5 @@ import "zx/globals"; -import { workDirs } from "@n8v/scripts/utils/work-dir"; +import { workDirs } from "@n8v/scripts/utils/work-dirs"; $.verbose = true; diff --git a/etc/scripts/utils/clean-up.ts b/etc/scripts/utils/clean-up.ts index 0a80c8d4..d22b1800 100755 --- a/etc/scripts/utils/clean-up.ts +++ b/etc/scripts/utils/clean-up.ts @@ -1,6 +1,6 @@ import "zx/globals"; import { cleanBuild } from "@n8v/scripts/utils/clean-build"; -import { workDirs } from "@n8v/scripts/utils/work-dir"; +import { workDirs } from "@n8v/scripts/utils/work-dirs"; $.verbose = true; diff --git a/etc/scripts/utils/work-dir.ts b/etc/scripts/utils/work-dirs.ts similarity index 100% rename from etc/scripts/utils/work-dir.ts rename to etc/scripts/utils/work-dirs.ts diff --git a/etc/scripts/workflows/release.ts b/etc/scripts/workflows/release.ts index c4025630..0077d03a 100755 --- a/etc/scripts/workflows/release.ts +++ b/etc/scripts/workflows/release.ts @@ -1,7 +1,7 @@ #!/usr/bin/env -S yarn dlx tsx import "zx/globals"; import { cleanBuild } from "@n8v/scripts/utils/clean-build"; -import { workDirs } from "@n8v/scripts/utils/work-dir"; +import { workDirs } from "@n8v/scripts/utils/work-dirs"; $.verbose = true; diff --git a/etc/scripts/workflows/validate-pr.ts b/etc/scripts/workflows/validate-pr.ts index e9430e34..e076305c 100755 --- a/etc/scripts/workflows/validate-pr.ts +++ b/etc/scripts/workflows/validate-pr.ts @@ -1,7 +1,7 @@ #!/usr/bin/env -S yarn dlx tsx import "zx/globals"; import { cleanBuild } from "@n8v/scripts/utils/clean-build"; -import { workDirs } from "@n8v/scripts/utils/work-dir"; +import { workDirs } from "@n8v/scripts/utils/work-dirs"; $.verbose = true; diff --git a/etc/templates/skeleton/etc/scripts/moon.yml.tera b/etc/templates/skeleton/etc/scripts/moon.yml.tera new file mode 100644 index 00000000..ac322277 --- /dev/null +++ b/etc/templates/skeleton/etc/scripts/moon.yml.tera @@ -0,0 +1,8 @@ +# yaml-language-server: $schema: 'https://moonrepo.dev/schemas/project.json' +language: typescript +platform: node +type: tool + +project: + name: "@{{ workspace }}/scripts" + description: scripts diff --git a/etc/templates/skeleton/etc/scripts/package.json.tera b/etc/templates/skeleton/etc/scripts/package.json.tera new file mode 100755 index 00000000..6d30e8d1 --- /dev/null +++ b/etc/templates/skeleton/etc/scripts/package.json.tera @@ -0,0 +1,13 @@ +{ + "name": "@{{ workspace }}/scripts", + "packageManager": "yarn@4.2.2", + "type": "module", + "devDependencies": { + "tsx": "^4.19.2", + "typescript": "^5.7.3", + "zx": "^8.3.0" + }, + "dependencies": { + "luxon": "^3.5.0" + } +} diff --git a/etc/templates/skeleton/etc/scripts/tsconfig.json.tera b/etc/templates/skeleton/etc/scripts/tsconfig.json.tera new file mode 100755 index 00000000..37a24706 --- /dev/null +++ b/etc/templates/skeleton/etc/scripts/tsconfig.json.tera @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.options.json", + "compilerOptions": { + "baseUrl": ".", + "outDir": "../../.moon/cache/types/etc/scripts", + "paths": { + "@{{ workspace }}/scripts/*": ["*"] + } + }, + "include": ["**/*.ts"] +} diff --git a/etc/templates/skeleton/etc/workflow-runtime/src/workflow_runtime.go b/etc/templates/skeleton/etc/workflow-runtime/src/workflow_runtime.go index 181f271e..99fe6934 100644 --- a/etc/templates/skeleton/etc/workflow-runtime/src/workflow_runtime.go +++ b/etc/templates/skeleton/etc/workflow-runtime/src/workflow_runtime.go @@ -18,7 +18,7 @@ func (m *WorkflowRuntime) BuildBaseEnv(ctx context.Context) *WorkflowRuntime { From("ubuntu:plucky"). // apt-get update && apt-get install -y curl git unzip gzip xz-utils WithExec([]string{"apt-get", "update"}). - WithExec([]string{"apt-get", "install", "-y", "build-essential", "curl", "git", "unzip", "bash", "gzip", "xz-utils", "pkg-config"}). + WithExec([]string{"apt-get", "install", "-y", "build-essential", "curl", "git", "unzip", "bash", "gzip", "xz-utils", "pkg-config", "libssl-dev"}). // curl -fsSL https://moonrepo.dev/install/proto.sh | bash -s 0.35.3 --yes WithExec([]string{"bash", "-l", "-c", "curl -fsSL https://moonrepo.dev/install/proto.sh | bash -s 0.44.1 --yes"}). WithEnvVariable("PROTO_HOME", "/root/.proto", dagger.ContainerWithEnvVariableOpts{Expand: true}). diff --git a/etc/templates/skeleton/template.yml b/etc/templates/skeleton/template.yml index ccd55385..a028365d 100644 --- a/etc/templates/skeleton/template.yml +++ b/etc/templates/skeleton/template.yml @@ -5,3 +5,8 @@ title: Monorepo Skeleton Template description: | This is a skeleton template for Moon monorepos. It can be used as a starting point for new projects. +variables: + workspace: + type: string + prompt: What is the name of the workspace? + required: true diff --git a/yarn.lock b/yarn.lock index f711b5e4..3b9b0bf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2991,7 +2991,6 @@ __metadata: version: 0.0.0-use.local resolution: "@n8v/scripts@workspace:etc/scripts" dependencies: - "@types/luxon": "npm:^3.4.2" luxon: "npm:^3.5.0" tsx: "npm:^4.19.2" typescript: "npm:^5.7.3"