Fix ESLint issues

flekschas · Jul 12, 2022 · 932a558 · 932a558
1 parent 328355a
commit 932a558
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/js/.eslintrc b/js/.eslintrc
@@ -1,8 +1,12 @@
 {
   "env": {
-    "node": true,
+    "browser": true,
     "es6": true
   },
+  "globals": {
+    "require": false,
+    "module": false,
+  },
   "extends": [
     "eslint:recommended",
     "prettier"

diff --git a/js/labplugin.js b/js/labplugin.js
@@ -1,13 +1,13 @@
 const plugin = require('./index');
 const base = require('@jupyter-widgets/base');
-const name = require('./package.json').name;
+const widgetName = require('./package.json').name;
 
 module.exports = {
-  id: 'jupyter.extensions.' + name,
+  id: 'jupyter.extensions.' + widgetName,
   requires: [base.IJupyterWidgetRegistry],
   activate: function(app, widgets) {
     widgets.registerWidget({
-      name: name,
+      name: widgetName,
       version: plugin.version,
       exports: plugin
     });

diff --git a/js/package.json b/js/package.json
@@ -26,13 +26,14 @@
   ],
   "scripts": {
     "clean": "rimraf dist/ && rimraf ../jscatter/labextension/ && rimraf ../jscatter/nbextension",
-    "prepare": "npm run clean && npm run build:prod",
+    "prepare": "npm run clean && npm run lint && npm run build:prod",
     "build": "webpack --mode=development && npm run build:labextension:dev",
     "build:prod": "webpack --mode=production && npm run build:labextension",
     "build:labextension": "jupyter labextension build .",
     "build:labextension:dev": "jupyter labextension build --development True .",
+    "lint": "eslint src embed.js extension.js get-version-info.js index.js labplugin.js",
     "watch": "webpack --watch --mode=development",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "npm run lint"
   },
   "dependencies": {
     "@jupyter-widgets/base": "^1.1.10 || ^2 || ^3 || ^4",

diff --git a/js/src/index.js b/js/src/index.js
@@ -1,4 +1,3 @@
-/* eslint-env browser */
 const widgets = require('@jupyter-widgets/base');
 const reglScatterplot = require('regl-scatterplot/dist/regl-scatterplot.js');
 const pubSub = require('pub-sub-es');
@@ -13,24 +12,30 @@ const createRenderer = reglScatterplot.createRenderer;
 
 const JupyterScatterModel = widgets.DOMWidgetModel.extend(
   {
-    defaults: {
-      ...widgets.DOMWidgetModel.prototype.defaults(),
-      _model_name : 'JupyterScatterModel',
-      _model_module : packageJson.name,
-      _model_module_version : packageJson.version,
-      _view_name : 'JupyterScatterView',
-      _view_module : packageJson.name,
-      _view_module_version : packageJson.version
-    }
+    defaults: Object.assign(
+      {},
+      widgets.DOMWidgetModel.prototype.defaults(),
+      {
+        _model_name : 'JupyterScatterModel',
+        _model_module : packageJson.name,
+        _model_module_version : packageJson.version,
+        _view_name : 'JupyterScatterView',
+        _view_module : packageJson.name,
+        _view_module_version : packageJson.version,
+      }
+    )
   },
   {
-    serializers: {
-      ...widgets.DOMWidgetModel.serializers,
-      points: new codecs.Numpy2D('float32'),
-      selection: new codecs.Numpy1D('uint32'),
-      view_data: new codecs.Numpy1D('uint8'),
-    }
-  },
+    serializers: Object.assign(
+      {},
+      widgets.DOMWidgetModel.serializers,
+      {
+        points: new codecs.Numpy2D('float32'),
+        selection: new codecs.Numpy1D('uint32'),
+        view_data: new codecs.Numpy1D('uint8'),
+      }
+    )
+  }
 );
 
 const AXES_LABEL_SIZE = 16;
@@ -45,14 +50,6 @@ function camelToSnake(string) {
   }).toLowerCase();
 }
 
-function flipObj(obj) {
-  return Object.entries(obj).reduce((ret, entry) => {
-    const [ key, value ] = entry;
-    ret[ value ] = key;
-    return ret;
-  }, {});
-}
-
 function downloadBlob(blob, name) {
   const link = document.createElement('a');
   link.href = URL.createObjectURL(blob);
@@ -83,8 +80,6 @@ function getScale(scaleType) {
   return d3Scale.scaleLinear();
 }
 
-const MIN_WIDTH = 240;
-
 /**
  * This dictionary maps between the camelCased Python property names and their
  * JavaScript counter parts. In most cases the name is identical but they can be
@@ -612,11 +607,11 @@ const JupyterScatterView = widgets.DOMWidgetView.extend({
     }
   },
 
-  xScaleHandler: function xScaleHandler(newXScale) {
+  xScaleHandler: function xScaleHandler() {
     this.createAxes();
   },
 
-  yScaleHandler: function yScaleHandler(newXScale) {
+  yScaleHandler: function yScaleHandler() {
     this.createAxes();
   },