diff --git a/hooks/pre-commit b/hooks/pre-commit index 5586e6a98ef..a56d4301caa 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -25,21 +25,6 @@ if [ $(pwd -P) = $CANVAS ]; then echo "You should run yarn locally or check to make sure docker is running." fi - # per-package pre-commit hooks - git diff --cached --name-only | grep -E -o '^(packages/[^/]+)' | sort | uniq | while read -r PACKAGE; do - # check if CHANGED_PACKAGES/pre-commit-hook.sh exists and run it - if [ -f "$PACKAGE/pre-commit-hook.sh" ]; then - echo "Running pre-commit hook for $PACKAGE" - - (cd "$PACKAGE" && "./pre-commit-hook.sh") - - if [ $? -ne 0 ]; then - echo "Pre-commit hook for $PACKAGE failed, aborting commit" - exit 1 - fi - fi - done || exit 1 - if git diff --cached --name-only | grep -q Gemfile.lock; then echo "Checking lockfiles..." script/sync_lockfiles.rb diff --git a/packages/canvas-rce/.eslintrc b/packages/canvas-rce/.eslintrc index ba60d453b14..197fd1cbad1 100644 --- a/packages/canvas-rce/.eslintrc +++ b/packages/canvas-rce/.eslintrc @@ -38,7 +38,7 @@ // Prefer @typescript-eslint/no-empty-function over no-empty-function "no-empty-function": "off", - "@typescript-eslint/no-empty-function": "error" + "@typescript-eslint/no-empty-function": "warn" } } ] diff --git a/packages/canvas-rce/pre-commit-hook.sh b/packages/canvas-rce/pre-commit-hook.sh deleted file mode 100755 index 17f5b8d759c..00000000000 --- a/packages/canvas-rce/pre-commit-hook.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# -# This file is executed automatically by /hooks/pre-commit if package files are changed -# - -cd "$(dirname "$0")" || exit 1 -PACKAGE_DIR=$(git rev-parse --show-prefix) - -# Check typescript -if git diff --cached --name-only . | grep -qE '\.(ts|tsx)$'; then - if [ -f node_modules/.bin/tsc ]; then - echo "Checking $PACKAGE_DIR TypeScript..." - node_modules/.bin/tsc - else - echo 'Trying to run tsc inside Docker. If you want things quicker yarn install locally.' - docker-compose run --rm web node_modules/.bin/tsc - fi - - if [ $? -ne 0 ]; then - echo "TypeScript checking failed in $PACKAGE_DIR, aborting commit" - exit 1 - fi -fi - -# Note that eslint is handled by the root hook, so we don't need to do that here diff --git a/packages/canvas-rce/src/rce/__tests__/userOS.test.ts b/packages/canvas-rce/src/rce/__tests__/userOS.test.ts index 6e70d268b68..b5144bd07ec 100644 --- a/packages/canvas-rce/src/rce/__tests__/userOS.test.ts +++ b/packages/canvas-rce/src/rce/__tests__/userOS.test.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2022 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure-ui-icons/plugin.ts b/packages/canvas-rce/src/rce/plugins/instructure-ui-icons/plugin.ts index 63c3b95e7e4..a053e85e954 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure-ui-icons/plugin.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure-ui-icons/plugin.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2019 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_condensed_buttons/ui/list-button.ts b/packages/canvas-rce/src/rce/plugins/instructure_condensed_buttons/ui/list-button.ts index 75c7241cacb..058e43d9210 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_condensed_buttons/ui/list-button.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_condensed_buttons/ui/list-button.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2019 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_equation/plugin.ts b/packages/canvas-rce/src/rce/plugins/instructure_equation/plugin.ts index 7effc35f9e3..64a1e6661e7 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_equation/plugin.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_equation/plugin.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2018 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_external_tools/plugin.ts b/packages/canvas-rce/src/rce/plugins/instructure_external_tools/plugin.ts index 0cfcc76a19f..2bef99652dd 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_external_tools/plugin.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_external_tools/plugin.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2018 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_fullscreen/plugin.ts b/packages/canvas-rce/src/rce/plugins/instructure_fullscreen/plugin.ts index ec7214cfeba..ad52b1e67e5 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_fullscreen/plugin.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_fullscreen/plugin.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2022 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/plugin.ts b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/plugin.ts index c12147bbf6a..73dcc6f6692 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/plugin.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/plugin.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2021 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/IconMakerClose.ts b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/IconMakerClose.ts index 68e9a9b1f0c..b6d37f898d2 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/IconMakerClose.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/IconMakerClose.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2022 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/__tests__/IconMakerFormHasChanges.test.ts b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/__tests__/IconMakerFormHasChanges.test.ts index 2f0cfe73bf4..6bfe4556248 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/__tests__/IconMakerFormHasChanges.test.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/__tests__/IconMakerFormHasChanges.test.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2022 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/__tests__/addIconMakerAttributes.test.ts b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/__tests__/addIconMakerAttributes.test.ts index e3f98bba42e..127bd559f33 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/__tests__/addIconMakerAttributes.test.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/__tests__/addIconMakerAttributes.test.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2022 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/addIconMakerAttributes.ts b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/addIconMakerAttributes.ts index 447d63b276d..57f47470de0 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/addIconMakerAttributes.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_icon_maker/utils/addIconMakerAttributes.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2022 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_image/plugin.ts b/packages/canvas-rce/src/rce/plugins/instructure_image/plugin.ts index 2d2706024ff..9a19fda088a 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_image/plugin.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_image/plugin.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2018 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_links/plugin.ts b/packages/canvas-rce/src/rce/plugins/instructure_links/plugin.ts index c73b5cddccf..ef82a00f286 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_links/plugin.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_links/plugin.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2019 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_paste/plugin.ts b/packages/canvas-rce/src/rce/plugins/instructure_paste/plugin.ts index 6e86611b1ba..0ae48eef41e 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_paste/plugin.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_paste/plugin.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2022 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/ExternalToolsEnv.ts b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/ExternalToolsEnv.ts index 5f48aef0d63..bc53c487e02 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/ExternalToolsEnv.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/ExternalToolsEnv.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2023 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/RceToolWrapper.ts b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/RceToolWrapper.ts index 78901dd49e7..68915127dbd 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/RceToolWrapper.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/RceToolWrapper.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2023 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/__tests__/RceToolWrapper.test.ts b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/__tests__/RceToolWrapper.test.ts index 11c9f59c87c..6ec1a119550 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/__tests__/RceToolWrapper.test.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/__tests__/RceToolWrapper.test.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2021 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/ExternalToolDialog/ExternalToolDialogModal.tsx b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/ExternalToolDialog/ExternalToolDialogModal.tsx index a4ed6b312d8..a41bc6e74e9 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/ExternalToolDialog/ExternalToolDialogModal.tsx +++ b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/ExternalToolDialog/ExternalToolDialogModal.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2019 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/ExternalToolSelectionDialog/ExternalToolSelectionDialog.tsx b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/ExternalToolSelectionDialog/ExternalToolSelectionDialog.tsx index f3ef2426641..06a1cf51264 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/ExternalToolSelectionDialog/ExternalToolSelectionDialog.tsx +++ b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/ExternalToolSelectionDialog/ExternalToolSelectionDialog.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2019 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/__tests__/ExternalToolDialog.test.tsx b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/__tests__/ExternalToolDialog.test.tsx index cfb940f5b22..2c303cad3dc 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/__tests__/ExternalToolDialog.test.tsx +++ b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/components/__tests__/ExternalToolDialog.test.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2019 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/jquery/jquery.dropdownList.ts b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/jquery/jquery.dropdownList.ts index a9635197be8..a844441b30c 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/jquery/jquery.dropdownList.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/jquery/jquery.dropdownList.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2011 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/lti13-content-items/RceLti13ContentItem.ts b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/lti13-content-items/RceLti13ContentItem.ts index d7bc2a7c1ea..1ccee6347a5 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/lti13-content-items/RceLti13ContentItem.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/lti13-content-items/RceLti13ContentItem.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2018 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/lti13-content-items/processEditorContentItems.ts b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/lti13-content-items/processEditorContentItems.ts index b27dc1c893c..0a395dad4ca 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/lti13-content-items/processEditorContentItems.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_rce_external_tools/lti13-content-items/processEditorContentItems.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2018 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_record/plugin.ts b/packages/canvas-rce/src/rce/plugins/instructure_record/plugin.ts index f13b5e188ab..5f8194d0afe 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_record/plugin.ts +++ b/packages/canvas-rce/src/rce/plugins/instructure_record/plugin.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2018 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/instructure_wordcount/components/WordCountModal.tsx b/packages/canvas-rce/src/rce/plugins/instructure_wordcount/components/WordCountModal.tsx index 90b4b1aa877..1bcb4e87347 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_wordcount/components/WordCountModal.tsx +++ b/packages/canvas-rce/src/rce/plugins/instructure_wordcount/components/WordCountModal.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2022 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/rce/plugins/shared/Upload/UploadFile.tsx b/packages/canvas-rce/src/rce/plugins/shared/Upload/UploadFile.tsx index aa9f98a9024..9cd3f58dfd0 100644 --- a/packages/canvas-rce/src/rce/plugins/shared/Upload/UploadFile.tsx +++ b/packages/canvas-rce/src/rce/plugins/shared/Upload/UploadFile.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2019 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/util/__tests__/deepMockProxy.test.ts b/packages/canvas-rce/src/util/__tests__/deepMockProxy.test.ts index 05bcb668a1d..258df3b0d36 100644 --- a/packages/canvas-rce/src/util/__tests__/deepMockProxy.test.ts +++ b/packages/canvas-rce/src/util/__tests__/deepMockProxy.test.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2023 - present Instructure, Inc. * diff --git a/packages/canvas-rce/src/util/__tests__/deepMockProxy.ts b/packages/canvas-rce/src/util/__tests__/deepMockProxy.ts index 5bce06f12a7..2191d3d3fcd 100644 --- a/packages/canvas-rce/src/util/__tests__/deepMockProxy.ts +++ b/packages/canvas-rce/src/util/__tests__/deepMockProxy.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2023 - present Instructure, Inc. * @@ -165,5 +166,4 @@ export type DeepMocked = { : T[P] extends object | null | undefined ? DeepMocked : T[P] -} & - T & {mockClear(): void} +} & T & {mockClear(): void} diff --git a/packages/canvas-rce/src/util/instui-icon-helper.ts b/packages/canvas-rce/src/util/instui-icon-helper.ts index a0c4a230b99..63453693071 100644 --- a/packages/canvas-rce/src/util/instui-icon-helper.ts +++ b/packages/canvas-rce/src/util/instui-icon-helper.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (C) 2023 - present Instructure, Inc. * diff --git a/packages/canvas-rce/tsconfig.json b/packages/canvas-rce/tsconfig.json index 256e0a706fb..3e669369f0c 100644 --- a/packages/canvas-rce/tsconfig.json +++ b/packages/canvas-rce/tsconfig.json @@ -13,7 +13,7 @@ "skipLibCheck": true, // don't do type-checking on dependencies' internal types for improved performance "strict": true, // enables a bunch of strict mode family options. See https://www.typescriptlang.org/tsconfig#strict "target": "ES2020", // support the most modern JS features (let babel handle transpilation) - "noImplicitAny": false, // temporarily allows un-typed variables (and imports) to be automatically defined as "any" + "noImplicitAny": true, "experimentalDecorators": true, "outDir": "es" },