Update server monorepo to ESLint 7

server/routerlicious/package.json

@@ -27,6 +27,7 @@
     "postinstall": "npm run postinstall:lerna",
     "lint": "lerna run lint --no-sort --stream",
     "lint:fix": "lerna run lint:fix --no-sort --stream",
+    "lint:strict": "lerna run lint --stream -- -- -- --report-unused-disable-directives",
     "policy-check": "fluid-repo-policy-check",
     "policy-check:fix": "fluid-repo-policy-check -r",
     "post-lerna-install:default": "[ -f package-lock.json ] && mv package-lock.json lerna-package-lock.json; [ -f package-lock.json.bak ] && mv package-lock.json.bak package-lock.json; exit 0",

server/routerlicious/packages/gitresources/.eslintrc.js

@@ -5,7 +5,7 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
     "rules": {}
-}
+}

server/routerlicious/packages/gitresources/package.json

@@ -14,28 +14,28 @@
     "build:full": "npm run build",
     "build:full:compile": "npm run build:compile",
     "clean": "rimraf dist *.tsbuildinfo *.build.log",
-    "eslint": "eslint --ext=ts,tsx --format stylish src",
+    "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --ext=ts,tsx --format stylish src --fix",
     "lint": "npm run eslint",
     "lint:fix": "npm run eslint:fix",
     "tsc": "tsc",
     "tsfmt": "tsfmt --verify",
     "tsfmt:fix": "tsfmt --replace"
   },
+  "dependencies": {},
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
-    "@typescript-eslint/eslint-plugin": "~2.17.0",
-    "@typescript-eslint/parser": "~2.17.0",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
+    "@typescript-eslint/eslint-plugin": "~4.2.0",
+    "@typescript-eslint/parser": "~4.2.0",
     "concurrently": "^5.2.0",
-    "eslint": "~6.8.0",
-    "eslint-plugin-eslint-comments": "~3.1.2",
-    "eslint-plugin-import": "2.20.0",
+    "eslint": "~7.9.0",
+    "eslint-plugin-eslint-comments": "~3.2.0",
+    "eslint-plugin-import": "~2.22.0",
     "eslint-plugin-no-null": "~1.0.2",
-    "eslint-plugin-optimize-regex": "~1.1.7",
-    "eslint-plugin-prefer-arrow": "~1.1.7",
-    "eslint-plugin-react": "~7.18.0",
-    "eslint-plugin-unicorn": "~15.0.1",
+    "eslint-plugin-prefer-arrow": "~1.2.2",
+    "eslint-plugin-react": "~7.21.2",
+    "eslint-plugin-unicorn": "~22.0.0",
     "rimraf": "^2.6.2",
     "typescript": "~3.8.2",
     "typescript-formatter": "7.1.0"

server/routerlicious/packages/kafka-orderer/.eslintrc.js

@@ -5,7 +5,9 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
-    "rules": {}
-}
+    "rules": {
+        "@typescript-eslint/strict-boolean-expressions": "off", // requires strictNullChecks=true in tsconfig
+    }
+}

server/routerlicious/packages/kafka-orderer/package.json

@@ -14,7 +14,7 @@
     "build:full": "npm run build",
     "build:full:compile": "npm run build:compile",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
-    "eslint": "eslint --ext=ts,tsx --format stylish src",
+    "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --ext=ts,tsx --format stylish src --fix",
     "lint": "npm run eslint",
     "lint:fix": "npm run eslint:fix",
@@ -29,18 +29,17 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
-    "@typescript-eslint/eslint-plugin": "~2.17.0",
-    "@typescript-eslint/parser": "~2.17.0",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
+    "@typescript-eslint/eslint-plugin": "~4.2.0",
+    "@typescript-eslint/parser": "~4.2.0",
     "concurrently": "^5.2.0",
