Merge pull request #378 from coderoad/fix/linting

Fix/linting

Author: ShMcK

.eslintrc.js

@@ -1,9 +1,10 @@
 module.exports = {
   parser: '@typescript-eslint/parser', // Specifies the ESLint parser
+  plugins: ['prettier'],
   extends: [
     'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
     'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
-    'plugin:prettier/recommended', // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array
+    'plugin:prettier/recommended',
   ],
   parserOptions: {
     ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
@@ -16,6 +17,7 @@ module.exports = {
     '@typescript-eslint/ban-ts-ignore': 'off',
     '@typescript-eslint/no-unused-vars': 'off',
     '@typescript-eslint/camelcase': 'off',
+    '@typescript-eslint/ban-ts-comment': 'off',
     // 'react/forbid-component-props': [1, { forbid: ['style'] }],
     // 'react/forbid-dom-props': [1, { forbid: ['style'] }],
   },

package.json

@@ -27,37 +27,37 @@
     "build": "./scripts/build.sh",
     "postinstall": "node ./node_modules/vscode/bin/install",
     "install-all": "yarn && yarn --cwd web-app",
-    "lint": "eslint src/**/*ts",
+    "lint": "eslint web-app/src/**/*.ts src/**/*.ts",
     "package": "./scripts/package.sh",
     "storybook": "yarn --cwd web-app storybook",
     "test": "jest",
     "watch": "tsc -watch -p ./"
   },
   "dependencies": {
-    "@sentry/node": "^5.17.0",
-    "@types/assert": "^1.4.7",
-    "@types/jest": "^26.0.0",
+    "@sentry/node": "^5.18.1",
+    "@types/assert": "^1.5.1",
+    "@types/jest": "^26.0.3",
     "@types/jsdom": "^16.2.3",
-    "@types/node": "^14.0.13",
+    "@types/node": "^14.0.14",
     "@types/node-fetch": "^2.5.7",
-    "@types/semver": "^7.2.0",
-    "@typescript-eslint/eslint-plugin": "^3.3.0",
-    "@typescript-eslint/parser": "^3.3.0",
+    "@types/semver": "^7.3.1",
+    "@typescript-eslint/eslint-plugin": "^3.4.0",
+    "@typescript-eslint/parser": "^3.4.0",
     "chokidar": "^3.4.0",
     "dotenv": "^8.2.0",
-    "eslint": "^7.2.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint": "^7.3.1",
     "git-url-parse": "^11.1.2",
-    "jest": "^26.0.1",
+    "jest": "^26.1.0",
     "jsdom": "^16.2.2",
     "node-fetch": "^2.6.0",
-    "prettier": "^2.0.5",
     "semver": "^7.3.2",
-    "ts-jest": "^26.1.0",
+    "ts-jest": "^26.1.1",
     "typescript": "^3.9.5"
   },
   "devDependencies": {
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "prettier": "2.0.5",
     "vscode": "^1.1.37",
     "vscode-test": "^1.4.0"
   },

src/actions/saveCommit.ts

@@ -1,6 +1,6 @@
 import * as git from '../services/git'
 
-async function saveCommit() {
+async function saveCommit(): Promise<void> {
   git.saveCommit('Save progress')
 }
 

src/channel/context.ts

@@ -24,7 +24,7 @@ class Context {
     const position: CR.Position = this.position.setPositionFromProgress(tutorial, progress)
     return { progress, position }
   }
-  public reset = () => {
+  public reset = (): void => {
     this.tutorial.reset()
     this.progress.reset()
     this.position.reset()

src/channel/index.ts

@@ -42,7 +42,7 @@ class Channel implements Channel {
   }
 
   // receive from webview
-  public receive = async (action: T.Action) => {
+  public receive = async (action: T.Action): Promise<void> => {
     // action may be an object.type or plain string
     const actionType: string = typeof action === 'string' ? action : action.type
     // const onError = (error: T.ErrorMessage) => this.send({ type: 'ERROR', payload: { error } })
@@ -325,7 +325,7 @@ class Channel implements Channel {
     }
   }
   // send to webview
-  public send = async (action: T.Action) => {
+  public send = async (action: T.Action): Promise<void> => {
     // Error middleware
     if (action?.payload?.error?.type) {
       // load error markdown message

src/editor/commands.ts

@@ -19,7 +19,7 @@ interface CreateCommandProps {
   workspaceState: vscode.Memento
 }
 
-export const createCommands = ({ extensionPath, workspaceState }: CreateCommandProps) => {
+export const createCommands = ({ extensionPath, workspaceState }: CreateCommandProps): { [key: string]: any } => {
   // React panel webview
   let webview: any
   let currentPosition: T.Position

web-app/.eslintrc.js

@@ -25,15 +25,15 @@
     "extends": "react-app"
   },
   "dependencies": {
-    "@alifd/next": "^1.20.12",
+    "@alifd/next": "^1.20.14",
     "@alifd/theme-4": "^0.3.1",
     "@emotion/babel-preset-css-prop": "^10.0.27",
     "@emotion/core": "^10.0.28",
-    "@sentry/browser": "^5.17.0",
+    "@sentry/browser": "^5.18.1",
     "js-yaml": "^3.14.0",
     "markdown-it": "^11.0.0",
     "markdown-it-emoji": "^1.4.0",
-    "moment": "^2.26.0",
+    "moment": "^2.27.0",
     "prismjs": "^1.20.0",
     "react": "^16.13.1",
     "react-addons-css-transition-group": "^15.6.2",
@@ -42,34 +42,34 @@
     "xstate": "^4.10.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.10.2",
+    "@babel/core": "^7.10.3",
     "@storybook/addon-actions": "^5.3.19",
     "@storybook/addon-knobs": "^5.3.19",
     "@storybook/addon-links": "^5.3.19",
     "@storybook/addons": "^5.3.19",
-    "@storybook/preset-create-react-app": "^3.1.0",
+    "@storybook/preset-create-react-app": "^3.1.2",
     "@storybook/react": "^5.3.19",
     "@types/graphql": "^14.5.0",
     "@types/highlight.js": "^9.12.4",
-    "@types/jest": "^26.0.0",
-    "@types/js-yaml": "^3.12.4",
+    "@types/jest": "^26.0.3",
+    "@types/js-yaml": "^3.12.5",
     "@types/markdown-it": "^10.0.1",
-    "@types/node": "^14.0.13",
+    "@types/node": "^14.0.14",
     "@types/prismjs": "^1.16.1",
-    "@types/react": "^16.9.36",
+    "@types/react": "^16.9.41",
     "@types/react-addons-css-transition-group": "^15.0.5",
     "@types/react-dom": "^16.9.8",
-    "@typescript-eslint/eslint-plugin": "^3.3.0",
-    "@typescript-eslint/parser": "^3.3.0",
+    "@typescript-eslint/eslint-plugin": "^3.4.0",
+    "@typescript-eslint/parser": "^3.4.0",
     "babel-loader": "8.1.0",
     "babel-plugin-import": "^1.13.0",
     "customize-cra": "^1.0.0",
-    "eslint": "^7.2.0",
+    "eslint": "^7.3.1",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.4",
     "mini-css-extract-plugin": "^0.9.0",
     "node-sass": "^4.14.1",
-    "prettier": "^2.0.5",
+    "prettier": "2.0.5",
     "react-app-rewired": "^2.1.6",
     "react-scripts": "^3.4.1",
     "sass-loader": "^8.0.2",

web-app/package.json

@@ -32,6 +32,7 @@ const Hints = (props: Props) => {
   return (
     <div style={styles.hints}>
       <div style={styles.hintList}>
+        {/* only show revealed hints */}
         {props.hints.map((h, i) => {
           return i <= hintIndex ? (
             <div key={i} style={styles.hint}>