From 67de1c8fb507108ac2f628ac5304b8caea4bde17 Mon Sep 17 00:00:00 2001 From: Aaron Shafovaloff Date: Tue, 18 Apr 2023 11:08:05 -0600 Subject: [PATCH] trigger tsc check on .js and package changes Change-Id: I016613970dfa6644fabb6d38249ed25070c764bd Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/316273 Tested-by: Service Cloud Jenkins Reviewed-by: Ed Schiebel QA-Review: Aaron Shafovaloff Product-Review: Aaron Shafovaloff --- hooks/pre-commit | 2 +- ui/features/gradebook/react/default_gradebook/Gradebook.tsx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hooks/pre-commit b/hooks/pre-commit index 62560570ddf..e610a1d671a 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -12,7 +12,7 @@ CANVAS=$(dirname $SCRIPTPATH) if [ $(pwd -P) = $CANVAS ]; then # if .ts or .tsx files have changed (excluding those in packages/), run tsc - if git diff --cached --name-only | grep -vE '^packages/' | grep -qE '\.(ts|tsx)$'; then + if git diff --cached --name-only | grep -qE '\.(ts|tsx|js)$'; then if [ -f node_modules/.bin/tsc ]; then echo 'Checking TypeScript...' NODE_OPTIONS=--max-old-space-size=4096 node_modules/.bin/tsc -p tsconfig.json diff --git a/ui/features/gradebook/react/default_gradebook/Gradebook.tsx b/ui/features/gradebook/react/default_gradebook/Gradebook.tsx index 09a3f0fe228..713416faa06 100644 --- a/ui/features/gradebook/react/default_gradebook/Gradebook.tsx +++ b/ui/features/gradebook/react/default_gradebook/Gradebook.tsx @@ -107,7 +107,6 @@ import type {ProxyDetails} from '@canvas/proxy-submission/react/ProxyUploadModal import type TotalGradeColumnHeader from './GradebookGrid/headers/TotalGradeColumnHeader' import type {SendMessageArgs} from '@canvas/message-students-dialog/react/MessageStudentsWhoDialog' -// @ts-expect-error import KeyboardNavDialog from '@canvas/keyboard-nav-dialog' // @ts-expect-error import KeyboardNavTemplate from '@canvas/keyboard-nav-dialog/jst/KeyboardNavDialog.handlebars' @@ -325,7 +324,7 @@ type GradebookState = { } class Gradebook extends React.Component { - kbDialog: KeyboardNavDialog + kbDialog: any anonymousSpeedGraderAlert?: any