-    "eslint": "~6.8.0",
-    "eslint-plugin-eslint-comments": "~3.1.2",
-    "eslint-plugin-import": "2.20.0",
+    "eslint": "~7.9.0",
+    "eslint-plugin-eslint-comments": "~3.2.0",
+    "eslint-plugin-import": "~2.22.0",
     "eslint-plugin-no-null": "~1.0.2",
-    "eslint-plugin-optimize-regex": "~1.1.7",
-    "eslint-plugin-prefer-arrow": "~1.1.7",
-    "eslint-plugin-react": "~7.18.0",
-    "eslint-plugin-unicorn": "~15.0.1",
+    "eslint-plugin-prefer-arrow": "~1.2.2",
+    "eslint-plugin-react": "~7.21.2",
+    "eslint-plugin-unicorn": "~22.0.0",
     "rimraf": "^2.6.2",
     "typescript": "~3.8.2",
     "typescript-formatter": "7.1.0"

server/routerlicious/packages/kafka-orderer/src/kafkaOrderer.ts

@@ -137,10 +137,8 @@ export class KafkaOrdererConnection implements core.IOrdererConnection {
         // Add trace
         messages.forEach((message) => {
             const operation = message.operation;
-            // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
             if (operation && operation.traces === undefined) {
                 operation.traces = [];
-                // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
             } else if (operation && operation.traces && operation.traces.length > 1) {
                 operation.traces.push(
                     {

server/routerlicious/packages/kafka-orderer/tsconfig.json

@@ -12,4 +12,4 @@
     "include": [
         "src/**/*"
     ]
-}
+}

server/routerlicious/packages/lambdas-driver/.eslintrc.js

@@ -5,9 +5,9 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
     "rules": {
         "@typescript-eslint/strict-boolean-expressions": "off"
     }
-}
+}

server/routerlicious/packages/lambdas-driver/package.json

@@ -15,7 +15,7 @@
     "build:full": "npm run build",
     "build:full:compile": "npm run build:compile",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
-    "eslint": "eslint --ext=ts,tsx --format stylish src",
+    "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --ext=ts,tsx --format stylish src --fix",
     "lint": "npm run eslint",
     "lint:fix": "npm run eslint:fix",
@@ -58,24 +58,23 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
     "@fluidframework/server-test-utils": "^0.1016.0",
     "@types/async": "^2.0.50",
     "@types/lodash": "^4.14.118",
     "@types/mocha": "^5.2.5",
     "@types/nconf": "^0.0.37",
     "@types/node": "^10.17.24",
-    "@typescript-eslint/eslint-plugin": "~2.17.0",
-    "@typescript-eslint/parser": "~2.17.0",
+    "@typescript-eslint/eslint-plugin": "~4.2.0",
+    "@typescript-eslint/parser": "~4.2.0",
     "concurrently": "^5.2.0",
-    "eslint": "~6.8.0",
-    "eslint-plugin-eslint-comments": "~3.1.2",
-    "eslint-plugin-import": "2.20.0",
+    "eslint": "~7.9.0",
+    "eslint-plugin-eslint-comments": "~3.2.0",
+    "eslint-plugin-import": "~2.22.0",
     "eslint-plugin-no-null": "~1.0.2",
-    "eslint-plugin-optimize-regex": "~1.1.7",
-    "eslint-plugin-prefer-arrow": "~1.1.7",
-    "eslint-plugin-react": "~7.18.0",
-    "eslint-plugin-unicorn": "~15.0.1",
+    "eslint-plugin-prefer-arrow": "~1.2.2",
+    "eslint-plugin-react": "~7.21.2",
+    "eslint-plugin-unicorn": "~22.0.0",
     "mocha": "^8.1.1",
     "nyc": "^15.0.0",
     "rimraf": "^2.6.2",

server/routerlicious/packages/lambdas-driver/src/document-router/index.ts

@@ -10,6 +10,7 @@ import { DocumentLambdaFactory } from "./lambdaFactory";
 export * from "./lambdaFactory";
 
 export async function create(config: Provider): Promise<IPartitionLambdaFactory> {
+    // eslint-disable-next-line @typescript-eslint/ban-types
     const pluginConfig = config.get("documentLambda") as string | object;
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     const plugin = (typeof pluginConfig === "object" ? pluginConfig : require(pluginConfig)) as IPlugin;

server/routerlicious/packages/lambdas-driver/src/kafka-service/partition.ts

@@ -72,7 +72,6 @@ export class Partition extends EventEmitter {
                 this.q.kill();
             });
 
-        // eslint-disable-next-line @typescript-eslint/unbound-method
         this.q.error = (error) => {
             this.emit("error", error, true);
         };

server/routerlicious/packages/lambdas-driver/tsconfig.json

@@ -15,4 +15,4 @@
     "include": [
         "src/**/*"
     ]
-}
+}

