From 50429f16849d9fdb6497e79eabb4a15940eee9b5 Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Wed, 11 May 2022 17:32:37 -0400 Subject: [PATCH 1/5] update types for eslint --- packages/auth/api-extractor.json | 2 +- packages/firestore-compat/package.json | 2 +- packages/firestore/package.json | 2 +- repo-scripts/prune-dts/package.json | 2 +- yarn.lock | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/auth/api-extractor.json b/packages/auth/api-extractor.json index bd0dda5cca2..06ff1e940cf 100644 --- a/packages/auth/api-extractor.json +++ b/packages/auth/api-extractor.json @@ -1,6 +1,6 @@ { "extends": "../../config/api-extractor.json", - "mainEntryPointFilePath": "/dist/esm5/index.d.ts", + "mainEntryPointFilePath": "/dist/esm5/index.doc.d.ts", "dtsRollup": { "enabled": true, "untrimmedFilePath": "/dist/.d.ts", diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json index c91ccec10ea..d7140c0b604 100644 --- a/packages/firestore-compat/package.json +++ b/packages/firestore-compat/package.json @@ -50,7 +50,7 @@ }, "devDependencies": { "@firebase/app-compat": "0.1.25", - "@types/eslint": "7.28.0", + "@types/eslint": "7.29.0", "rollup": "2.72.1", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", diff --git a/packages/firestore/package.json b/packages/firestore/package.json index b876375f904..d2f31e5a93e 100644 --- a/packages/firestore/package.json +++ b/packages/firestore/package.json @@ -95,7 +95,7 @@ "@firebase/auth": "0.20.1", "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-json": "4.1.0", - "@types/eslint": "7.28.0", + "@types/eslint": "7.29.0", "@types/json-stable-stringify": "1.0.34", "json-stable-stringify": "1.0.1", "protobufjs": "6.11.2", diff --git a/repo-scripts/prune-dts/package.json b/repo-scripts/prune-dts/package.json index 4729463e6e0..2215aad67f0 100644 --- a/repo-scripts/prune-dts/package.json +++ b/repo-scripts/prune-dts/package.json @@ -32,7 +32,7 @@ "reportDir": "./coverage/node" }, "devDependencies": { - "@types/eslint": "7.28.0", + "@types/eslint": "7.29.0", "@types/prettier": "2.6.0", "mocha": "9.2.2" } diff --git a/yarn.lock b/yarn.lock index b35e723a3ff..30c4dffa0a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3079,6 +3079,14 @@ "@types/estree" "*" "@types/json-schema" "*" +"@types/eslint@7.29.0": + version "7.29.0" + resolved "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78" + integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + "@types/estree@*", "@types/estree@^0.0.50": version "0.0.50" resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" From 95325f668ce23c2971e91bb106a70aaac6e8905f Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Wed, 11 May 2022 17:35:27 -0400 Subject: [PATCH 2/5] remove typo from mainEntryPointFilePath --- packages/auth/api-extractor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/auth/api-extractor.json b/packages/auth/api-extractor.json index 06ff1e940cf..bd0dda5cca2 100644 --- a/packages/auth/api-extractor.json +++ b/packages/auth/api-extractor.json @@ -1,6 +1,6 @@ { "extends": "../../config/api-extractor.json", - "mainEntryPointFilePath": "/dist/esm5/index.doc.d.ts", + "mainEntryPointFilePath": "/dist/esm5/index.d.ts", "dtsRollup": { "enabled": true, "untrimmedFilePath": "/dist/.d.ts", From d88053218deaacb23a635cb7e1558e967f94d98b Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Thu, 12 May 2022 11:19:28 -0400 Subject: [PATCH 3/5] Skip lib checks and update base pacakage with eslint --- package.json | 2 +- packages/firestore-compat/tsconfig.json | 7 +++---- packages/firestore/tsconfig.json | 6 ++---- repo-scripts/prune-dts/tsconfig.json | 9 ++++----- yarn.lock | 2 +- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 270a021e880..77568860b0e 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "@types/chai-as-promised": "7.1.5", "@types/child-process-promise": "2.2.2", "@types/clone": "2.1.1", - "@types/eslint": "7.28.0", + "@types/eslint": "7.29.0", "@types/inquirer": "8.2.1", "@types/listr": "0.14.4", "@types/long": "4.0.2", diff --git a/packages/firestore-compat/tsconfig.json b/packages/firestore-compat/tsconfig.json index 09f747b4d46..de1fc34054a 100644 --- a/packages/firestore-compat/tsconfig.json +++ b/packages/firestore-compat/tsconfig.json @@ -1,9 +1,8 @@ { "extends": "../../config/tsconfig.base.json", "compilerOptions": { - "outDir": "dist" + "outDir": "dist", + "skipLibCheck": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/firestore/tsconfig.json b/packages/firestore/tsconfig.json index f9c40e4eff2..eaa0baeed2a 100644 --- a/packages/firestore/tsconfig.json +++ b/packages/firestore/tsconfig.json @@ -1,10 +1,8 @@ { "extends": "../../config/tsconfig.base.json", "compilerOptions": { + "skipLibCheck": true, "outDir": "dist" }, - "exclude": [ - "scripts/**/*", - "dist/**/*" - ] + "exclude": ["scripts/**/*", "dist/**/*"] } diff --git a/repo-scripts/prune-dts/tsconfig.json b/repo-scripts/prune-dts/tsconfig.json index 326e95a0fa6..4397df2c918 100644 --- a/repo-scripts/prune-dts/tsconfig.json +++ b/repo-scripts/prune-dts/tsconfig.json @@ -8,9 +8,8 @@ "target": "es2017", "esModuleInterop": true, "declaration": true, - "strict": true + "strict": true, + "skipLibCheck": true }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/yarn.lock b/yarn.lock index 30c4dffa0a5..3bf2b58a4e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3071,7 +3071,7 @@ "@types/eslint" "*" "@types/estree" "*" -"@types/eslint@*", "@types/eslint@7.28.0": +"@types/eslint@*": version "7.28.0" resolved "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== From be4724d656678f3b99b3f74a6d436df80cb500fa Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Fri, 13 May 2022 10:11:06 -0400 Subject: [PATCH 4/5] Update eslint types pacakge resulution in yarn.lock --- yarn.lock | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3bf2b58a4e0..d0d7dfc9da8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3071,15 +3071,7 @@ "@types/eslint" "*" "@types/estree" "*" -"@types/eslint@*": - version "7.28.0" - resolved "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" - integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/eslint@7.29.0": +"@types/eslint@*", "@types/eslint@7.29.0": version "7.29.0" resolved "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78" integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng== From 15e5277fe5bd234e471e8213d60233aeccd2472b Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Fri, 13 May 2022 12:11:58 -0400 Subject: [PATCH 5/5] Remove unnecessary skipLibCheck field --- packages/firestore-compat/tsconfig.json | 3 +-- packages/firestore/tsconfig.json | 1 - repo-scripts/prune-dts/tsconfig.json | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/firestore-compat/tsconfig.json b/packages/firestore-compat/tsconfig.json index de1fc34054a..4e0ae05eebc 100644 --- a/packages/firestore-compat/tsconfig.json +++ b/packages/firestore-compat/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../config/tsconfig.base.json", "compilerOptions": { - "outDir": "dist", - "skipLibCheck": true + "outDir": "dist" }, "exclude": ["dist/**/*"] } diff --git a/packages/firestore/tsconfig.json b/packages/firestore/tsconfig.json index eaa0baeed2a..d53852fa79a 100644 --- a/packages/firestore/tsconfig.json +++ b/packages/firestore/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../config/tsconfig.base.json", "compilerOptions": { - "skipLibCheck": true, "outDir": "dist" }, "exclude": ["scripts/**/*", "dist/**/*"] diff --git a/repo-scripts/prune-dts/tsconfig.json b/repo-scripts/prune-dts/tsconfig.json index 4397df2c918..236dfb5b9d8 100644 --- a/repo-scripts/prune-dts/tsconfig.json +++ b/repo-scripts/prune-dts/tsconfig.json @@ -8,8 +8,7 @@ "target": "es2017", "esModuleInterop": true, "declaration": true, - "strict": true, - "skipLibCheck": true + "strict": true }, "exclude": ["dist/**/*"] }