diff --git a/.config/husky/pre-push b/.config/husky/pre-push index 8214687..ea23a45 100755 --- a/.config/husky/pre-push +++ b/.config/husky/pre-push @@ -4,14 +4,18 @@ set -e . "$(dirname -- "$0")/_/husky.sh" echo "************************************************************************" -echo "** Running sim-core's 'yarn check' **" -echo "** If this fails, run 'yarn fmt' and commit your fixes. **" +echo "** Running sim-core's 'yarn lint' **" +echo "** **" +echo "** If this fails, run 'yarn lint' for details. **" +echo "** You'll need to either fix formatting ('yarn fmt'), **" +echo "** or fix the typescript build ('yarn lint') **" +echo "** **" echo "** (Output is stored in .config/husky/husky.log) **" echo "** This takes about 10 seconds... **" echo "************************************************************************" cd apps/sim-core || exit 1 -yarn check > ../../.config/husky/husky.log 2>&1; +yarn lint > ../../.config/husky/husky.log 2>&1; echo "** Formatting check success. **" echo "************************************************************************" diff --git a/apps/sim-core/packages/core/src/components/Modal/Share/ModalShareByLink.tsx b/apps/sim-core/packages/core/src/components/Modal/Share/ModalShareByLink.tsx index 7a87cbe..3aede27 100644 --- a/apps/sim-core/packages/core/src/components/Modal/Share/ModalShareByLink.tsx +++ b/apps/sim-core/packages/core/src/components/Modal/Share/ModalShareByLink.tsx @@ -84,6 +84,7 @@ export const ModalShareByLink: FC<{ onSelectedReleaseChange, hasReleases, }) => { + //@ts-expect-error Genuine type error here, please fix. const { params, setParams, changedParams } = useParams(defaultParams); const { accessCode, requestAccessCode } = useRequestAccessCode( project, @@ -161,6 +162,7 @@ export const ModalShareByLink: FC<{ ) : null} diff --git a/apps/sim-core/packages/core/src/components/Modal/Share/ModalShareEmbed.tsx b/apps/sim-core/packages/core/src/components/Modal/Share/ModalShareEmbed.tsx index 57c1b4d..2f22fe2 100644 --- a/apps/sim-core/packages/core/src/components/Modal/Share/ModalShareEmbed.tsx +++ b/apps/sim-core/packages/core/src/components/Modal/Share/ModalShareEmbed.tsx @@ -71,6 +71,7 @@ export const ModalShareEmbed: FC<{ "ReadEmbed", ); + //@ts-expect-error Genuine type error here, please fix. const { params, setParams, changedParams } = useParams(defaultParams); const value = iframeSrcCode( project.pathWithNamespace, @@ -131,6 +132,7 @@ export const ModalShareEmbed: FC<{
diff --git a/apps/sim-core/packages/core/src/features/scopes.ts b/apps/sim-core/packages/core/src/features/scopes.ts index 8d264a3..33745c7 100644 --- a/apps/sim-core/packages/core/src/features/scopes.ts +++ b/apps/sim-core/packages/core/src/features/scopes.ts @@ -336,6 +336,7 @@ export const selectScope: Record = scopeEntries.reduce( ): T & { [key in S]: ScopeSelector } => ({ ...existingSelectors, + //@ts-expect-error Genuine type error here, please fix. [scope]: createSelectorForSelectorChain(selectorChain, existingSelectors), }) as any, {} as any, diff --git a/apps/sim-core/packages/core/src/util/resizeObserverPromise.ts b/apps/sim-core/packages/core/src/util/resizeObserverPromise.ts index 272bc75..05172ee 100644 --- a/apps/sim-core/packages/core/src/util/resizeObserverPromise.ts +++ b/apps/sim-core/packages/core/src/util/resizeObserverPromise.ts @@ -1,10 +1,12 @@ export let resizeObserverPromise = Promise.resolve(window.ResizeObserver); if (!window.ResizeObserver) { + //@ts-expect-error Todo: Clean out this polyfill. resizeObserverPromise = import( /* webpackChunkName: "ResizeObserver-polyfill" */ "@juggle/resize-observer/lib/exports/resize-observer" ) .then((module) => { + //@ts-expect-error Todo: Clean out this polyfill. window.ResizeObserver = module.ResizeObserver; return module.ResizeObserver; diff --git a/apps/sim-core/packages/engine-web/src/engine-web/simulation/dataset.ts b/apps/sim-core/packages/engine-web/src/engine-web/simulation/dataset.ts index 504c527..7bb6339 100644 --- a/apps/sim-core/packages/engine-web/src/engine-web/simulation/dataset.ts +++ b/apps/sim-core/packages/engine-web/src/engine-web/simulation/dataset.ts @@ -28,7 +28,7 @@ export async function fetchDatasetContent( const kvps: DataKeyValuePair[] = await Promise.all( datasets.map((dataset) => { return Promise.resolve() - .then(() => { + .then(async () => { if (cache.has(dataset.s3Key)) { return Promise.resolve(cache.get(dataset.s3Key)?.data); } diff --git a/apps/sim-core/packages/utils/package.json b/apps/sim-core/packages/utils/package.json index d42edb5..429d9af 100644 --- a/apps/sim-core/packages/utils/package.json +++ b/apps/sim-core/packages/utils/package.json @@ -9,7 +9,7 @@ "build": "tsc -b .", "build:watch": "tsc -b . -w", "fmt": "prettier --cache \"*.{ts,js,json}\" \"{scripts,src}/**/*.{ts,js,json}\" --write; eslint --quiet --fix \"*.{ts,js,json}\" \"{scripts,src}/**/*.{ts,js,json}\"", - "lint": "prettier --cache \"*.{ts,js,json}\" \"{scripts,src}/**/*.{ts,js,json}\" --check || exit 1; eslint --quiet \"*.{ts,js,json}\" \"{scripts,src}/**/*.{ts,js,json}; tsc --noEmit\"" + "lint": "prettier --cache \"*.{ts,js,json}\" \"{scripts,src}/**/*.{ts,js,json}\" --check || exit 1; eslint --quiet \"*.{ts,js,json}\" \"{scripts,src}/**/*.{ts,js,json}\" ; tsc --noEmit" }, "license": "SSPL-1.0", "devDependencies": {