From 8cd584a93de470069ac1257c661f7557eb08cba3 Mon Sep 17 00:00:00 2001 From: Dimitris Marlagkoutsos Date: Thu, 24 Oct 2024 14:19:36 +0200 Subject: [PATCH 1/3] Rename test:ts to lint and add it to workflow --- package.json | 6 +++--- packages/errors/package.json | 2 +- packages/extension/package.json | 2 +- packages/kernel/package.json | 2 +- packages/shims/package.json | 2 +- packages/streams/package.json | 2 +- packages/utils/package.json | 2 +- yarn.config.cjs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 43b21e7fb..f02f2ff80 100644 --- a/package.json +++ b/package.json @@ -20,22 +20,22 @@ "changelog:update": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run changelog:update", "changelog:validate": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run changelog:validate", "clean": "rimraf --glob './*.tsbuildinfo' && yarn workspaces foreach --all --parallel --interlaced --verbose run clean", - "lint": "yarn constraints && yarn lint:eslint && yarn lint:misc --check && yarn lint:dependencies", + "lint": "yarn constraints && yarn lint:eslint && yarn lint:misc --check && yarn lint:dependencies && yarn lint:ts", "lint:dependencies": "yarn dedupe --check && yarn depcheck && yarn workspaces foreach --all --parallel --verbose run lint:dependencies", "lint:dependencies:fix": "yarn dedupe && yarn depcheck && yarn workspaces foreach --all --parallel --verbose run lint:dependencies", "lint:eslint": "yarn eslint . --cache", "lint:fix": "yarn constraints --fix && yarn lint:eslint --fix && yarn lint:misc --write && yarn lint:dependencies:fix", "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path .gitignore", + "lint:ts": "yarn workspaces foreach --all --parallel --verbose run lint:ts", "postinstall": "simple-git-hooks", "prepack": "./scripts/prepack.sh", "test": "yarn workspaces foreach --all --parallel --verbose run test", - "test:ts": "yarn workspaces foreach --all --parallel --verbose run test:ts", "test:clean": "yarn workspaces foreach --all --parallel --verbose run test:clean && yarn test", "test:verbose": "yarn workspaces foreach --all --parallel --verbose run test:verbose", "why:batch": "./scripts/why-batch.sh" }, "simple-git-hooks": { - "pre-commit": "yarn lint-staged && yarn test:ts && yarn dedupe --check" + "pre-commit": "yarn lint-staged && yarn lint:ts && yarn dedupe --check" }, "lint-staged": { "*.{js,mjs,cjs,ts,mts,cts}": [ diff --git a/packages/errors/package.json b/packages/errors/package.json index da92c1d64..6ac7532b9 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -34,9 +34,9 @@ "lint:eslint": "eslint . --cache", "lint:fix": "yarn constraints --fix && yarn lint:eslint --fix && yarn lint:misc --write", "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore", + "lint:ts": "tsc --project tsconfig.test.json --noEmit", "publish:preview": "yarn npm publish --tag preview", "test": "vitest run --config vitest.config.ts", - "test:ts": "tsc --project tsconfig.test.json --noEmit", "test:clean": "yarn test --no-cache --coverage.clean", "test:dev": "yarn test --coverage false", "test:verbose": "yarn test --reporter verbose", diff --git a/packages/extension/package.json b/packages/extension/package.json index f221296bb..74b414df5 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -23,10 +23,10 @@ "lint:eslint": "eslint . --cache", "lint:fix": "yarn constraints --fix && yarn lint:eslint --fix && yarn lint:misc --write", "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore", + "lint:ts": "tsc --project tsconfig.test.json --noEmit", "publish:preview": "yarn npm publish --tag preview", "start": "yarn build:vite:dev --watch", "test": "vitest run --config vitest.config.ts", - "test:ts": "tsc --project tsconfig.test.json --noEmit", "test:build": "node ./test/build-tests.mjs", "test:clean": "yarn test --no-cache --coverage.clean", "test:dev": "yarn test --coverage false", diff --git a/packages/kernel/package.json b/packages/kernel/package.json index 2c3ba8cc1..2aa932c35 100644 --- a/packages/kernel/package.json +++ b/packages/kernel/package.json @@ -34,9 +34,9 @@ "lint:eslint": "eslint . --cache", "lint:fix": "yarn constraints --fix && yarn lint:eslint --fix && yarn lint:misc --write", "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore", + "lint:ts": "tsc --project tsconfig.test.json --noEmit", "publish:preview": "yarn npm publish --tag preview", "test": "vitest run --config vitest.config.ts", - "test:ts": "tsc --project tsconfig.test.json --noEmit", "test:clean": "yarn test --no-cache --coverage.clean", "test:dev": "yarn test --coverage false", "test:verbose": "yarn test --reporter verbose", diff --git a/packages/shims/package.json b/packages/shims/package.json index 538f4f175..6af0eab0f 100644 --- a/packages/shims/package.json +++ b/packages/shims/package.json @@ -28,9 +28,9 @@ "lint:eslint": "eslint . --cache", "lint:fix": "yarn constraints --fix && yarn lint:eslint --fix && yarn lint:misc --write", "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore", + "lint:ts": "tsc --project tsconfig.test.json --noEmit", "publish:preview": "yarn npm publish --tag preview", "test": "vitest run --config vitest.config.ts", - "test:ts": "tsc --project tsconfig.test.json --noEmit", "test:clean": "yarn test --no-cache --coverage.clean", "test:dev": "yarn test --coverage false", "test:verbose": "yarn test --reporter verbose", diff --git a/packages/streams/package.json b/packages/streams/package.json index ecf070e3d..045803381 100644 --- a/packages/streams/package.json +++ b/packages/streams/package.json @@ -38,9 +38,9 @@ "lint:eslint": "eslint . --cache", "lint:fix": "yarn constraints --fix && yarn lint:eslint --fix && yarn lint:misc --write", "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore", + "lint:ts": "tsc --project tsconfig.test.json --noEmit", "publish:preview": "yarn npm publish --tag preview", "test": "vitest run --config vitest.config.ts", - "test:ts": "tsc --project tsconfig.test.json --noEmit", "test:clean": "yarn test --no-cache --coverage.clean", "test:dev": "yarn test --coverage false", "test:verbose": "yarn test --reporter verbose", diff --git a/packages/utils/package.json b/packages/utils/package.json index 30dd0f373..50dc82608 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -34,9 +34,9 @@ "lint:eslint": "eslint . --cache", "lint:fix": "yarn constraints --fix && yarn lint:eslint --fix && yarn lint:misc --write", "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore", + "lint:ts": "tsc --project tsconfig.test.json --noEmit", "publish:preview": "yarn npm publish --tag preview", "test": "vitest run --config vitest.config.ts", - "test:ts": "tsc --project tsconfig.test.json --noEmit", "test:clean": "yarn test --no-cache --coverage.clean", "test:dev": "yarn test --coverage false", "test:verbose": "yarn test --reporter verbose", diff --git a/yarn.config.cjs b/yarn.config.cjs index 06e1a0523..00c304ddc 100644 --- a/yarn.config.cjs +++ b/yarn.config.cjs @@ -233,7 +233,7 @@ module.exports = defineConfig({ ); expectWorkspaceField( workspace, - 'scripts.test:ts', + 'scripts.lint:ts', 'tsc --project tsconfig.test.json --noEmit', ); expectWorkspaceField( From 0da698419275ecaa4496d88cfb21e2b721075c35 Mon Sep 17 00:00:00 2001 From: Dimitris Marlagkoutsos Date: Thu, 24 Oct 2024 14:30:56 +0200 Subject: [PATCH 2/3] Add yarn lint:ts to lint-staged --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f02f2ff80..a916a7633 100644 --- a/package.json +++ b/package.json @@ -35,11 +35,12 @@ "why:batch": "./scripts/why-batch.sh" }, "simple-git-hooks": { - "pre-commit": "yarn lint-staged && yarn lint:ts && yarn dedupe --check" + "pre-commit": "yarn lint-staged && yarn dedupe --check" }, "lint-staged": { "*.{js,mjs,cjs,ts,mts,cts}": [ - "eslint --fix" + "eslint --fix", + "bash -c 'yarn lint:ts'" ], "!(CHANGELOG).{json,html,md,yml}": [ "prettier --write" From 70ad0cc8704a2405a33c668342a0eb1ba7f60d69 Mon Sep 17 00:00:00 2001 From: Dimitris Marlagkoutsos Date: Thu, 24 Oct 2024 14:39:29 +0200 Subject: [PATCH 3/3] remove lint:ts from command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a916a7633..74b28f809 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "changelog:update": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run changelog:update", "changelog:validate": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run changelog:validate", "clean": "rimraf --glob './*.tsbuildinfo' && yarn workspaces foreach --all --parallel --interlaced --verbose run clean", - "lint": "yarn constraints && yarn lint:eslint && yarn lint:misc --check && yarn lint:dependencies && yarn lint:ts", + "lint": "yarn constraints && yarn lint:eslint && yarn lint:misc --check && yarn lint:dependencies", "lint:dependencies": "yarn dedupe --check && yarn depcheck && yarn workspaces foreach --all --parallel --verbose run lint:dependencies", "lint:dependencies:fix": "yarn dedupe && yarn depcheck && yarn workspaces foreach --all --parallel --verbose run lint:dependencies", "lint:eslint": "yarn eslint . --cache",