server/routerlicious/packages/lambdas/.eslintrc.js

@@ -5,9 +5,10 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
     "rules": {
-        "@typescript-eslint/strict-boolean-expressions": "off"
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "@typescript-eslint/strict-boolean-expressions": "off",
     }
-}
+}

server/routerlicious/packages/lambdas/package.json

@@ -18,7 +18,7 @@
     "build:full": "npm run build",
     "build:full:compile": "npm run build:compile",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
-    "eslint": "eslint --ext=ts,tsx --format stylish src",
+    "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --ext=ts,tsx --format stylish src --fix",
     "lint": "npm run eslint",
     "lint:fix": "npm run eslint:fix",
@@ -67,7 +67,7 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
     "@fluidframework/server-test-utils": "^0.1016.0",
     "@types/async": "^2.0.50",
     "@types/json-stringify-safe": "^5.0.0",
@@ -76,17 +76,16 @@
     "@types/nconf": "^0.0.37",
     "@types/node": "^10.17.24",
     "@types/webpack": "^4.41.2",
-    "@typescript-eslint/eslint-plugin": "~2.17.0",
-    "@typescript-eslint/parser": "~2.17.0",
+    "@typescript-eslint/eslint-plugin": "~4.2.0",
+    "@typescript-eslint/parser": "~4.2.0",
     "concurrently": "^5.2.0",
-    "eslint": "~6.8.0",
-    "eslint-plugin-eslint-comments": "~3.1.2",
-    "eslint-plugin-import": "2.20.0",
+    "eslint": "~7.9.0",
+    "eslint-plugin-eslint-comments": "~3.2.0",
+    "eslint-plugin-import": "~2.22.0",
     "eslint-plugin-no-null": "~1.0.2",
-    "eslint-plugin-optimize-regex": "~1.1.7",
-    "eslint-plugin-prefer-arrow": "~1.1.7",
-    "eslint-plugin-react": "~7.18.0",
-    "eslint-plugin-unicorn": "~15.0.1",
+    "eslint-plugin-prefer-arrow": "~1.2.2",
+    "eslint-plugin-react": "~7.21.2",
+    "eslint-plugin-unicorn": "~22.0.0",
     "mocha": "^8.1.1",
     "nyc": "^15.0.0",
     "rimraf": "^2.6.2",

server/routerlicious/packages/lambdas/src/deli/lambda.ts

