Merge branch 'main' into eslint/server

microsoft · Oct 6, 2020 · 8ba3d12 · 8ba3d12
2 parents 8fbdf92 + 16f58fc
commit 8ba3d12
Show file tree

Hide file tree

Showing 399 changed files with 2,926 additions and 1,878 deletions.
diff --git a/examples/apps/collaborative-textarea/.eslintrc.js b/examples/apps/collaborative-textarea/.eslintrc.js
@@ -5,7 +5,7 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
     "rules": {}
-}
+}
diff --git a/examples/apps/collaborative-textarea/package.json b/examples/apps/collaborative-textarea/package.json
@@ -16,7 +16,7 @@
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "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",
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
     "@fluidframework/get-session-storage-container": "^0.28.0",
     "@fluidframework/test-tools": "^0.2.3074",
     "@fluidframework/webpack-fluid-loader": "^0.28.0",
@@ -55,18 +55,17 @@
     "@types/puppeteer": "1.3.0",
     "@types/react": "^16.9.15",
     "@types/react-dom": "^16.9.4",
-    "@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",
     "cross-env": "^7.0.2",
-    "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",
     "jest": "^26.4.2",
     "jest-junit": "^10.0.0",
     "jest-puppeteer": "^4.3.0",

diff --git a/examples/apps/likes-and-comments/.eslintrc.js b/examples/apps/likes-and-comments/.eslintrc.js
@@ -5,7 +5,7 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
     "rules": {
         "@typescript-eslint/indent": "off",

diff --git a/examples/apps/likes-and-comments/package.json b/examples/apps/likes-and-comments/package.json
@@ -17,7 +17,7 @@
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
     "dev": "npm run webpack:dev",
-    "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",
@@ -56,19 +56,18 @@
     "@types/puppeteer": "1.3.0",
     "@types/react": "^16.9.15",
     "@types/react-dom": "^16.9.4",
-    "@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",
     "css-loader": "^1.0.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",
     "html-webpack-plugin": "^4.3.0",
     "jest": "^26.4.2",
     "jest-junit": "^10.0.0",

diff --git a/examples/apps/likes-and-comments/src/utils.ts b/examples/apps/likes-and-comments/src/utils.ts
@@ -8,5 +8,6 @@ import { SyncedDataObject } from "@fluidframework/react";
 export function getAuthorName(syncedDataObject: SyncedDataObject) {
     const quorum = syncedDataObject.dataProps.runtime.getQuorum();
     const clientId = syncedDataObject.dataProps.runtime.clientId ?? "";
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return (quorum.getMember(clientId)?.client.user as any).name ?? "";
 }
diff --git a/examples/apps/spaces/.eslintrc → examples/apps/spaces/.eslintrc.js b/examples/apps/spaces/.eslintrc → examples/apps/spaces/.eslintrc.js
@@ -1,6 +1,11 @@
-{
+/*!
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
     "rules": {
         "@typescript-eslint/strict-boolean-expressions": "off", // Doing undefined checks is nice

diff --git a/examples/apps/spaces/package.json b/examples/apps/spaces/package.json
@@ -17,7 +17,7 @@
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
     "dev": "npm run webpack:dev",
-    "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,26 +58,25 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
     "@fluidframework/get-session-storage-container": "^0.28.0",
     "@fluidframework/test-tools": "^0.2.3074",
     "@types/node": "^10.17.24",
     "@types/react": "^16.9.15",
     "@types/react-dom": "^16.9.4",
-    "@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",
     "cross-env": "^7.0.2",
     "css-loader": "^1.0.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",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^4.3.0",
     "jest": "^26.4.2",

diff --git a/examples/apps/spaces/src/fluid-object/spacesItemMap.ts b/examples/apps/spaces/src/fluid-object/spacesItemMap.ts
@@ -22,7 +22,7 @@ interface ISingleHandleItem {
     handle: IFluidHandle;
 }
 
-// eslint-disable-next-line @typescript-eslint/promise-function-async, prefer-arrow/prefer-arrow-functions
+// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
 function createSingleHandleItem(subFactory: IFluidDataStoreFactory) {
     return async (dataObjectFactory: IFluidDataObjectFactory): Promise<ISingleHandleItem> => {
         const object = await dataObjectFactory.createAnonymousChildInstance<IFluidLoadable>(subFactory);

diff --git a/examples/data-objects/badge/.eslintrc.js b/examples/data-objects/badge/.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", // requires strictNullChecks=true in tsconfig
     }
 }
diff --git a/examples/data-objects/badge/package.json b/examples/data-objects/badge/package.json
@@ -16,7 +16,7 @@
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
     "dev": "npm run webpack:dev",
-    "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",
@@ -47,22 +47,21 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
     "@fluidframework/webpack-fluid-loader": "^0.28.0",
     "@types/node": "^10.17.24",
     "@types/react": "^16.9.15",
     "@types/react-dom": "^16.9.4",
-    "@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",
     "rimraf": "^2.6.2",
     "ts-loader": "^6.1.2",
     "typescript": "~3.7.4",

diff --git a/examples/data-objects/badge/src/BadgeClient.tsx b/examples/data-objects/badge/src/BadgeClient.tsx
@@ -46,6 +46,7 @@ export const BadgeClient: React.FC<IBadgeClientProps> = ({ model }: IBadgeClient
     // Getters
     const getOptions = () => {
         // Spread iterable out into an array
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return [...model.optionsMap.values()];
     };
 

diff --git a/examples/data-objects/badge/src/BadgeView.tsx b/examples/data-objects/badge/src/BadgeView.tsx
@@ -88,7 +88,6 @@ export const BadgeView: React.FC<IBadgeViewProps> = (props: IBadgeViewProps) =>
 
     // Create the content for the history card
     const historyCardContent = (): JSX.Element => {
-        // eslint-disable-next-line react/prop-types
         const history = historyItems.map((x, i) => {
             return (
                 <ActivityItem

diff --git a/examples/data-objects/canvas/.eslintrc.js b/examples/data-objects/canvas/.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
+    }
+}
diff --git a/examples/data-objects/canvas/package.json b/examples/data-objects/canvas/package.json
@@ -16,7 +16,7 @@
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "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",
@@ -44,27 +44,26 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
     "@fluidframework/test-tools": "^0.2.3074",
     "@fluidframework/webpack-fluid-loader": "^0.28.0",
     "@types/expect-puppeteer": "2.2.1",
     "@types/jest": "22.2.3",
     "@types/jest-environment-puppeteer": "2.2.0",
     "@types/node": "^10.17.24",
     "@types/puppeteer": "1.3.0",
-    "@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",
     "cross-env": "^7.0.2",
     "css-loader": "^1.0.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",
     "jest": "^26.4.2",
     "jest-junit": "^10.0.0",
     "jest-puppeteer": "^4.3.0",

diff --git a/examples/data-objects/clicker-react/clicker-context/.eslintrc.js b/examples/data-objects/clicker-react/clicker-context/.eslintrc.js
@@ -5,7 +5,7 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
     "rules": {}
-}
+}
diff --git a/examples/data-objects/clicker-react/clicker-context/package.json b/examples/data-objects/clicker-react/clicker-context/package.json
@@ -17,7 +17,7 @@
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
     "deploy": "npm publish --registry https://packages.wu2.prague.office-int.com",
-    "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",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.19.2",
-    "@fluidframework/eslint-config-fluid": "^0.19.1",
+    "@fluidframework/eslint-config-fluid": "^0.20.0-0",
     "@fluidframework/webpack-fluid-loader": "^0.28.0",
     "@types/expect-puppeteer": "2.2.1",
     "@types/jest": "22.2.3",
@@ -52,18 +52,17 @@
     "@types/puppeteer": "1.3.0",
     "@types/react": "^16.9.15",
     "@types/react-dom": "^16.9.4",
-    "@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",
     "cross-env": "^7.0.2",
-    "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",
     "jest": "^26.4.2",
     "jest-junit": "^10.0.0",
     "jest-puppeteer": "^4.3.0",

diff --git a/examples/data-objects/clicker-react/clicker-function/.eslintrc.js b/examples/data-objects/clicker-react/clicker-function/.eslintrc.js
@@ -5,7 +5,7 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid"
+        "@fluidframework/eslint-config-fluid/eslint7"
     ],
     "rules": {}
-}
+}