From bd146cc09b651830ce8c64f7a904aec0da7baf43 Mon Sep 17 00:00:00 2001 From: Axel Bocciarelli Date: Fri, 10 Jan 2025 14:47:47 +0100 Subject: [PATCH 1/2] Pin Poetry version in CI --- .github/workflows/lint-test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 4712a1417..68473159f 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -84,18 +84,20 @@ jobs: uses: actions/cache@v4 with: path: ~/.local - key: poetry-0 # increment to reset cache + key: poetry-1 # increment to reset cache - name: Install Poetry 📜 if: steps.poetry.outputs.cache-hit != 'true' uses: snok/install-poetry@v1 + with: + version: 1.8.5 - name: Restore Poetry environments 📌 id: poetry-venvs uses: actions/cache@v4 with: path: ~/.cache/pypoetry/virtualenvs - key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}-1 # increment to reset cache + key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}-3 # increment to reset cache - name: Create Poetry environments 📜 if: steps.poetry-venvs.outputs.cache-hit != 'true' From 3d1d0c1c6e09ef89c5cb2216d9cb36d67e52a878 Mon Sep 17 00:00:00 2001 From: Axel Bocciarelli Date: Fri, 10 Jan 2025 14:47:47 +0100 Subject: [PATCH 2/2] Type-check root files with `tsc` --- apps/demo/tsconfig.json | 2 +- apps/storybook/tsconfig.json | 2 +- cypress/tsconfig.json | 4 ++-- packages/app/tsconfig.build.json | 1 + packages/app/tsconfig.json | 2 +- packages/h5wasm/tsconfig.build.json | 1 + packages/h5wasm/tsconfig.json | 2 +- packages/lib/tsconfig.build.json | 1 + packages/lib/tsconfig.json | 2 +- packages/shared/tsconfig.build.json | 1 + packages/shared/tsconfig.json | 2 +- tsconfig.json | 2 +- 12 files changed, 13 insertions(+), 9 deletions(-) diff --git a/apps/demo/tsconfig.json b/apps/demo/tsconfig.json index 596e2cf72..c4a0b28ff 100644 --- a/apps/demo/tsconfig.json +++ b/apps/demo/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["*", "src"] } diff --git a/apps/storybook/tsconfig.json b/apps/storybook/tsconfig.json index bad814303..e16728040 100644 --- a/apps/storybook/tsconfig.json +++ b/apps/storybook/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "../../tsconfig.json", - "include": [".storybook/**/*", "src"] + "include": ["*", ".storybook/**/*", "src"] } diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json index 40e1b62b9..c2e4c1ca4 100644 --- a/cypress/tsconfig.json +++ b/cypress/tsconfig.json @@ -1,5 +1,6 @@ { "extends": "../tsconfig.json", + "include": ["*", "e2e"], "compilerOptions": { "isolatedModules": false, "sourceMap": false, @@ -8,6 +9,5 @@ "@testing-library/cypress", "@simonsmith/cypress-image-snapshot/types" ] - }, - "include": ["*", "e2e"] + } } diff --git a/packages/app/tsconfig.build.json b/packages/app/tsconfig.build.json index 9334d3cac..34cf077b7 100644 --- a/packages/app/tsconfig.build.json +++ b/packages/app/tsconfig.build.json @@ -1,5 +1,6 @@ { "extends": "./tsconfig.json", + "include": ["src"], "exclude": ["**/*.test.ts"], "compilerOptions": { "rootDir": "src", diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json index 596e2cf72..c4a0b28ff 100644 --- a/packages/app/tsconfig.json +++ b/packages/app/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["*", "src"] } diff --git a/packages/h5wasm/tsconfig.build.json b/packages/h5wasm/tsconfig.build.json index 7f1f0ddcb..b623a9e4c 100644 --- a/packages/h5wasm/tsconfig.build.json +++ b/packages/h5wasm/tsconfig.build.json @@ -1,5 +1,6 @@ { "extends": "./tsconfig.json", + "include": ["src"], "compilerOptions": { "rootDir": "src", "outDir": "dist-ts", diff --git a/packages/h5wasm/tsconfig.json b/packages/h5wasm/tsconfig.json index 596e2cf72..c4a0b28ff 100644 --- a/packages/h5wasm/tsconfig.json +++ b/packages/h5wasm/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["*", "src"] } diff --git a/packages/lib/tsconfig.build.json b/packages/lib/tsconfig.build.json index 9334d3cac..34cf077b7 100644 --- a/packages/lib/tsconfig.build.json +++ b/packages/lib/tsconfig.build.json @@ -1,5 +1,6 @@ { "extends": "./tsconfig.json", + "include": ["src"], "exclude": ["**/*.test.ts"], "compilerOptions": { "rootDir": "src", diff --git a/packages/lib/tsconfig.json b/packages/lib/tsconfig.json index 596e2cf72..c4a0b28ff 100644 --- a/packages/lib/tsconfig.json +++ b/packages/lib/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["*", "src"] } diff --git a/packages/shared/tsconfig.build.json b/packages/shared/tsconfig.build.json index 9334d3cac..34cf077b7 100644 --- a/packages/shared/tsconfig.build.json +++ b/packages/shared/tsconfig.build.json @@ -1,5 +1,6 @@ { "extends": "./tsconfig.json", + "include": ["src"], "exclude": ["**/*.test.ts"], "compilerOptions": { "rootDir": "src", diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index 596e2cf72..c4a0b28ff 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["*", "src"] } diff --git a/tsconfig.json b/tsconfig.json index 1879a0504..9a0577b8e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,5 +26,5 @@ "useDefineForClassFields": true, "useUnknownInCatchVariables": true }, - "include": ["*", "cypress", "apps/*/*", "packages/*/*"] + "include": ["*", "cypress"] }