From 569a9d23902cd364d988f84c131db01df60f9c8e Mon Sep 17 00:00:00 2001 From: Dominik Sokal Date: Mon, 12 Apr 2021 16:59:03 +0200 Subject: [PATCH 1/4] use separate tsconfig files for development and release --- packages/eas-cli/package.json | 2 +- packages/eas-cli/tsconfig.build.json | 4 ++++ packages/eas-cli/tsconfig.json | 11 +++++------ packages/eas-json/package.json | 2 +- packages/eas-json/tsconfig.build.json | 4 ++++ packages/eas-json/tsconfig.json | 15 ++++++++++----- 6 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 packages/eas-cli/tsconfig.build.json create mode 100644 packages/eas-json/tsconfig.build.json diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json index bd2934bd5f..682e660045 100644 --- a/packages/eas-cli/package.json +++ b/packages/eas-cli/package.json @@ -163,7 +163,7 @@ "scripts": { "postpack": "rm -f oclif.manifest.json", "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme", - "build": "tsc", + "build": "tsc -p tsconfig.build.json", "watch": "tsc --watch", "test": "jest", "version": "yarn oclif-dev readme && git add README.md", diff --git a/packages/eas-cli/tsconfig.build.json b/packages/eas-cli/tsconfig.build.json new file mode 100644 index 0000000000..f076065ed2 --- /dev/null +++ b/packages/eas-cli/tsconfig.build.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig", + "exclude": ["**/__mocks__/*", "**/__tests__/*"] +} diff --git a/packages/eas-cli/tsconfig.json b/packages/eas-cli/tsconfig.json index 4bdbd8b17d..284d8ef8df 100644 --- a/packages/eas-cli/tsconfig.json +++ b/packages/eas-cli/tsconfig.json @@ -5,16 +5,15 @@ "module": "commonjs", "esModuleInterop": true, "noImplicitReturns": true, - "outDir": "build", - "rootDir": "src", "strict": true, "target": "es2017", + "outDir": "build", + "rootDir": "src", "typeRoots": [ + "../../node_modules/@types", "../../ts-declarations", - "./node_modules/@types", - "../../node_modules/@types" + "./node_modules/@types" ] }, - "include": ["src/**/*"], - "exclude": ["**/__mocks__/*", "**/__tests__/*"] + "include": ["src/**/*"] } diff --git a/packages/eas-json/package.json b/packages/eas-json/package.json index f8322bd213..910646824c 100644 --- a/packages/eas-json/package.json +++ b/packages/eas-json/package.json @@ -31,7 +31,7 @@ "main": "build/index.js", "repository": "expo/eas-cli", "scripts": { - "build": "tsc", + "build": "tsc -p tsconfig.build.json", "watch": "tsc --watch", "prepack": "rm -rf build && yarn build", "test": "jest" diff --git a/packages/eas-json/tsconfig.build.json b/packages/eas-json/tsconfig.build.json new file mode 100644 index 0000000000..f076065ed2 --- /dev/null +++ b/packages/eas-json/tsconfig.build.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig", + "exclude": ["**/__mocks__/*", "**/__tests__/*"] +} diff --git a/packages/eas-json/tsconfig.json b/packages/eas-json/tsconfig.json index 67f2158b9d..284d8ef8df 100644 --- a/packages/eas-json/tsconfig.json +++ b/packages/eas-json/tsconfig.json @@ -1,14 +1,19 @@ { "compilerOptions": { "declaration": true, - "esModuleInterop": true, "importHelpers": true, "module": "commonjs", + "esModuleInterop": true, + "noImplicitReturns": true, + "strict": true, + "target": "es2017", "outDir": "build", "rootDir": "src", - "strict": true, - "target": "es2017" + "typeRoots": [ + "../../node_modules/@types", + "../../ts-declarations", + "./node_modules/@types" + ] }, - "include": ["src/**/*"], - "exclude": ["**/__mocks__/*", "**/__tests__/*"] + "include": ["src/**/*"] } From 872f1d867fdb3a3e3afdd52c767bedf16cba51ae Mon Sep 17 00:00:00 2001 From: Dominik Sokal Date: Mon, 12 Apr 2021 17:43:37 +0200 Subject: [PATCH 2/4] fix type errors in tests --- packages/eas-cli/src/__tests__/api-test.ts | 4 +-- .../src/build/ios/__tests__/version-test.ts | 25 ++++++++++++------- .../__tests__/fixtures-constants.ts | 2 ++ .../credentials/__tests__/fixtures-context.ts | 2 +- .../SetupProvisioningProfile-test.ts | 7 ++++-- .../__tests__/printCredentialsBeta-test.ts | 3 ++- .../src/devices/__tests__/manager-test.ts | 9 ++++--- .../project/__tests__/projectUtils-test.ts | 7 ++++++ .../eas-cli/src/user/__tests__/User-test.ts | 2 ++ .../src/user/__tests__/actions-test.ts | 2 ++ .../eas-cli/src/user/__tests__/otp-test.ts | 18 ++++++------- 11 files changed, 53 insertions(+), 28 deletions(-) diff --git a/packages/eas-cli/src/__tests__/api-test.ts b/packages/eas-cli/src/__tests__/api-test.ts index 0d1134d211..b57f713c0f 100644 --- a/packages/eas-cli/src/__tests__/api-test.ts +++ b/packages/eas-cli/src/__tests__/api-test.ts @@ -21,7 +21,7 @@ describe('apiClient', () => { ], }); - let error: Error; + let error: Error | null = null; try { await apiClient.post('test'); } catch (e) { @@ -41,7 +41,7 @@ describe('apiClient', () => { it('does not convert non-APIv2 error to ApiV2Error', async () => { nock(getExpoApiBaseUrl()).post('/--/api/v2/test').reply(500, 'Something went wrong'); - let error: Error; + let error: Error | null = null; try { await apiClient.post('test'); } catch (e) { diff --git a/packages/eas-cli/src/build/ios/__tests__/version-test.ts b/packages/eas-cli/src/build/ios/__tests__/version-test.ts index 13ad296bd9..570d3284c5 100644 --- a/packages/eas-cli/src/build/ios/__tests__/version-test.ts +++ b/packages/eas-cli/src/build/ios/__tests__/version-test.ts @@ -1,4 +1,5 @@ import { ExpoConfig } from '@expo/config'; +import { IOSConfig } from '@expo/config-plugins'; import fs from 'fs-extra'; import { vol } from 'memfs'; import os from 'os'; @@ -38,9 +39,11 @@ describe(bumpVersionAsync, () => { }); const appJSON = await fs.readJSON('/repo/app.json'); - const infoPlist = await readPlistAsync('/repo/ios/myproject/Info.plist'); + const infoPlist = (await readPlistAsync( + '/repo/ios/myproject/Info.plist' + )) as IOSConfig.InfoPlist; expect(fakeExp.version).toBe('1.0.0'); - expect(fakeExp.ios.buildNumber).toBe('2'); + expect(fakeExp.ios?.buildNumber).toBe('2'); expect(appJSON.expo.version).toBe('1.0.0'); expect(appJSON.expo.ios.buildNumber).toBe('2'); expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.0'); @@ -57,9 +60,11 @@ describe(bumpVersionAsync, () => { }); const appJSON = await fs.readJSON('/repo/app.json'); - const infoPlist = await readPlistAsync('/repo/ios/myproject/Info.plist'); + const infoPlist = (await readPlistAsync( + '/repo/ios/myproject/Info.plist' + )) as IOSConfig.InfoPlist; expect(fakeExp.version).toBe('1.0.1'); - expect(fakeExp.ios.buildNumber).toBe('1'); + expect(fakeExp.ios?.buildNumber).toBe('1'); expect(appJSON.expo.version).toBe('1.0.1'); expect(appJSON.expo.ios.buildNumber).toBe('1'); expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.1'); @@ -76,9 +81,11 @@ describe(bumpVersionAsync, () => { }); const appJSON = await fs.readJSON('/repo/app.json'); - const infoPlist = await readPlistAsync('/repo/ios/myproject/Info.plist'); + const infoPlist = (await readPlistAsync( + '/repo/ios/myproject/Info.plist' + )) as IOSConfig.InfoPlist; expect(fakeExp.version).toBe('1.0.0'); - expect(fakeExp.ios.buildNumber).toBe('1'); + expect(fakeExp.ios?.buildNumber).toBe('1'); expect(appJSON.expo.version).toBe('1.0.0'); expect(appJSON.expo.ios.buildNumber).toBe('1'); expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.0'); @@ -99,7 +106,7 @@ describe(bumpVersionInAppJsonAsync, () => { const appJSON = await fs.readJSON('/repo/app.json'); expect(fakeExp.version).toBe('1.0.0'); - expect(fakeExp.ios.buildNumber).toBe('2'); + expect(fakeExp.ios?.buildNumber).toBe('2'); expect(appJSON.expo.version).toBe('1.0.0'); expect(appJSON.expo.ios.buildNumber).toBe('2'); }); @@ -115,7 +122,7 @@ describe(bumpVersionInAppJsonAsync, () => { const appJSON = await fs.readJSON('/repo/app.json'); expect(fakeExp.version).toBe('1.0.1'); - expect(fakeExp.ios.buildNumber).toBe('1'); + expect(fakeExp.ios?.buildNumber).toBe('1'); expect(appJSON.expo.version).toBe('1.0.1'); expect(appJSON.expo.ios.buildNumber).toBe('1'); }); @@ -131,7 +138,7 @@ describe(bumpVersionInAppJsonAsync, () => { const appJSON = await fs.readJSON('/repo/app.json'); expect(fakeExp.version).toBe('1.0.0'); - expect(fakeExp.ios.buildNumber).toBe('1'); + expect(fakeExp.ios?.buildNumber).toBe('1'); expect(appJSON.expo.version).toBe('1.0.0'); expect(appJSON.expo.ios.buildNumber).toBe('1'); }); diff --git a/packages/eas-cli/src/credentials/__tests__/fixtures-constants.ts b/packages/eas-cli/src/credentials/__tests__/fixtures-constants.ts index 68abad055c..c138c91b8d 100644 --- a/packages/eas-cli/src/credentials/__tests__/fixtures-constants.ts +++ b/packages/eas-cli/src/credentials/__tests__/fixtures-constants.ts @@ -5,6 +5,7 @@ export const jester: Actor = { id: 'jester-id', username: 'jester', accounts: [{ id: 'jester-account-id', name: 'jester' }], + isExpoAdmin: false, }; export const jester2: Actor = { @@ -12,6 +13,7 @@ export const jester2: Actor = { id: 'jester2-id', username: 'jester2', accounts: [{ id: 'jester2-account-id', name: 'jester2' }], + isExpoAdmin: false, }; export const testUsername = jester.username; diff --git a/packages/eas-cli/src/credentials/__tests__/fixtures-context.ts b/packages/eas-cli/src/credentials/__tests__/fixtures-context.ts index c220a68418..59359b9dba 100644 --- a/packages/eas-cli/src/credentials/__tests__/fixtures-context.ts +++ b/packages/eas-cli/src/credentials/__tests__/fixtures-context.ts @@ -37,5 +37,5 @@ export function createManagerMock(mockOverride: Record = {}): Crede }), }, mockOverride - ); + ) as any; } diff --git a/packages/eas-cli/src/credentials/ios/actions/new/__tests__/SetupProvisioningProfile-test.ts b/packages/eas-cli/src/credentials/ios/actions/new/__tests__/SetupProvisioningProfile-test.ts index 8a398e4ab9..6cf41db97b 100644 --- a/packages/eas-cli/src/credentials/ios/actions/new/__tests__/SetupProvisioningProfile-test.ts +++ b/packages/eas-cli/src/credentials/ios/actions/new/__tests__/SetupProvisioningProfile-test.ts @@ -1,3 +1,5 @@ +import nullthrows from 'nullthrows'; + import { confirmAsync } from '../../../../../prompts'; import { getAppstoreMock, testAuthCtx } from '../../../../__tests__/fixtures-appstore'; import { createCtxMock } from '../../../../__tests__/fixtures-context'; @@ -32,9 +34,10 @@ describe('SetupProvisioningProfile', () => { authCtx: testAuthCtx, listProvisioningProfilesAsync: jest.fn(() => [ { - provisioningProfileId: + provisioningProfileId: nullthrows( testIosAppCredentialsWithBuildCredentialsQueryResult.iosAppBuildCredentialsArray[0] - .provisioningProfile.developerPortalIdentifier, + .provisioningProfile + ).developerPortalIdentifier, }, ]), }, diff --git a/packages/eas-cli/src/credentials/ios/utils/__tests__/printCredentialsBeta-test.ts b/packages/eas-cli/src/credentials/ios/utils/__tests__/printCredentialsBeta-test.ts index e8412e22db..7722766770 100644 --- a/packages/eas-cli/src/credentials/ios/utils/__tests__/printCredentialsBeta-test.ts +++ b/packages/eas-cli/src/credentials/ios/utils/__tests__/printCredentialsBeta-test.ts @@ -1,4 +1,5 @@ import mockdate from 'mockdate'; +import nullthrows from 'nullthrows'; import Log from '../../../../log'; import { IosAppCredentialsQuery } from '../../api/graphql/queries/IosAppCredentialsQuery'; @@ -18,7 +19,7 @@ describe('print credentials', () => { appleAppIdentifierId: 'test-id', } ); - displayIosAppCredentials(testIosAppCredentialsData); + displayIosAppCredentials(nullthrows(testIosAppCredentialsData)); const loggedSoFar = (Log.log as jest.Mock).mock.calls.reduce( (acc, mockValue) => acc + mockValue ); diff --git a/packages/eas-cli/src/devices/__tests__/manager-test.ts b/packages/eas-cli/src/devices/__tests__/manager-test.ts index 7742778da9..4dd8384b56 100644 --- a/packages/eas-cli/src/devices/__tests__/manager-test.ts +++ b/packages/eas-cli/src/devices/__tests__/manager-test.ts @@ -30,17 +30,18 @@ describe(AccountResolver, () => { { id: 'account_id_777', name: 'dominik' }, { id: 'account_id_888', name: 'foo' }, ], + isExpoAdmin: false, }; describe('when inside project dir', () => { - const projectDir = '/app'; + const exp = {} as any; it('returns the account defined in app.json/app.config.js if user confirms', async () => { asMock(prompts).mockImplementationOnce(() => ({ value: true, })); - const resolver = new AccountResolver(projectDir, user); + const resolver = new AccountResolver(exp, user); const account = await resolver.resolveAccountAsync(); expect(account).toEqual(user.accounts[1]); }); @@ -53,7 +54,7 @@ describe(AccountResolver, () => { account: user.accounts[0], })); - const resolver = new AccountResolver(projectDir, user); + const resolver = new AccountResolver(exp, user); const account = await resolver.resolveAccountAsync(); expect(account).toEqual(user.accounts[0]); }); @@ -71,7 +72,7 @@ describe(AccountResolver, () => { const originalConsoleWarn = console.warn; console.warn = jest.fn(); - const resolver = new AccountResolver(projectDir, userWithAccessToProjectAccount); + const resolver = new AccountResolver(exp, userWithAccessToProjectAccount); const account = await resolver.resolveAccountAsync(); expect(account).toEqual(user.accounts[0]); expect(console.warn).toBeCalledWith(expect.stringMatching(/doesn't have access to the/)); diff --git a/packages/eas-cli/src/project/__tests__/projectUtils-test.ts b/packages/eas-cli/src/project/__tests__/projectUtils-test.ts index 74faba14c3..0337d35465 100644 --- a/packages/eas-cli/src/project/__tests__/projectUtils-test.ts +++ b/packages/eas-cli/src/project/__tests__/projectUtils-test.ts @@ -64,6 +64,7 @@ describe(getProjectAccountName, () => { id: 'userId', username: 'notbrent', accounts: [], + isExpoAdmin: false, }); expect(projectAccountName).toBe(expWithOwner.owner); }); @@ -74,6 +75,7 @@ describe(getProjectAccountName, () => { id: 'userId', firstName: 'notauser', accounts: [], + isExpoAdmin: false, }); expect(projectAccountName).toBe(expWithOwner.owner); }); @@ -84,6 +86,7 @@ describe(getProjectAccountName, () => { id: 'userId', username: 'dominik', accounts: [], + isExpoAdmin: false, }); expect(projectAccountName).toBe('dominik'); }); @@ -95,6 +98,7 @@ describe(getProjectAccountName, () => { id: 'userId', firstName: 'notauser', accounts: [], + isExpoAdmin: false, }); expect(resolveProjectAccountName).toThrow('manifest property is required'); }); @@ -117,6 +121,7 @@ describe(getProjectAccountNameAsync, () => { { id: 'account_id_1', name: 'notnotbrent' }, { id: 'account_id_2', name: 'dominik' }, ], + isExpoAdmin: false, })); const projectAccountName = await getProjectAccountNameAsync(expWithOwner); @@ -132,6 +137,7 @@ describe(getProjectAccountNameAsync, () => { { id: 'account_id_1', name: 'notnotbrent' }, { id: 'account_id_2', name: 'dominik' }, ], + isExpoAdmin: false, })); const projectAccountName = await getProjectAccountNameAsync(expWithoutOwner); @@ -155,6 +161,7 @@ describe(getProjectAccountNameAsync, () => { { id: 'account_id_1', name: 'notnotbrent' }, { id: 'account_id_2', name: 'dominik' }, ], + isExpoAdmin: false, })); await expect(getProjectAccountNameAsync(expWithoutOwner)).rejects.toThrow( 'manifest property is required' diff --git a/packages/eas-cli/src/user/__tests__/User-test.ts b/packages/eas-cli/src/user/__tests__/User-test.ts index 1b31a2a7c5..317a8fcfc8 100644 --- a/packages/eas-cli/src/user/__tests__/User-test.ts +++ b/packages/eas-cli/src/user/__tests__/User-test.ts @@ -46,6 +46,7 @@ const userStub: Actor = { id: 'userId', username: 'username', accounts: [], + isExpoAdmin: false, }; const robotStub: Actor = { @@ -53,6 +54,7 @@ const robotStub: Actor = { id: 'userId', firstName: 'GLaDOS', accounts: [], + isExpoAdmin: false, }; describe('getUserAsync', () => { diff --git a/packages/eas-cli/src/user/__tests__/actions-test.ts b/packages/eas-cli/src/user/__tests__/actions-test.ts index 5ec91db70e..b4c4eebbbc 100644 --- a/packages/eas-cli/src/user/__tests__/actions-test.ts +++ b/packages/eas-cli/src/user/__tests__/actions-test.ts @@ -25,6 +25,7 @@ const userStub: Actor = { id: 'userId', username: 'username', accounts: [], + isExpoAdmin: false, }; const robotStub: Actor = { @@ -32,6 +33,7 @@ const robotStub: Actor = { id: 'userId', firstName: 'GLaDOS', accounts: [], + isExpoAdmin: false, }; describe('ensureActorHasUsername', () => { diff --git a/packages/eas-cli/src/user/__tests__/otp-test.ts b/packages/eas-cli/src/user/__tests__/otp-test.ts index 3a157843a7..36295278d0 100644 --- a/packages/eas-cli/src/user/__tests__/otp-test.ts +++ b/packages/eas-cli/src/user/__tests__/otp-test.ts @@ -66,7 +66,7 @@ describe(retryUsernamePasswordAuthWithOTPAsync, () => { id: 'p0', is_primary: true, method: UserSecondFactorDeviceMethod.AUTHENTICATOR, - sms_phone_number: undefined, + sms_phone_number: null, }, ], smsAutomaticallySent: false, @@ -96,13 +96,13 @@ describe(retryUsernamePasswordAuthWithOTPAsync, () => { id: 'p0', is_primary: true, method: UserSecondFactorDeviceMethod.AUTHENTICATOR, - sms_phone_number: undefined, + sms_phone_number: null, }, { id: 'p2', is_primary: false, method: UserSecondFactorDeviceMethod.AUTHENTICATOR, - sms_phone_number: undefined, + sms_phone_number: null, }, ], smsAutomaticallySent: false, @@ -126,7 +126,7 @@ describe(retryUsernamePasswordAuthWithOTPAsync, () => { id: 'p0', is_primary: true, method: UserSecondFactorDeviceMethod.AUTHENTICATOR, - sms_phone_number: undefined, + sms_phone_number: null, }, ], smsAutomaticallySent: false, @@ -156,13 +156,13 @@ describe(retryUsernamePasswordAuthWithOTPAsync, () => { id: 'p0', is_primary: true, method: UserSecondFactorDeviceMethod.AUTHENTICATOR, - sms_phone_number: undefined, + sms_phone_number: null, }, { id: 'p2', is_primary: false, method: UserSecondFactorDeviceMethod.AUTHENTICATOR, - sms_phone_number: undefined, + sms_phone_number: null, }, ], smsAutomaticallySent: false, @@ -195,7 +195,7 @@ describe(retryUsernamePasswordAuthWithOTPAsync, () => { id: 'p0', is_primary: true, method: UserSecondFactorDeviceMethod.AUTHENTICATOR, - sms_phone_number: undefined, + sms_phone_number: null, }, { id: 'p2', @@ -240,13 +240,13 @@ describe(retryUsernamePasswordAuthWithOTPAsync, () => { id: 'p0', is_primary: true, method: UserSecondFactorDeviceMethod.AUTHENTICATOR, - sms_phone_number: undefined, + sms_phone_number: null, }, { id: 'p2', is_primary: false, method: UserSecondFactorDeviceMethod.AUTHENTICATOR, - sms_phone_number: undefined, + sms_phone_number: null, }, ], smsAutomaticallySent: false, From 8377d3c97abf03fc86c791bcfc113ba97c3e0369 Mon Sep 17 00:00:00 2001 From: Dominik Sokal Date: Mon, 12 Apr 2021 18:02:45 +0200 Subject: [PATCH 3/4] add typecheck script --- .github/workflows/test.yml | 2 +- package.json | 2 ++ packages/eas-cli/package.json | 3 ++- packages/eas-json/package.json | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a78c32a7b..a4202deac1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: with: node-version: ${{ matrix.node }} - run: yarn install --frozen-lockfile --check-files - - run: yarn lerna run build + - run: yarn typecheck - run: yarn test if: ${{ !matrix.coverage }} - run: yarn test --coverage diff --git a/package.json b/package.json index 34e5a96e4e..e250df9b48 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,9 @@ "scripts": { "build": "lerna run build", "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64", + "typecheck": "lerna run typecheck", "start": "lerna run watch --parallel", + "watch": "yarn start", "eas": "packages/eas-cli/bin/run", "lint": "eslint . --ext .ts", "release": "lerna version", diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json index 682e660045..ca80b99e23 100644 --- a/packages/eas-cli/package.json +++ b/packages/eas-cli/package.json @@ -164,7 +164,8 @@ "postpack": "rm -f oclif.manifest.json", "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme", "build": "tsc -p tsconfig.build.json", - "watch": "tsc --watch", + "watch": "yarn build --watch", + "typecheck": "tsc", "test": "jest", "version": "yarn oclif-dev readme && git add README.md", "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml" diff --git a/packages/eas-json/package.json b/packages/eas-json/package.json index 910646824c..8582b959bd 100644 --- a/packages/eas-json/package.json +++ b/packages/eas-json/package.json @@ -32,7 +32,8 @@ "repository": "expo/eas-cli", "scripts": { "build": "tsc -p tsconfig.build.json", - "watch": "tsc --watch", + "watch": "yarn build --watch", + "typecheck": "tsc", "prepack": "rm -rf build && yarn build", "test": "jest" }, From 59ee1ff2a971d3e874556981852df76eb1fdee11 Mon Sep 17 00:00:00 2001 From: Dominik Sokal Date: Tue, 13 Apr 2021 11:04:08 +0200 Subject: [PATCH 4/4] address PR feedback --- packages/eas-cli/package.json | 2 +- packages/eas-json/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json index ca80b99e23..4d9e21918b 100644 --- a/packages/eas-cli/package.json +++ b/packages/eas-cli/package.json @@ -163,7 +163,7 @@ "scripts": { "postpack": "rm -f oclif.manifest.json", "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme", - "build": "tsc -p tsconfig.build.json", + "build": "tsc --project tsconfig.build.json", "watch": "yarn build --watch", "typecheck": "tsc", "test": "jest", diff --git a/packages/eas-json/package.json b/packages/eas-json/package.json index 8582b959bd..e7acab7b4c 100644 --- a/packages/eas-json/package.json +++ b/packages/eas-json/package.json @@ -31,7 +31,7 @@ "main": "build/index.js", "repository": "expo/eas-cli", "scripts": { - "build": "tsc -p tsconfig.build.json", + "build": "tsc --project tsconfig.build.json", "watch": "yarn build --watch", "typecheck": "tsc", "prepack": "rm -rf build && yarn build",