From ab480126fe8541f986b5d1f9d01f4fe6c9ec20f8 Mon Sep 17 00:00:00 2001 From: Quinlan Jung Date: Tue, 3 Dec 2024 16:09:10 -0800 Subject: [PATCH 1/3] [eas-cli][eas-json] use node18 as tsconfig base --- packages/eas-cli/package.json | 1 + packages/eas-cli/tsconfig.json | 5 ++--- packages/eas-json/package.json | 1 + packages/eas-json/tsconfig.json | 7 +++---- yarn.lock | 36 ++++++++------------------------- 5 files changed, 15 insertions(+), 35 deletions(-) diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json index 8ac86cc4de..19948739e5 100644 --- a/packages/eas-cli/package.json +++ b/packages/eas-cli/package.json @@ -95,6 +95,7 @@ "@graphql-codegen/introspection": "4.0.0", "@graphql-codegen/typescript": "4.0.1", "@graphql-codegen/typescript-operations": "4.0.1", + "@tsconfig/node18": "18.2.4", "@types/cli-progress": "3.11.5", "@types/dateformat": "3.0.1", "@types/diff": "6.0.0", diff --git a/packages/eas-cli/tsconfig.json b/packages/eas-cli/tsconfig.json index 60f23404c3..102ef2a326 100644 --- a/packages/eas-cli/tsconfig.json +++ b/packages/eas-cli/tsconfig.json @@ -1,16 +1,15 @@ { + "extends": "@tsconfig/node18/tsconfig.json", "compilerOptions": { "declaration": true, "importHelpers": true, "module": "commonjs", - "esModuleInterop": true, + "moduleResolution": "node", "noFallthroughCasesInSwitch": true, "noImplicitOverride": true, "noImplicitReturns": true, "noUnusedLocals": true, "noUnusedParameters": true, - "strict": true, - "target": "ES2022", "outDir": "build", "rootDir": "src", "typeRoots": ["../../ts-declarations", "../../node_modules/@types", "./node_modules/@types"] diff --git a/packages/eas-json/package.json b/packages/eas-json/package.json index 164913052b..760f77a8a0 100644 --- a/packages/eas-json/package.json +++ b/packages/eas-json/package.json @@ -18,6 +18,7 @@ "tslib": "2.4.1" }, "devDependencies": { + "@tsconfig/node18": "18.2.4", "@types/babel__code-frame": "7.0.3", "@types/fs-extra": "11.0.4", "memfs": "3.4.13", diff --git a/packages/eas-json/tsconfig.json b/packages/eas-json/tsconfig.json index cbd85d045b..2aae46dde8 100644 --- a/packages/eas-json/tsconfig.json +++ b/packages/eas-json/tsconfig.json @@ -1,19 +1,18 @@ { + "extends": "@tsconfig/node18/tsconfig.json", "compilerOptions": { "declaration": true, "importHelpers": true, "module": "commonjs", - "esModuleInterop": true, + "moduleResolution": "node", "noFallthroughCasesInSwitch": true, "noImplicitOverride": true, "noImplicitReturns": true, "noUnusedLocals": true, "noUnusedParameters": true, - "strict": true, - "target": "ES2022", "outDir": "build", "rootDir": "src", "typeRoots": ["../../node_modules/@types", "../../ts-declarations", "./node_modules/@types"] }, "include": ["src/**/*"] -} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index cdef76f7b3..074f6633f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3577,6 +3577,11 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== +"@tsconfig/node18@18.2.4": + version "18.2.4" + resolved "https://registry.yarnpkg.com/@tsconfig/node18/-/node18-18.2.4.tgz#094efbdd70f697d37c09f34067bf41bc4a828ae3" + integrity sha512-5xxU8vVs9/FNcvm3gE07fPbn9tl6tqGGWA9tSlwsUEkBxtRnTsNmwrV8gasZ9F/EobaSv9+nu8AxUKccw77JpQ== + "@tufjs/canonical-json@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31" @@ -13228,16 +13233,7 @@ string-length@^5.0.1: char-regex "^2.0.0" strip-ansi "^7.0.1" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -13393,7 +13389,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -13414,13 +13410,6 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" -strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -14627,16 +14616,7 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@7.0.0, wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== From fbee970f65db4c96ecc67bc3aa3de8e393f32c8b Mon Sep 17 00:00:00 2001 From: Quinlan Jung Date: Mon, 6 Jan 2025 09:06:36 -0800 Subject: [PATCH 2/3] Temporary Commit at 1/6/2025, 9:06:36 AM --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73c757a999..4b974f2821 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This is the log of notable changes to EAS CLI and related packages. - Update log output for `worker` deploy and alias commands. ([#2780](https://github.com/expo/eas-cli/pull/2780) by [@kitten](https://github.com/kitten)) - Update various messages wording. ([#2790](https://github.com/expo/eas-cli/pull/2790) by [@simek](https://github.com/simek)) +- Use node18 as tsconfig base. ([#2736](https://github.com/expo/eas-cli/pull/2739) by [@quinlanj](https://github.com/quinlanj)) ## [14.2.0](https://github.com/expo/eas-cli/releases/tag/v14.2.0) - 2024-12-13 From 9e79e23ae47e61ce747ae4c75468c435982b2174 Mon Sep 17 00:00:00 2001 From: Quinlan Jung Date: Mon, 6 Jan 2025 09:17:06 -0800 Subject: [PATCH 3/3] Temporary Commit at 1/6/2025, 9:17:06 AM --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b974f2821..665af73ff9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ This is the log of notable changes to EAS CLI and related packages. - Update log output for `worker` deploy and alias commands. ([#2780](https://github.com/expo/eas-cli/pull/2780) by [@kitten](https://github.com/kitten)) - Update various messages wording. ([#2790](https://github.com/expo/eas-cli/pull/2790) by [@simek](https://github.com/simek)) -- Use node18 as tsconfig base. ([#2736](https://github.com/expo/eas-cli/pull/2739) by [@quinlanj](https://github.com/quinlanj)) +- Use node18 as tsconfig base. ([#2739](https://github.com/expo/eas-cli/pull/2739) by [@quinlanj](https://github.com/quinlanj)) ## [14.2.0](https://github.com/expo/eas-cli/releases/tag/v14.2.0) - 2024-12-13