From 899aee981aba6ac26864ec65a174008a93600203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Correa=20Casablanca?= Date: Mon, 12 Aug 2024 17:54:40 +0200 Subject: [PATCH] refactor: minor automation fixes Signed-off-by: Andres Correa Casablanca --- .github/workflows/tests.yml | 2 +- .hooks/pre-commit | 2 +- .hooks/pre-push | 2 +- @coderspirit/lambda-ioc/package.json | 2 +- @coderspirit/nominal-inputs/package.json | 2 +- @coderspirit/nominal-symbols/package.json | 2 +- @coderspirit/nominal-typebox/package.json | 4 +- @coderspirit/nominal/package.json | 2 +- @coderspirit/safe-env/package.json | 2 +- deno.lock | 36 ++++++++++-- pnpm-lock.yaml | 24 ++++---- turbo.json | 67 ++++++++++++++++++++++- 12 files changed, 120 insertions(+), 27 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 216dc50..d14aa94 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -56,4 +56,4 @@ jobs: run: "pnpm turbo test" - name: "(All) Run All Tasks" if: ${{ matrix.os != 'windows-latest' }} - run: "pnpm turbo all:cov" + run: "pnpm turbo all:cov:ci" diff --git a/.hooks/pre-commit b/.hooks/pre-commit index 444200e..55f07a9 100755 --- a/.hooks/pre-commit +++ b/.hooks/pre-commit @@ -4,4 +4,4 @@ set -eu set -o pipefail pnpm turbo format-staged -pnpm turbo all +pnpm turbo all:ci diff --git a/.hooks/pre-push b/.hooks/pre-push index 2fe8af9..8cf93c7 100755 --- a/.hooks/pre-push +++ b/.hooks/pre-push @@ -3,4 +3,4 @@ set -eu set -o pipefail -pnpm turbo all:cov +pnpm turbo all:cov:ci diff --git a/@coderspirit/lambda-ioc/package.json b/@coderspirit/lambda-ioc/package.json index a9a0c0d..1621c75 100644 --- a/@coderspirit/lambda-ioc/package.json +++ b/@coderspirit/lambda-ioc/package.json @@ -27,7 +27,7 @@ "lint": "pnpm lint:biome", "lint:biome": "pnpm biome check --files-ignore-unknown=true .", "lint:publint": "publint", - "prepublishOnly": "turbo all", + "prepublishOnly": "turbo all:ci", "publish:safe": "safe-publish", "test": "vitest -c vitest.config.mts run", "test:cov": "vitest -c vitest.config.mts run --coverage", diff --git a/@coderspirit/nominal-inputs/package.json b/@coderspirit/nominal-inputs/package.json index 26d2734..6f080e5 100644 --- a/@coderspirit/nominal-inputs/package.json +++ b/@coderspirit/nominal-inputs/package.json @@ -27,7 +27,7 @@ "lint": "pnpm lint:biome", "lint:biome": "pnpm biome check --files-ignore-unknown=true .", "lint:publint": "publint", - "prepublishOnly": "turbo all", + "prepublishOnly": "turbo all:ci", "publish:safe": "safe-publish", "typecheck": "tsc --incremental true --tsBuildInfoFile .tsbuildinfo --noEmit -p ./tsconfig.json" }, diff --git a/@coderspirit/nominal-symbols/package.json b/@coderspirit/nominal-symbols/package.json index 5bb0aa3..e430536 100644 --- a/@coderspirit/nominal-symbols/package.json +++ b/@coderspirit/nominal-symbols/package.json @@ -27,7 +27,7 @@ "lint": "pnpm lint:biome", "lint:biome": "pnpm biome check --files-ignore-unknown=true .", "lint:publint": "publint", - "prepublishOnly": "turbo all", + "prepublishOnly": "turbo all:ci", "publish:safe": "safe-publish", "typecheck": "tsc --incremental true --tsBuildInfoFile .tsbuildinfo --noEmit -p ./tsconfig.json" }, diff --git a/@coderspirit/nominal-typebox/package.json b/@coderspirit/nominal-typebox/package.json index 1bd4714..02fbcc0 100644 --- a/@coderspirit/nominal-typebox/package.json +++ b/@coderspirit/nominal-typebox/package.json @@ -35,14 +35,14 @@ "lint": "pnpm lint:biome", "lint:biome": "pnpm biome check --files-ignore-unknown=true .", "lint:publint": "publint", - "prepublishOnly": "turbo all", + "prepublishOnly": "turbo all:ci", "publish:safe": "safe-publish", "test": "vitest -c vitest.config.mts run", "test:cov": "vitest -c vitest.config.mts run --coverage", "typecheck": "tsc --incremental true --tsBuildInfoFile .tsbuildinfo --noEmit -p ./tsconfig.json" }, "dependencies": { - "@coderspirit/nominal": "workspace:^" + "@coderspirit/nominal": "^4.1.1" }, "devDependencies": { "@arethetypeswrong/cli": "^0.15.4", diff --git a/@coderspirit/nominal/package.json b/@coderspirit/nominal/package.json index 2f45bd1..7cd709d 100644 --- a/@coderspirit/nominal/package.json +++ b/@coderspirit/nominal/package.json @@ -27,7 +27,7 @@ "lint": "pnpm lint:biome", "lint:biome": "pnpm biome check --files-ignore-unknown=true .", "lint:publint": "publint", - "prepublishOnly": "turbo all", + "prepublishOnly": "turbo all:ci", "publish:safe": "safe-publish", "test": "vitest -c vitest.config.mts run", "test:cov": "vitest -c vitest.config.mts run --coverage", diff --git a/@coderspirit/safe-env/package.json b/@coderspirit/safe-env/package.json index a4b0ee0..cb5d39d 100644 --- a/@coderspirit/safe-env/package.json +++ b/@coderspirit/safe-env/package.json @@ -27,7 +27,7 @@ "lint": "pnpm lint:biome", "lint:biome": "pnpm biome check --files-ignore-unknown=true .", "lint:publint": "publint", - "prepublishOnly": "turbo all", + "prepublishOnly": "turbo all:ci", "publish:safe": "safe-publish", "test": "vitest -c vitest.config.mts run", "test:cov": "vitest -c vitest.config.mts run --coverage", diff --git a/deno.lock b/deno.lock index 9e9ca09..8d015df 100644 --- a/deno.lock +++ b/deno.lock @@ -70,6 +70,7 @@ "dependencies": [ "npm:@arethetypeswrong/cli@^0.15.4", "npm:@biomejs/biome@1.8.3", + "npm:@vitest/coverage-v8@^2.0.5", "npm:get-tsconfig@^4.7.6", "npm:publint@^0.2.9", "npm:rollup-plugin-dts@^6.1.1", @@ -87,7 +88,9 @@ "dependencies": [ "npm:@arethetypeswrong/cli@^0.15.4", "npm:@biomejs/biome@1.8.3", - "npm:@types/node@^22.1.0", + "npm:@coderspirit/nominal-symbols@^2.0.0", + "npm:@types/node@^22.2.0", + "npm:@vitest/coverage-v8@^2.0.5", "npm:get-tsconfig@^4.7.6", "npm:publint@^0.2.9", "npm:rollup-plugin-dts@^6.1.1", @@ -105,7 +108,8 @@ "dependencies": [ "npm:@arethetypeswrong/cli@^0.15.4", "npm:@biomejs/biome@1.8.3", - "npm:@types/node@^22.1.0", + "npm:@coderspirit/nominal@^4.0.3", + "npm:@types/node@^22.2.0", "npm:get-tsconfig@^4.7.6", "npm:publint@^0.2.9", "npm:rollup-plugin-dts@^6.1.1", @@ -123,7 +127,28 @@ "dependencies": [ "npm:@arethetypeswrong/cli@^0.15.4", "npm:@biomejs/biome@1.8.3", - "npm:@types/node@^22.1.0", + "npm:@types/node@^22.2.0", + "npm:get-tsconfig@^4.7.6", + "npm:publint@^0.2.9", + "npm:rollup-plugin-dts@^6.1.1", + "npm:rollup-plugin-esbuild@^6.1.1", + "npm:rollup@^4.20.0", + "npm:tslib@^2.6.3", + "npm:turbo@^2.0.12", + "npm:typescript@^5.5.4", + "npm:vitest@^2.0.5" + ] + } + }, + "@coderspirit/nominal-typebox": { + "packageJson": { + "dependencies": [ + "npm:@arethetypeswrong/cli@^0.15.4", + "npm:@biomejs/biome@1.8.3", + "npm:@coderspirit/nominal@^4.1.1", + "npm:@sinclair/typebox@^0.33.4", + "npm:@types/node@^22.2.0", + "npm:@vitest/coverage-v8@^2.0.5", "npm:get-tsconfig@^4.7.6", "npm:publint@^0.2.9", "npm:rollup-plugin-dts@^6.1.1", @@ -141,7 +166,10 @@ "dependencies": [ "npm:@arethetypeswrong/cli@^0.15.4", "npm:@biomejs/biome@1.8.3", - "npm:@types/node@^22.1.0", + "npm:@coderspirit/nominal-inputs@^1.1.1", + "npm:@coderspirit/nominal@^4.0.3", + "npm:@types/node@^22.2.0", + "npm:@vitest/coverage-v8@^2.0.5", "npm:get-tsconfig@^4.7.6", "npm:publint@^0.2.9", "npm:rollup-plugin-dts@^6.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eb6b38f..bec8986 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -128,7 +128,7 @@ importers: dependencies: '@coderspirit/nominal': specifier: ^4.0.3 - version: 4.1.0(typescript@5.5.4) + version: 4.1.1(typescript@5.5.4) devDependencies: '@arethetypeswrong/cli': specifier: ^0.15.4 @@ -209,8 +209,8 @@ importers: '@coderspirit/nominal-typebox': dependencies: '@coderspirit/nominal': - specifier: workspace:^ - version: link:../nominal + specifier: ^4.1.1 + version: 4.1.1(typescript@5.5.4) devDependencies: '@arethetypeswrong/cli': specifier: ^0.15.4 @@ -262,10 +262,10 @@ importers: dependencies: '@coderspirit/nominal': specifier: ^4.0.3 - version: 4.1.0(typescript@5.5.4) + version: 4.1.1(typescript@5.5.4) '@coderspirit/nominal-inputs': specifier: ^1.1.1 - version: 1.1.3(typescript@5.5.4) + version: 1.1.4(typescript@5.5.4) devDependencies: '@arethetypeswrong/cli': specifier: ^0.15.4 @@ -406,8 +406,8 @@ packages: cpu: [x64] os: [win32] - '@coderspirit/nominal-inputs@1.1.3': - resolution: {integrity: sha512-u4+G+2yj38shGvVehirBCZhDeqzLyk7qajJJnt+zwBA1uSFGl2ldKBv9TgNZmpMtMg6gjocJcvzWkZ3S+Na6UA==} + '@coderspirit/nominal-inputs@1.1.4': + resolution: {integrity: sha512-PwjG+VB7H9h1F/hcaxlVgN9r5E8N63lSkCbZcWj8aDwloiBDdrrOi9eJyTe1EAHsf9ovav18M4iSFbfNMj/B5w==} engines: {node: '>=18.0.0'} '@coderspirit/nominal-symbols@2.0.1': @@ -416,8 +416,8 @@ packages: peerDependencies: typescript: '>=5.2' - '@coderspirit/nominal@4.1.0': - resolution: {integrity: sha512-vFYSNNyLNuUdmuoaNrICn4botM+27Aca6E23VYKk+PxuFMbOjlNx6Q8C9JyvhA2VUWui+rmt3M1SBMZAgwArLg==} + '@coderspirit/nominal@4.1.1': + resolution: {integrity: sha512-m37GfF/N1QzJBE1HHGpSJhAyDtkExzwx3AnGk0n2SRyFSVxtwpTRWLl6lkubUfXiZeOTFqXjVjOxseMh3YffLg==} engines: {node: '>=18.0.0'} '@colors/colors@1.5.0': @@ -1484,9 +1484,9 @@ snapshots: '@biomejs/cli-win32-x64@1.8.3': optional: true - '@coderspirit/nominal-inputs@1.1.3(typescript@5.5.4)': + '@coderspirit/nominal-inputs@1.1.4(typescript@5.5.4)': dependencies: - '@coderspirit/nominal': 4.1.0(typescript@5.5.4) + '@coderspirit/nominal': 4.1.1(typescript@5.5.4) transitivePeerDependencies: - typescript @@ -1494,7 +1494,7 @@ snapshots: dependencies: typescript: 5.5.4 - '@coderspirit/nominal@4.1.0(typescript@5.5.4)': + '@coderspirit/nominal@4.1.1(typescript@5.5.4)': dependencies: '@coderspirit/nominal-symbols': 2.0.1(typescript@5.5.4) transitivePeerDependencies: diff --git a/turbo.json b/turbo.json index 68867e5..430efea 100644 --- a/turbo.json +++ b/turbo.json @@ -4,16 +4,46 @@ "all": { "dependsOn": ["build", "lint", "lint:publint", "typecheck", "test"] }, + "all:ci": { + "dependsOn": [ + "build:ci", + "lint:ci", + "lint:publint:ci", + "typecheck:ci", + "test:ci" + ] + }, "all:cov": { "dependsOn": ["build", "lint", "lint:publint", "typecheck", "test:cov"] }, + "all:cov:ci": { + "dependsOn": [ + "build:ci", + "lint:ci", + "lint:publint:ci", + "typecheck:ci", + "test:cov:ci" + ] + }, "build": { + "dependsOn": ["format", "^build"], + "inputs": [ + "./package.json", + "./rollup.config.mjs", + "./tsconfig.json", + "./src/**/*", + "!./src/**/*.test.mts" + ], + "outputs": ["./dist/**/*"] + }, + "build:ci": { "dependsOn": ["^build"], "inputs": [ "./package.json", "./rollup.config.mjs", "./tsconfig.json", - "./src/**/*" + "./src/**/*", + "!./src/**/*.test.mts" ], "outputs": ["./dist/**/*"] }, @@ -78,6 +108,23 @@ ] }, "lint": { + "dependsOn": ["format", "^lint"], + "inputs": [ + "./biome.jsonc", + "./**/*.json", + "./**/*.jsonc", + "./**/*.js", + "./**/*.mjs", + "./**/*.cjs", + "./**/*.ts", + "./**/*.mts", + "./**/*.cts", + "./**/*.d.ts", + "./**/*.d.mts", + "./**/*.d.cts" + ] + }, + "lint:ci": { "dependsOn": ["^lint"], "inputs": [ "./biome.jsonc", @@ -98,6 +145,10 @@ "dependsOn": ["build", "^lint:publint"], "inputs": ["./package.json", "./dist/**/*"] }, + "lint:publint:ci": { + "dependsOn": ["build:ci", "^lint:publint"], + "inputs": ["./package.json", "./dist/**/*"] + }, "publish:safe": { "dependsOn": ["^publish:safe"], "cache": false @@ -106,15 +157,29 @@ "dependsOn": ["build", "^test"], "inputs": ["./package.json", "./vitest.config.mts", "./src/**/*"] }, + "test:ci": { + "dependsOn": ["build:ci", "^test"], + "inputs": ["./package.json", "./vitest.config.mts", "./src/**/*"] + }, "test:cov": { "dependsOn": ["build", "^test:cov"], "inputs": ["./package.json", "./src/**/*"], "outputs": ["./coverage/**/*"] }, + "test:cov:ci": { + "dependsOn": ["build:ci", "^test:cov"], + "inputs": ["./package.json", "./src/**/*"], + "outputs": ["./coverage/**/*"] + }, "typecheck": { "dependsOn": ["build", "^typecheck"], "inputs": ["./src/**/*", "./tsconfig.json", "./.tsbuildinfo"], "outputs": ["./.tsbuildinfo"] + }, + "typecheck:ci": { + "dependsOn": ["build:ci", "^typecheck"], + "inputs": ["./src/**/*", "./tsconfig.json", "./.tsbuildinfo"], + "outputs": ["./.tsbuildinfo"] } } }