@@ -105,7 +105,7 @@ export class DeliLambda implements IPartitionLambda {
     private idleTimer: any;
     private noopTimer: any;
     private noActiveClients = false;
-    // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     private canClose = false;
 
@@ -547,6 +547,7 @@ export class DeliLambda implements IPartitionLambda {
         if (isSystemType(message.operation.type)) {
             const operation = message.operation as IDocumentSystemMessage;
             if (operation.data) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 return JSON.parse(operation.data);
             }
         }

server/routerlicious/packages/lambdas/src/scriptorium/lambda.ts

@@ -91,8 +91,7 @@ export class ScriptoriumLambda implements IPartitionLambda {
     private async insertOp(messages: ISequencedOperationMessage[]) {
         return this.opCollection
             .insertMany(messages, false)
-            // eslint-disable-next-line @typescript-eslint/promise-function-async
-            .catch((error) => {
+            .catch(async (error) => {
                 // Duplicate key errors are ignored since a replay may cause us to insert twice into Mongo.
                 // All other errors result in a rejected promise.
                 if (error.code !== 11000) {

server/routerlicious/packages/lambdas/src/sequencedLambda.ts

@@ -26,7 +26,6 @@ export abstract class SequencedLambda implements IPartitionLambda {
                 });
         }, 1);
 
-        // eslint-disable-next-line @typescript-eslint/unbound-method
         this.q.error = (error) => {
             const documentError = {
                 documentId: this.documentId,

server/routerlicious/packages/lambdas/tsconfig.json

@@ -15,4 +15,4 @@
     "include": [
         "src/**/*"
     ]
-}
+}

server/routerlicious/packages/local-server/.eslintrc.js

@@ -5,7 +5,9 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
-    "rules": {}
-}
+    "rules": {
+        "@typescript-eslint/strict-boolean-expressions": "off", // requires strictNullChecks=true in tsconfig
+    }
+}

server/routerlicious/packages/local-server/package.json

@@ -18,7 +18,7 @@
     "build:full:compile": "npm run build:compile",
     "build:genver": "gen-version",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
-    "eslint": "eslint --ext=ts,tsx --format stylish src",
+    "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --ext=ts,tsx --format stylish src --fix",
     "lint": "npm run eslint",
     "lint:fix": "npm run eslint:fix",
@@ -62,24 +62,23 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
     "@types/jsrsasign": "^8.0.8",
     "@types/mocha": "^5.2.5",
     "@types/nock": "^9.3.0",
     "@types/node": "^10.17.24",
     "@types/webpack": "^4.41.2",
-    "@typescript-eslint/eslint-plugin": "~2.17.0",
-    "@typescript-eslint/parser": "~2.17.0",
+    "@typescript-eslint/eslint-plugin": "~4.2.0",
+    "@typescript-eslint/parser": "~4.2.0",
     "concurrently": "^5.2.0",
     "copyfiles": "^2.1.0",
-    "eslint": "~6.8.0",
-    "eslint-plugin-eslint-comments": "~3.1.2",
-    "eslint-plugin-import": "2.20.0",
+    "eslint": "~7.9.0",
+    "eslint-plugin-eslint-comments": "~3.2.0",
+    "eslint-plugin-import": "~2.22.0",
     "eslint-plugin-no-null": "~1.0.2",
-    "eslint-plugin-optimize-regex": "~1.1.7",
-    "eslint-plugin-prefer-arrow": "~1.1.7",
-    "eslint-plugin-react": "~7.18.0",
-    "eslint-plugin-unicorn": "~15.0.1",
+    "eslint-plugin-prefer-arrow": "~1.2.2",
+    "eslint-plugin-react": "~7.21.2",
+    "eslint-plugin-unicorn": "~22.0.0",
     "mocha": "^8.1.1",
     "mocha-junit-reporter": "^1.18.0",
     "nock": "^10.0.1",

server/routerlicious/packages/local-server/src/test/isomorphic.spec.ts

@@ -11,12 +11,11 @@ describe("Local server", () => {
     it("Isomorphic check - webpack build", async () => {
         return new Promise((resolve, reject) => {
             webpack(config, (err, stats) => {
-                // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
                 if (err) {
                     assert.fail(err);
                     reject();
-                // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
                 } else if (stats.hasErrors()) {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                     assert.fail(stats.compilation.errors.map((value) => value.stack).join("\n"));
                     reject();
                 } else {

server/routerlicious/packages/local-server/tsconfig.json

@@ -15,4 +15,4 @@
     "include": [
         "src/**/*"
     ]
-}
+}