From 86ea6a32642aab3d51a08efb73f1104a2f9ac05b Mon Sep 17 00:00:00 2001 From: Adrian Mucha Date: Sun, 15 Sep 2024 22:23:57 +0200 Subject: [PATCH 1/4] Fix duplicate type declaration AbortController --- package-lock.json | 37 +++++++++++++++++++++++++++++-------- package.json | 1 + 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index c35489ccb..95e700bd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@testing-library/react": "12.1.5", "@testing-library/user-event": "14.4.3", "@types/jest": "26.0.20", + "@types/node": "18.19.50", "eslint-config-vazco": "7.4.0", "eslint-import-resolver-alias": "1.1.2", "eslint-import-resolver-typescript": "2.3.0", @@ -2399,10 +2400,14 @@ "dev": true }, "node_modules/@types/node": { - "version": "17.0.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz", - "integrity": "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==", - "dev": true + "version": "18.19.50", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz", + "integrity": "sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -12803,6 +12808,13 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true, + "license": "MIT" + }, "node_modules/unified": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz", @@ -15389,10 +15401,13 @@ "dev": true }, "@types/node": { - "version": "17.0.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz", - "integrity": "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==", - "dev": true + "version": "18.19.50", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz", + "integrity": "sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==", + "dev": true, + "requires": { + "undici-types": "~5.26.4" + } }, "@types/normalize-package-data": { "version": "2.4.1", @@ -22753,6 +22768,12 @@ "which-boxed-primitive": "^1.0.2" } }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "unified": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz", diff --git a/package.json b/package.json index efc76a448..f2ea10b6a 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@testing-library/react": "12.1.5", "@testing-library/user-event": "14.4.3", "@types/jest": "26.0.20", + "@types/node": "18.19.50", "eslint-config-vazco": "7.4.0", "eslint-import-resolver-alias": "1.1.2", "eslint-import-resolver-typescript": "2.3.0", From bbf9d6a1d1bf50f2298082bcea0f2edf334b15fe Mon Sep 17 00:00:00 2001 From: Adrian Mucha Date: Sun, 15 Sep 2024 22:24:13 +0200 Subject: [PATCH 2/4] Fix cannot find name Model_1 --- packages/uniforms/src/BaseForm.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uniforms/src/BaseForm.tsx b/packages/uniforms/src/BaseForm.tsx index f61533a90..8b55184d7 100644 --- a/packages/uniforms/src/BaseForm.tsx +++ b/packages/uniforms/src/BaseForm.tsx @@ -167,9 +167,9 @@ export class BaseForm< getNativeFormProps(): { [key: string]: unknown; children?: React.ReactNode; - id?: BaseFormProps['id']; + id?: string; key: string; - noValidate: BaseFormProps['noValidate']; + noValidate: boolean; onSubmit: BaseForm['onSubmit']; } { const props = omit(this.props, [ From 0694d044d2effeb5bf99ce891f1d4ee1c4ecec54 Mon Sep 17 00:00:00 2001 From: Adrian Mucha Date: Sun, 15 Sep 2024 22:24:43 +0200 Subject: [PATCH 3/4] Add skipLibCheck --- tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 0e5ff170a..c4011d4eb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,6 +9,7 @@ "moduleResolution": "node", "paths": { "uniforms": ["uniforms/src"], "uniforms-*": ["uniforms-*/src"] }, "strict": true, - "target": "ES6" + "target": "ES6", + "skipLibCheck": true } } From 6c341e480e12a5d16a858a675c607180b351778c Mon Sep 17 00:00:00 2001 From: Adrian Mucha Date: Fri, 20 Sep 2024 12:22:29 +0200 Subject: [PATCH 4/4] Remove node 16.x from CI matrix --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 839753112..595ba8bc1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.x, 18.x, 20.x, 22.x] + node-version: [18.x, 20.x, 22.x] steps: - name: Checkout uses: actions/checkout@v4.1.1