From c43b1b619113da2a6e46c3a7ef34ce3c43324073 Mon Sep 17 00:00:00 2001 From: Brad Decker Date: Wed, 1 Feb 2023 10:51:12 -0600 Subject: [PATCH] TypeScript tooling fixes (#17513) * TypeScript tooling fixes * refine the dashboard ignore patterns --- jest.config.js | 6 +++--- tsconfig.json | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jest.config.js b/jest.config.js index 6fe44e336..df63a63ec 100644 --- a/jest.config.js +++ b/jest.config.js @@ -8,8 +8,8 @@ module.exports = { '/app/scripts/lib/createRPCMethodTrackingMiddleware.js', '/app/scripts/migrations/*.js', '/app/scripts/platforms/*.js', - '/shared/**/*.js', - '/ui/**/*.js', + '/shared/**/*.(js|ts|tsx)', + '/ui/**/*.(js|ts|tsx)', ], coverageDirectory: './coverage', coveragePathIgnorePatterns: ['.stories.js', '.snap'], @@ -43,7 +43,7 @@ module.exports = { '/app/scripts/migrations/*.test.js', '/app/scripts/platforms/*.test.js', '/shared/**/*.test.(js|ts)', - '/ui/**/*.test.(js|ts)', + '/ui/**/*.test.(js|ts|tsx)', ], testTimeout: 2500, // We have to specify the environment we are running in, which is jsdom. The diff --git a/tsconfig.json b/tsconfig.json index 49cc11a4e..287dd1bbb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,10 +18,15 @@ "**/*.test.js", "**/*.test.ts", "**/*.test.tsx", + "**/jest-coverage/**/*", + "**/__mocks__/**/*", + "**/storybook-build/**/*", ".storybook/**/*", "builds/**/*", "dist/**/*", - "node_modules/**" + "node_modules/**", + "development/ts-migration-dashboard/build/**/*", + "development/ts-migration-dashboard/intermediate/**/*" ], "extends": "@tsconfig/node16/tsconfig.json", "paths": {