Merge a2fde9d into 66a8d9b

.eslintrc

@@ -9,14 +9,15 @@
     "plugin:import/errors",
     "plugin:import/warnings"
   ],
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "parserOptions": {
     "ecmaFeatures": {
       "experimentalObjectRestSpread": true,
       "jsx": true
     },
     "sourceType": "module",
-    "ecmaVersion": 2017
+    "ecmaVersion": 2017,
+    "requireConfigFile": false
   },
   "rules": {
     "indent": ["error", 2, { "SwitchCase": 1 }],

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x]
 
     steps:
       - uses: actions/checkout@v2

package.json

@@ -24,7 +24,7 @@
     "dev": "webpack --mode=development --watch",
     "sandbox": "concurrently -k \"npm:sandbox:*\"",
     "sandbox:build": "webpack --config webpack.config.sandbox.js --mode=development --watch",
-    "sandbox:serve": "serve sandbox",
+    "sandbox:serve": "npx serve sandbox",
     "docs": "serve docs",
     "docs:build": "./scripts/docs-build",
     "test": "NODE_ENV=test mocha --require @babel/register --colors './test/**/*.spec.js'",
@@ -71,32 +71,32 @@
     "three": ">=0.122.0 <1.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.10.1",
-    "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
-    "@babel/plugin-transform-runtime": "^7.10.1",
+    "@babel/cli": "^7.16.0",
+    "@babel/core": "^7.16.0",
+    "@babel/eslint-parser": "^7.16.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.0",
     "@babel/preset-env": "^7.10.1",
-    "@babel/register": "^7.10.1",
-    "@babel/runtime": "^7.10.1",
+    "@babel/register": "^7.16.0",
+    "@babel/runtime": "^7.16.0",
     "@istanbuljs/nyc-config-babel": "^3.0.0",
-    "babel-eslint": "^7.2.1",
-    "babel-loader": "^8.1.0",
+    "babel-loader": "^8.2.3",
+    "babel-plugin-istanbul": "^6.0.0",
     "bundlesize": "^0.18.1",
     "chai": "^4.2.0",
-    "concurrently": "^5.0.2",
+    "concurrently": "^6.3.0",
     "coveralls": "^3.0.3",
     "domino": "^2.1.1",
-    "eslint": "^6.0.1",
-    "eslint-loader": "^2.2.1",
-    "eslint-plugin-import": "^2.18.0",
-    "mocha": "^7.1.1",
-    "nyc": "^15.0.0",
+    "eslint": "^8.1.0",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-webpack-plugin": "^3.1.0",
+    "mocha": "^9.1.3",
+    "nyc": "^15.1.0",
     "prettier": "^1.16.4",
-    "serve": "^11.3.2",
     "sinon": "^7.1.1",
     "three": "^0.127.0",
-    "webpack": "^4.42.1",
-    "webpack-bundle-analyzer": "^3.6.1",
-    "webpack-cli": "^3.3.5"
+    "webpack": "^5.61.0",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-cli": "^4.9.1"
   }
 }

src/behaviour/Collision.js

@@ -56,7 +56,9 @@ export default class Collision extends Behaviour {
     const particles = this.emitter
       ? this.emitter.particles.slice(index)
       : this.particles.slice(index);
+
     let otherParticle, lengthSq, overlap, distance, averageMass1, averageMass2;
+
     let i = particles.length;
 
     while (i--) {

src/core/System.js

@@ -280,7 +280,9 @@ export default class System {
    */
   getCount() {
     const length = this.emitters.length;
+
     let total = 0;
+
     let i;
 
     for (i = 0; i < length; i++) {

src/debug/Debug.js

@@ -38,6 +38,7 @@ export default {
       y = DEFAULT_POSITION,
       z = DEFAULT_POSITION,
     } = zone;
+
     let geometry;
 
     if (zone.isPointZone()) {

src/zone/PointZone.js

@@ -26,7 +26,9 @@ export default class PointZone extends Zone {
       x = y = z = 0;
     } else {
       x = a;
+      // eslint-disable-next-line
       y = b;
+      // eslint-disable-next-line
       z = c;
     }
 

src/zone/SphereZone.js

@@ -30,7 +30,9 @@ export default class SphereZone extends Zone {
       r = centerX || 100;
     } else {
       x = centerX;
+      // eslint-disable-next-line
       y = centerY;
+      // eslint-disable-next-line
       z = centerZ;
       r = radius;
     }

webpack.config.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const ESLintPlugin = require('eslint-webpack-plugin');
 const bundleAnalyzer = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 module.exports = {
@@ -19,11 +20,6 @@ module.exports = {
         loader: 'babel-loader',
         exclude: /(node_modules)/,
       },
-      {
-        test: /(\.jsx|\.js)$/,
-        loader: 'eslint-loader',
-        exclude: /node_modules/,
-      },
     ],
   },
   resolve: {
@@ -35,5 +31,6 @@ module.exports = {
       analyzerMode: 'disabled',
       generateStatsFile: true,
     }),
+    new ESLintPlugin(),
   ],
 };

webpack.config.sandbox.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const ESLintPlugin = require('eslint-webpack-plugin');
 
 module.exports = {
   mode: 'development',
@@ -18,15 +19,11 @@ module.exports = {
         loader: 'babel-loader',
         exclude: /(node_modules|bower_components)/,
       },
-      {
-        test: /(\.jsx|\.js)$/,
-        loader: 'eslint-loader',
-        exclude: /node_modules/,
-      },
     ],
   },
   resolve: {
     modules: [path.resolve('./src'), path.resolve('./node_modules')],
     extensions: ['.json', '.js'],
   },
+  plugins: [new ESLintPlugin()],
 };