revert to yarn v1

ap2020 · Mar 26, 2023 · 579423d · 579423d
1 parent a816b51
commit 579423d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/deploy-aws.yml b/.github/workflows/deploy-aws.yml
@@ -48,7 +48,7 @@ jobs:
         node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
     - name: Install dependencies
-      run: yarn set version berry && yarn install --immutable
+      run: yarn install --frozen-lockfile
 
     - name: Setup test
       run: bash ci/test-setup.sh

diff --git a/.github/workflows/test-aws.yml b/.github/workflows/test-aws.yml
@@ -30,7 +30,7 @@ jobs:
         node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
     - name: Install dependencies
-      run: yarn set version berry && yarn install --immutable
+      run: yarn install --frozen-lockfile
 
     - name: Setup test
       run: bash ci/test-setup.sh

diff --git a/aws/package.json b/aws/package.json
@@ -19,6 +19,8 @@
     "@aws-sdk/client-ssm": "^3.299.0",
     "@aws-sdk/client-sts": "^3.299.0",
     "@aws-sdk/lib-dynamodb": "^3.299.0",
+    "@aws-sdk/smithy-client": "^3.296.0",
+    "@aws-sdk/types": "^3.296.0",
     "@slack/web-api": "6",
     "@tsconfig/node18": "^1.0.1",
     "@types/common-tags": "^1.8.1",

diff --git a/aws/src/lib/google/index.ts b/aws/src/lib/google/index.ts
@@ -1,7 +1,7 @@
 import { google } from 'googleapis';
 import { envvar } from '../envvar';
 
-export const googleAuth = async (): Promise<InstanceType<typeof google.auth.GoogleAuth>> => {
+export const googleAuth = async () => {
   const auth = new google.auth.GoogleAuth({
     credentials: {
       /* eslint-disable @typescript-eslint/naming-convention */

diff --git a/aws/src/lib/slack/web/message.ts b/aws/src/lib/slack/web/message.ts
@@ -59,6 +59,7 @@ const fetchMainMessages = async (args: ListMessagesArgs): Promise<Conversation.H
 const _listRedundantMessages: {
   [key in ThreadPolicy]: (...a: ListMessagesSubArgs) => Promise<Conversation.Message[]>
 } = {
+  // eslint-disable-next-line @typescript-eslint/naming-convention
   'all-or-nothing': async (args, datetimes) => {
     const messages = await fetchMainMessages(args);
     const threadMessages: Conversation.ThreadMessage[][] =
@@ -85,6 +86,7 @@ const _listRedundantMessages: {
       ...threadMessages.flat(),
     ];
   },
+  // eslint-disable-next-line @typescript-eslint/naming-convention
   'just-in-range': async (args, moments) => {
     const messages = await fetchMainMessages(args);
     // get all hidden thread messages

diff --git a/aws/src/lib/stages.ts b/aws/src/lib/stages.ts
@@ -19,4 +19,4 @@ const env = envalid.cleanEnv(
   },
 );
 
-export const stage = env.STAGE as Stage;
+export const stage: Stage = env.STAGE;
diff --git a/aws/src/watch-drive/drive-activity-api.ts b/aws/src/watch-drive/drive-activity-api.ts
@@ -76,7 +76,7 @@ export const getDriveItem = async (drive: drive_v3.Drive, target: driveactivity_
     const driveItem = await fetchDriveItem(drive, getDriveItemId(target));
     const sentChannel = await getSentChannel(drive, driveItem.content.id!);
     return new FoundItem(driveItem, sentChannel);
-  } catch (error) {
+  } catch (error: any) {
     const errors: { reason: string }[] = error?.response?.data?.error?.errors;
     if (!errors) {
       throw error;

diff --git a/aws/tsconfig.json b/aws/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@tsconfig/node14/tsconfig.json",
+  "extends": "@tsconfig/node18/tsconfig.json",
   "compilerOptions": {
     "removeComments": true,
     "moduleResolution": "node",
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ const env = envalid.cleanEnv( @@
       },
     );
-    export const stage = env.STAGE as Stage;
+    export const stage: Stage = env.STAGE;