eslint

vidartf · vidartf · commit 1d22d84d1c9e · 2022-05-26T14:45:42.000+01:00
diff --git a/js/.eslintrc.js b/js/.eslintrc.js
@@ -1,27 +1,44 @@
 module.exports = {
-    "env": {
-        "browser": true,
-        "commonjs": true
+    'env': {
+        'browser': true,
+        'commonjs': true,
+        'es2018': true,
+        'node': true
     },
-    "extends": "eslint:recommended",
-    "rules": {
-        "indent": [
-            "error",
+    'extends': 'eslint:recommended',
+    'ignorePatterns': ['dist/**/*', 'lab-dist/**/*'],
+    'globals': {
+        '__webpack_public_path__': true
+    },
+    'rules': {
+        'indent': [
+            'error',
             4
         ],
-        "linebreak-style": [
-            "error",
-            "windows"
+        'linebreak-style': [
+            'error',
+            'windows'
         ],
-        "quotes": [
-            "error",
-            "single"
+        'quotes': [
+            'error',
+            'single'
         ],
-        "semi": [
-            "error",
-            "always"
+        'semi': [
+            'error',
+            'always'
         ],
-        "no-console": "off",
-        "no-unused-vars": "warn",
-    }
+        'no-console': 'off',
+        'no-unused-vars': ['warn', { 'args': 'none' }],
+        'prefer-object-spread': 'error',
+    },
+    'overrides': [
+        {
+            'files': [ 'src/**/*.autogen.js' ],
+            'rules': {
+                'quotes': 0,
+                'linebreak-style': 0,
+                'no-unused-vars': 0,
+            }
+        }
+    ]
 };
diff --git a/js/scripts/.eslintrc.js b/js/scripts/.eslintrc.js
@@ -1,12 +1,12 @@
 module.exports = {
     "env": {
-        "es6": true,
+        "es2018": true,
         "node": true
     },
     "extends": "eslint:recommended",
     "parserOptions": {
         "sourceType": "script",
-        "ecmaVersion": 2017
+        "ecmaVersion": 2018
     },
     "rules": {
         "indent": [
diff --git a/js/scripts/generate-shader-utils.js b/js/scripts/generate-shader-utils.js
@@ -73,7 +73,7 @@ async function createPythonWrapper(name, relativePath) {
             if (data[section]['uniforms'] === undefined) {
                 continue;
             }
-            serialized[section] = Object.assign({}, data[section]);
+            serialized[section] = { ...data[section]};
             serialized[section]['uniforms'] = serializeUniforms(data[section]['uniforms']);
         }
     } else {
diff --git a/js/scripts/generate-wrappers.js b/js/scripts/generate-wrappers.js
@@ -155,7 +155,7 @@ function getClassConfig(className) {
 
     const curClass = classConfigs[className];
 
-    const result = Object.assign({}, curClass);
+    const result = { ...curClass};
 
     result.propsDefinedByThree = [];
     result.propsDefinedByThree = result.propsDefinedByThree.concat(curClass.propsDefinedByThree || []);
diff --git a/js/scripts/templates/js_index.mustache b/js/scripts/templates/js_index.mustache
@@ -15,10 +15,10 @@ var loadedModules = [
 ];
 
 for (var i in loadedModules) {
-    if (loadedModules.hasOwnProperty(i)) {
+    if (Object.prototype.hasOwnProperty.call(loadedModules, i)) {
         var loadedModule = loadedModules[i];
         for (var target_name in loadedModule) {
-            if (loadedModule.hasOwnProperty(target_name)) {
+            if (Object.prototype.hasOwnProperty.call(loadedModule, target_name)) {
                 module.exports[target_name] = loadedModule[target_name];
             }
         }
diff --git a/js/src/_base/Renderable.js b/js/src/_base/Renderable.js
@@ -174,7 +174,7 @@ RenderableModel.serializers = {
     ...widgets.DOMWidgetModel.serializers,
     clippingPlanes: { deserialize: unpackThreeModel },
     shadowMap: { deserialize: unpackThreeModel },
-}
+};
 
 
 class RenderableView extends widgets.DOMWidgetView {
diff --git a/js/src/animation/AnimationAction.js b/js/src/animation/AnimationAction.js
@@ -125,7 +125,7 @@ class AnimationActionModel extends AnimationActionAutogen {
 AnimationActionModel.serializers = {
     ...AnimationActionAutogen.serializers,
     ...widgets.DOMWidgetModel.serializers,
-}
+};
 
 
 class AnimationActionView extends widgets.DOMWidgetView {
diff --git a/js/src/cameras/OrthographicCamera.js b/js/src/cameras/OrthographicCamera.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var OrthographicCameraAutogen = require('./OrthographicCamera.autogen');
 
 class OrthographicCameraModel extends OrthographicCameraAutogen.OrthographicCameraModel {
diff --git a/js/src/cameras/PerspectiveCamera.js b/js/src/cameras/PerspectiveCamera.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var PerspectiveCameraAutogen = require('./PerspectiveCamera.autogen');
 
 class PerspectiveCameraModel extends PerspectiveCameraAutogen.PerspectiveCameraModel {
diff --git a/js/src/controls/FlyControls.js b/js/src/controls/FlyControls.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var THREE = require('three');
 var FlyControls = require('../examples/controls/MomentumCameraControls.js').FlyControls;
 var FlyControlsAutogen = require('./FlyControls.autogen');
diff --git a/js/src/controls/OrbitControls.js b/js/src/controls/OrbitControls.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var OrbitControls = require('../examples/controls/OrbitControls.js').OrbitControls;
 var OrbitControlsAutogen = require('./OrbitControls.autogen');
 
diff --git a/js/src/controls/Picker.js b/js/src/controls/Picker.js
@@ -114,13 +114,13 @@ function getinfo(o) {
         if (o.face && o.object.geometry.isBufferGeometry) {
             v = o.object.geometry.attributes.position.array;
             verts = [[v[o.face.a], v[o.face.a] + 1, v[o.face.a] + 2],
-                     [v[o.face.b], v[o.face.b] + 1, v[o.face.b] + 2],
-                     [v[o.face.c], v[o.face.c] + 1, v[o.face.c] + 2]];
+                [v[o.face.b], v[o.face.b] + 1, v[o.face.b] + 2],
+                [v[o.face.c], v[o.face.c] + 1, v[o.face.c] + 2]];
         } else if (o.face) {
             v = o.object.geometry.vertices;
             verts = [[v[o.face.a].x, v[o.face.a].y, v[o.face.a].z],
-                     [v[o.face.b].x, v[o.face.b].y, v[o.face.b].z],
-                     [v[o.face.c].x, v[o.face.c].y, v[o.face.c].z]];
+                [v[o.face.b].x, v[o.face.b].y, v[o.face.b].z],
+                [v[o.face.c].x, v[o.face.c].y, v[o.face.c].z]];
         }
         return {
             point: [o.point.x, o.point.y, o.point.z],
diff --git a/js/src/controls/TrackballControls.js b/js/src/controls/TrackballControls.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var TrackballControls = require('../examples/controls/TrackballControls.js').TrackballControls;
 var TrackballControlsAutogen = require('./TrackballControls.autogen');
 
diff --git a/js/src/core/Renderer.js b/js/src/core/Renderer.js
@@ -59,16 +59,16 @@ class RendererModel extends RenderableModel {
             this.trigger('rerender', this, {});
         }
     }
-
-    static serializers = {
-        ...RenderableModel.serializers,
-        scene: { deserialize: unpackThreeModel },
-        camera: { deserialize: unpackThreeModel },
-        controls: { deserialize: unpackThreeModel },
-        effect: { deserialize: unpackThreeModel },
-    }
 }
 
+RendererModel.serializers = {
+    ...RenderableModel.serializers,
+    scene: { deserialize: unpackThreeModel },
+    camera: { deserialize: unpackThreeModel },
+    controls: { deserialize: unpackThreeModel },
+    effect: { deserialize: unpackThreeModel },
+};
+
 class RendererView extends RenderableView {
 
     render() {
diff --git a/js/src/examples/.eslintrc.js b/js/src/examples/.eslintrc.js
@@ -1,28 +1,29 @@
 module.exports = {
-    "env": {
-        "browser": true,
-        "commonjs": true
-    }
-    "extends": "eslint:recommended",
-    "rules": {
-        "indent": [
-            "error",
-            "tab"
-        ],
-        "linebreak-style": [
-            "error",
-            "windows"
-        ],
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ],
-        "no-console": "off",
-        "no-unused-vars": "warn",
-        "no-redeclare": "warn",
-    }
+	'env': {
+		'browser': true,
+		'commonjs': true
+	},
+	'extends': 'eslint:recommended',
+	'rules': {
+		'indent': [
+			'error',
+			'tab'
+		],
+		'linebreak-style': [
+			'error',
+			'windows'
+		],
+		'quotes': [
+			'error',
+			'single'
+		],
+		'semi': [
+			'error',
+			'always'
+		],
+		'no-console': 'off',
+		'no-unused-vars': 'warn',
+		'no-undef': 'warn',
+		'no-redeclare': 'warn',
+	}
 };
diff --git a/js/src/examples/cameras/CombinedCamera.js b/js/src/examples/cameras/CombinedCamera.js
@@ -138,7 +138,7 @@ CombinedCamera.prototype.copy = function ( source ) {
 	this.bottom = source.bottom;
 
 	this.zoom = source.zoom;
-	this.view = source.view === null ? null : Object.assign( {}, source.view );
+	this.view = source.view === null ? null : ({  ...source.view });
 	this.aspect = source.aspect;
 
 	this.cameraO.copy( source.cameraO );
diff --git a/js/src/examples/lines/LineMaterial.js b/js/src/examples/lines/LineMaterial.js
@@ -384,11 +384,11 @@ LineMaterial.prototype.copy = function ( source ) {
 
 	this.linewidth = source.linewidth;
 
-    this.resolution = source.resolution;
+	this.resolution = source.resolution;
 
-    this.dashScale = source.dashScale;
+	this.dashScale = source.dashScale;
 
-    this.dashSize = source.dashSize;
+	this.dashSize = source.dashSize;
 
 	this.gapSize = source.gapSize;
 
diff --git a/js/src/examples/renderers/CanvasRenderer.js b/js/src/examples/renderers/CanvasRenderer.js
@@ -47,8 +47,8 @@ var CanvasRenderer = function ( parameters ) {
 		_projector = new THREE.Projector(),
 
 		_canvas = parameters.canvas !== undefined
-				? parameters.canvas
-				: document.createElement( 'canvas' ),
+			? parameters.canvas
+			: document.createElement( 'canvas' ),
 
 		_canvasWidth = _canvas.width,
 		_canvasHeight = _canvas.height,
@@ -766,8 +766,8 @@ var CanvasRenderer = function ( parameters ) {
 			_color.r = _color.g = _color.b = 1 - smoothstep( v1.positionScreen.z * v1.positionScreen.w, _camera.near, _camera.far );
 
 			material.wireframe === true
-					? strokePath( _color, material.wireframeLinewidth, material.wireframeLinecap, material.wireframeLinejoin )
-					: fillPath( _color );
+				? strokePath( _color, material.wireframeLinewidth, material.wireframeLinecap, material.wireframeLinejoin )
+				: fillPath( _color );
 
 		} else if ( material instanceof THREE.MeshNormalMaterial ) {
 
diff --git a/js/src/examples/renderers/Projector.js b/js/src/examples/renderers/Projector.js
@@ -860,8 +860,8 @@ var Projector = function () {
 
 		var alpha1 = 0, alpha2 = 1,
 
-		// Calculate the boundary coordinate of each vertex for the near and far clip planes,
-		// Z = -1 and Z = +1, respectively.
+			// Calculate the boundary coordinate of each vertex for the near and far clip planes,
+			// Z = -1 and Z = +1, respectively.
 			bc1near =  s1.z + s1.w,
 			bc2near =  s2.z + s2.w,
 			bc1far =  - s1.z + s1.w,
diff --git a/js/src/geometries/LineSegmentsGeometry.js b/js/src/geometries/LineSegmentsGeometry.js
@@ -1,6 +1,4 @@
 var Promise = require('bluebird');
-var dataserializers = require('jupyter-dataserializers');
-var ndarray = require('ndarray');
 var LineSegmentsGeometry = require('../examples/lines/LineSegmentsGeometry.js').LineSegmentsGeometry;
 var LineSegmentsGeometryAutogen = require('./LineSegmentsGeometry.autogen').LineSegmentsGeometryModel;
 
diff --git a/js/src/lights/LightShadow.js b/js/src/lights/LightShadow.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var LightShadowAutogen = require('./LightShadow.autogen').LightShadowModel;
 
 class LightShadowModel extends LightShadowAutogen {
diff --git a/js/src/objects/CloneArray.js b/js/src/objects/CloneArray.js
@@ -7,7 +7,7 @@ var utils = require('../_base/utils');
 
 class ThreeCloneArray extends THREE.Object3D {
     constructor(original, positions, merge) {
-        THREE.Object3D.call(this);
+        super();
 
         this.original = original;
         this.positions = positions;
diff --git a/js/src/objects/Mesh.js b/js/src/objects/Mesh.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var MeshAutogen = require('./Mesh.autogen').MeshModel;
 
 
@@ -17,7 +16,7 @@ class MeshModel extends MeshAutogen {
 MeshModel.serializers = {
     ...MeshAutogen.serializers,
     morphTargetInfluences: optionalArraySerializer,
-}
+};
 
 module.exports = {
     MeshModel: MeshModel,
diff --git a/js/src/renderers/WebGLRenderer.js b/js/src/renderers/WebGLRenderer.js
@@ -15,21 +15,21 @@ class WebGLRendererModel extends RenderableModel {
 
     defaults() {
         return _.extend({}, RenderableModel.prototype.defaults, {
-        _view_name: 'WebGLRendererView',
-        _model_name: 'WebGLRendererModel',
+            _view_name: 'WebGLRendererView',
+            _model_name: 'WebGLRendererModel',
 
-        width: 200,
-        height: 200,
+            width: 200,
+            height: 200,
 
-       });
+        });
     }
 
 }
 
 WebGLRendererModel.serializers = {
     ...RenderableModel.serializers,
     clippingPlanes: { deserialize: unpackThreeModel },
-}
+};
 
 
 class WebGLRendererView extends RenderableView {
diff --git a/js/src/renderers/webgl/WebGLShadowMap.js b/js/src/renderers/webgl/WebGLShadowMap.js
@@ -1,5 +1,4 @@
 
-var _ = require('underscore');
 var Promise = require('bluebird');
 
 var WebGLShadowMapAutogenModel = require('./WebGLShadowMap.autogen').WebGLShadowMapModel;
diff --git a/js/src/textures/DataTexture.js b/js/src/textures/DataTexture.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var Promise = require('bluebird');
 var dataserializers = require('jupyter-dataserializers');
 var ndarray = require('ndarray');
diff --git a/js/src/textures/DataTexture3D.js b/js/src/textures/DataTexture3D.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var Promise = require('bluebird');
 var dataserializers = require('jupyter-dataserializers');
 var ndarray = require('ndarray');
@@ -81,7 +80,7 @@ class DataTexture3DModel extends DataTexture3DBase {
 DataTexture3DModel.serializers = {
     ...DataTexture3DBase.serializers,
     data: dataserializers.data_union_serialization,
-}
+};
 
 module.exports = {
     DataTexture3DModel: DataTexture3DModel,
diff --git a/js/webpack.config.js b/js/webpack.config.js

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ async function createPythonWrapper(name, relativePath) {`
`73`	`73`	`if (data[section]['uniforms'] === undefined) {`
`74`	`74`	`continue;`
`75`	`75`	`}`
`76`		`- serialized[section] = Object.assign({}, data[section]);`
	`76`	`+ serialized[section] = { ...data[section]};`
`77`	`77`	`serialized[section]['uniforms'] = serializeUniforms(data[section]['uniforms']);`
`78`	`78`	`}`
`79`	`79`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ var loadedModules = [`
`15`	`15`	`];`
`16`	`16`
`17`	`17`	`for (var i in loadedModules) {`
`18`		`- if (loadedModules.hasOwnProperty(i)) {`
	`18`	`+ if (Object.prototype.hasOwnProperty.call(loadedModules, i)) {`
`19`	`19`	`var loadedModule = loadedModules[i];`
`20`	`20`	`for (var target_name in loadedModule) {`
`21`		`- if (loadedModule.hasOwnProperty(target_name)) {`
	`21`	`+ if (Object.prototype.hasOwnProperty.call(loadedModule, target_name)) {`
`22`	`22`	`module.exports[target_name] = loadedModule[target_name];`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-var _ = require('underscore');`
`2`	`1`	`var OrthographicCameraAutogen = require('./OrthographicCamera.autogen');`
`3`	`2`
`4`	`3`	`class OrthographicCameraModel extends OrthographicCameraAutogen.OrthographicCameraModel {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-var _ = require('underscore');`
`2`	`1`	`var PerspectiveCameraAutogen = require('./PerspectiveCamera.autogen');`
`3`	`2`
`4`	`3`	`class PerspectiveCameraModel extends PerspectiveCameraAutogen.PerspectiveCameraModel {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-var _ = require('underscore');`
`2`	`1`	`var THREE = require('three');`
`3`	`2`	`var FlyControls = require('../examples/controls/MomentumCameraControls.js').FlyControls;`
`4`	`3`	`var FlyControlsAutogen = require('./FlyControls.autogen');`