Commit 81ca64e0 authored by Joel Collins's avatar Joel Collins
Browse files

Properly set up ESLint

parent e1cca30d

openflexure_microscope/api/static/.eslintrc.js

+11 −5
Original line number Diff line number Diff line 


module.exports = {

  root: true,



  env: {

    node: true

  },



  extends: [

    "plugin:vue/recommended",

    "eslint:recommended",

    "prettier/vue",

    "plugin:prettier/recommended"

    "plugin:prettier/recommended",

    "plugin:vue/essential",

    "@vue/prettier"

  ],



  rules: {

    "vue/component-name-in-template-casing": ["error", "PascalCase"],

    "no-console": process.env.NODE_ENV === "production" ? "error" : "off",

    "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off"

    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",

    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off"

  },



  globals: {

    $nuxt: true

  },



  parserOptions: {

    parser: "babel-eslint"

  }

openflexure_microscope/api/static/babel.config.js

+2 −4
Original line number Diff line number Diff line 
module.exports = {

  presets: [

    '@vue/app'

  ]

}
 
  presets: ["@vue/app"]

};

openflexure_microscope/api/static/package-lock.json

+461 −2

File changed.

Preview size limit exceeded, changes collapsed.

openflexure_microscope/api/static/package.json

+11 −6
Original line number Diff line number Diff line
@@ -4,13 +4,11 @@ 
  "private": true,

  "description": "User client for the OpenFlexure Microscope Server",

  "author": "OpenFlexure <contact@openflexure.org> (https://www.openflexure.org)",

  "homepage": "https://gitlab.com/openflexure/openflexure-microscope-jsclient",

  "publisher": "Bath Open Instrumentation Group",

  "displayName": "OpenFlexure Microscope",

  "license": "GNU General Public License v3.0 ",

  "scripts": {

    "serve": "vue-cli-service serve --mode development",

    "build": "vue-cli-service build --mode production",

    "serve": "vue-cli-service serve --mode development"

    "lint": "vue-cli-service lint",

    "prettier": "vue-cli-service lint --fix"

  },

  "dependencies": {

    "material-design-icons": "^3.0.1",
@@ -19,7 +17,9 @@ 
  },

  "devDependencies": {

    "@vue/cli-plugin-babel": "^3.12.1",

    "@vue/cli-plugin-eslint": "^4.5.8",

    "@vue/cli-service": "^4.5.6",

    "@vue/eslint-config-prettier": "^6.0.0",

    "axios": "^0.19.2",

    "babel-eslint": "^10.1.0",

    "css-loader": "^3.6.0",
@@ -30,6 +30,7 @@ 
    "less": "^3.12.2",

    "less-loader": "^5.0.0",

    "mdns-js": "^1.0.3",

    "prettier": "^1.19.1",

    "uikit": "^3.5.7",

    "vue": "^2.6.12",

    "vue-friendly-iframe": "^0.17.0",
@@ -48,5 +49,9 @@ 
    "> 1%",

    "last 2 versions",

    "not ie <= 8"

  ]

  ],

  "displayName": "OpenFlexure Microscope",

  "homepage": "https://gitlab.com/openflexure/openflexure-microscope-jsclient",

  "license": "GNU General Public License v3.0 ",

  "publisher": "Bath Open Instrumentation Group"

}

openflexure_microscope/api/static/src/App.vue

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import loadingContent from "./components/loadingContent.vue"; 
import axios from "axios";

var Mousetrap = require("mousetrap");



Mousetrap.prototype.stopCallback = function(e, element, combo) {

Mousetrap.prototype.stopCallback = function(e, element) {

  // if the element has the class "mousetrap" then no need to stop

  if ((" " + element.className + " ").indexOf(" mousetrap ") > -1) {

    return false;