refactor: back to use js-standard

Signed-off-by: BoHong Li <[email protected]>

Author: a60814billy

.eslintignore

@@ -116,11 +116,11 @@ function getNotePoolSize () {
   return Object.keys(notes).length
 }
 
-function deleteNoteFromPool(noteId) {
+function deleteNoteFromPool (noteId) {
   delete notes[noteId]
 }
 
-function deleteAllNoteFromPool() {
+function deleteAllNoteFromPool () {
   Object.keys(notes).forEach(noteId => {
     delete notes[noteId]
   })
@@ -289,8 +289,8 @@ function getStatus (callback) {
         registeredUsers: regcount,
         onlineRegisteredUsers: regaddresses.length,
         distinctOnlineRegisteredUsers: distinctregaddresses.length,
-        isConnectionBusy: isConnectionBusy,
-        connectionSocketQueueLength: connectionSocketQueue.length,
+        isConnectionBusy: connectProcessQueue.lock,
+        connectionSocketQueueLength: connectProcessQueue.queue.length,
         isDisconnectBusy: disconnectProcessQueue.lock,
         disconnectSocketQueueLength: disconnectProcessQueue.queue.length
       }) : null
@@ -306,7 +306,6 @@ function getStatus (callback) {
 function isReady () {
   return realtime.io &&
     Object.keys(notes).length === 0 && Object.keys(users).length === 0 &&
-    !isConnectionBusy &&
     connectProcessQueue.queue.length === 0 && !connectProcessQueue.lock &&
     disconnectProcessQueue.queue.length === 0 && !disconnectProcessQueue.lock
 }
@@ -442,8 +441,6 @@ function checkViewPermission (req, note) {
   }
 }
 
-var isConnectionBusy = false
-
 // TODO: test it
 async function fetchFullNoteAsync (noteId) {
   return models.Note.findOne({
@@ -669,7 +666,7 @@ function updateHistory (userId, note, time) {
   if (note.server) history.updateHistory(userId, noteId, note.server.document, time)
 }
 
-function getUniqueColorPerNote(noteId, maxAttempt = 10) {
+function getUniqueColorPerNote (noteId, maxAttempt = 10) {
   // random color
   let color = randomcolor()
   if (!notes[noteId]) return color
@@ -682,7 +679,7 @@ function getUniqueColorPerNote(noteId, maxAttempt = 10) {
       if (notes[noteId].users[userId].color === color) {
         found = true
       }
-    });
+    })
     if (found) {
       color = randomcolor()
       randomAttemp++

.eslintrc.js

@@ -18,13 +18,12 @@
     "build": "webpack --config webpack.prod.js --progress --colors --bail",
     "dev": "webpack --config webpack.dev.js --progress --colors --watch",
     "doctoc": "doctoc --title='# Table of Contents' README.md",
-    "eslint": "eslint lib public test app.js",
+    "lint": "standard",
     "jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done",
-    "standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1",
     "start": "sequelize db:migrate && node app.js",
     "mocha": "mocha --require intelli-espower-loader --exit ./test --recursive",
-    "cov": "nyc mocha --require intelli-espower-loader --exit --recursive ./test",
-    "test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha"
+    "coverage": "nyc mocha --require intelli-espower-loader --exit --recursive ./test",
+    "test": "npm run-script lint && npm run-script jsonlint && npm run-script coverage"
   },
   "dependencies": {
     "@hackmd/codemirror": "~5.41.2",
@@ -65,7 +64,7 @@
     "highlight.js": "~9.12.0",
     "i18n": "~0.8.3",
     "ionicons": "~2.0.1",
-    "isomorphic-fetch": "^2.2.1",
+    "isomorphic-fetch": "~2.2.1",
     "jquery": "~3.1.1",
     "jquery-mousewheel": "~3.1.13",
     "jquery-ui": "~1.12.1",
@@ -90,7 +89,7 @@
     "markdown-it-sup": "~1.0.0",
     "markdown-pdf": "~9.0.0",
     "mathjax": "~2.7.0",
-    "mattermost-redux": "^5.9.0",
+    "mattermost-redux": "~5.9.0",
     "mermaid": "~7.1.0",
     "method-override": "~2.3.7",
     "minimist": "~1.2.0",
@@ -153,30 +152,25 @@
     "css-loader": "~1.0.0",
     "doctoc": "~1.4.0",
     "ejs-loader": "~0.3.1",
-    "eslint": "~5.16.0",
-    "eslint-config-standard": "~12.0.0",
-    "eslint-plugin-import": "~2.17.1",
-    "eslint-plugin-node": "~8.0.1",
-    "eslint-plugin-promise": "~4.1.1",
-    "eslint-plugin-standard": "~4.0.0",
     "exports-loader": "~0.7.0",
     "expose-loader": "~0.7.5",
     "file-loader": "~2.0.0",
     "html-webpack-plugin": "~4.0.0-beta.2",
     "imports-loader": "~0.8.0",
-    "intelli-espower-loader": "^1.0.1",
+    "intelli-espower-loader": "~1.0.1",
     "jsonlint": "~1.6.2",
     "less": "~3.9.0",
     "less-loader": "~4.1.0",
     "mini-css-extract-plugin": "~0.4.1",
     "mocha": "~5.2.0",
     "mock-require": "~3.0.3",
-    "nyc": "^14.0.0",
+    "nyc": "~14.0.0",
     "optimize-css-assets-webpack-plugin": "~5.0.0",
-    "power-assert": "^1.6.1",
+    "power-assert": "~1.6.1",
     "script-loader": "~0.7.2",
     "sequelize-cli": "~5.4.0",
-    "sinon": "^7.3.2",
+    "sinon": "~7.3.2",
+    "standard": "~12.0.1",
     "string-loader": "~0.0.1",
     "style-loader": "~0.21.0",
     "uglifyjs-webpack-plugin": "~1.2.7",
@@ -203,6 +197,13 @@
       "email": "[email protected]"
     }
   ],
+  "standard": {
+    "ignore": [
+      "/public/build",
+      "/public/vendor",
+      "/lib/ot"
+    ]
+  },
   "nyc": {
     "all": true,
     "include": [

lib/realtime.js

@@ -1,6 +1,6 @@
 /* eslint-env browser, jquery */
 /* global CodeMirror, Cookies, moment, Spinner, serverurl,
-   key, Dropbox, ot, hex2rgb, Visibility */
+   key, Dropbox, ot, hex2rgb, Visibility, inlineAttachment */
 
 import TurndownService from 'turndown'
 

package.json

@@ -1,3 +1,4 @@
+/* global CodeMirror, $, editor, Cookies */
 import * as utils from './utils'
 import config from './config'
 import statusBarTemplate from './statusbar.html'

public/js/index.js

@@ -1,6 +1,7 @@
 /*
  *  Global UI elements references
  */
+/* global $ */
 
 export const getUIElements = () => ({
   spinner: $('.ui-spinner'),

public/js/lib/editor/index.js

@@ -1,3 +1,4 @@
+/* global CodeMirror, editor */
 const wrapSymbols = ['*', '_', '~', '^', '+', '=']
 export function wrapTextWith (editor, cm, symbol) {
   if (!cm.getSelection()) {

public/js/lib/editor/ui-elements.js

@@ -23,11 +23,6 @@ describe('ProcessQueue', function () {
 
   it('should not accept more than maximum task', () => {
     const queue = new ProcessQueue({ maximumLength: 2 })
-    const task = {
-      id: 1,
-      processingFunc: async () => {
-      }
-    }
 
     queue.start()
     assert(queue.push(1, () => (Promise.resolve())))

public/js/lib/editor/utils.js

@@ -54,7 +54,7 @@ describe('realtime#ifMayEdit', function () {
     { role: Role.Guest, permission: Permission.Locked, canEdit: false },
     { role: Role.LoggedIn, permission: Permission.Locked, canEdit: false },
     { role: Role.Owner, permission: Permission.Locked, canEdit: true },
-    { role: Role.Guest, permission: Permission.Protected, canEdit: false},
+    { role: Role.Guest, permission: Permission.Protected, canEdit: false },
     { role: Role.LoggedIn, permission: Permission.Protected, canEdit: false },
     { role: Role.Owner, permission: Permission.Protected, canEdit: true },
     { role: Role.Guest, permission: Permission.Private, canEdit: false },