From 506010cb1434c24d764b1db6bf6ea45aad5ab921 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Thu, 26 May 2022 09:01:50 +0100
Subject: [PATCH] Re-enable type checking in CI (#8114)

* Re-enable type checking in CI
* Update use-codemirror-scope.ts
* Run patch-package in postinstall script
* Update Dockerfile
* Update .dockerignore

GitOrigin-RevId: 512c7c71a109d2cf34895193078a98c66eb91f29
---
 package.json                                       | 3 ++-
 services/web/Dockerfile                            | 1 +
 services/web/Makefile                              | 3 +--
 services/web/frontend/stories/decorators/scope.tsx | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index d6a2a1a426..f28793c465 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
     "format": "prettier --list-different $PWD/'**/*.js'",
     "format:fix": "prettier --write $PWD/'**/*.js'",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "lint:fix": "eslint --fix ."
+    "lint:fix": "eslint --fix .",
+    "postinstall": "patch-package"
   },
   "workspaces": [
     "libraries/*",
diff --git a/services/web/Dockerfile b/services/web/Dockerfile
index c86eb3dda4..a050ac79f0 100644
--- a/services/web/Dockerfile
+++ b/services/web/Dockerfile
@@ -17,6 +17,7 @@ FROM base as deps
 COPY package.json package-lock.json /overleaf/
 COPY services/web/package.json /overleaf/services/web/
 COPY libraries/ /overleaf/libraries/
+COPY patches/ /overleaf/patches/
 
 ENV CYPRESS_INSTALL_BINARY=0
 
diff --git a/services/web/Makefile b/services/web/Makefile
index fe15c3b0f4..3d09064195 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -436,9 +436,8 @@ lint: lint_flag_res_send_usage
 lint_flag_res_send_usage:
 	bin/lint_flag_res_send_usage
 
-#lint: typecheck_frontend
+lint: typecheck_frontend
 typecheck_frontend:
-	cd ../.. && npx patch-package
 	npx tsc --noEmit
 
 lint_in_docker:
diff --git a/services/web/frontend/stories/decorators/scope.tsx b/services/web/frontend/stories/decorators/scope.tsx
index 3b885ffaa5..f592bfb90a 100644
--- a/services/web/frontend/stories/decorators/scope.tsx
+++ b/services/web/frontend/stories/decorators/scope.tsx
@@ -152,7 +152,7 @@ const initialize = () => {
       'gv',
       'mf',
     ],
-  }
+  } as typeof window.ExposedSettings
 
   window.project_id = project._id