Merge pull request #1545 from germanbisurgi/feature/npm-audit

npm audit and packages upgrade
json-editor · Apr 16, 2024 · ce55cda · ce55cda
2 parents d0ddff9 + 37900d6
commit ce55cda
Show file tree

Hide file tree

Showing 16 changed files with 22,049 additions and 9,481 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -2,6 +2,9 @@
   "extends":["standard"],
   "env": {"browser": true},
   "rules": {
-    "no-console": "error"
+    "no-console": "error",
+    "camelcase": 0,
+    "array-callback-return": 0,
+    "no-empty": 0
   }
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,7 +53,7 @@ jobs:
         run: docker-compose run -T --rm node npm run ${BUILD_ENV}
       - name: Test
         run: |
-          docker-compose exec -T node codeceptjs -c /repo/tests/codeceptjs/codecept.json run-multiple basic:${SELENIUM_BROWSER} --invert --grep  '@optional'
+          docker-compose exec -T node codeceptjs run-multiple -c /repo/tests/codeceptjs/codecept.json basic:${SELENIUM_BROWSER} --invert --grep  '@optional'
           pwd
           ls -la codeceptjs/output
       - name: Test Artifacts
@@ -65,5 +65,5 @@ jobs:
           retention-days: 30
       - name: Test (optional)
         continue-on-error: true
-        run: docker-compose exec -T node codeceptjs -c /repo/tests/codeceptjs/codecept.json run-multiple basic:${SELENIUM_BROWSER} --grep '@optional'
+        run: docker-compose exec -T node codeceptjs run-multiple -c /repo/tests/codeceptjs/codecept.json basic:${SELENIUM_BROWSER} --grep '@optional'
 
diff --git a/config/webpack.common.js b/config/webpack.common.js
@@ -1,6 +1,7 @@
 const webpack = require('webpack')
 const helpers = require('./helpers')
 const CssToJSON = require('../build/CssToJson')
+const ESLintPlugin = require('eslint-webpack-plugin');
 
 const bannerText = `/**
 * @name JSON Editor
@@ -22,12 +23,6 @@ module.exports = {
   },
   module: {
     rules: [
-      {
-        enforce: 'pre',
-        test: /\.js$/,
-        exclude: /node_modules/,
-        loader: 'eslint-loader'
-      },
       {
         test: /\.js|\.css.js$/,
         exclude: /node_modules/,
@@ -54,6 +49,7 @@ module.exports = {
     ]
   },
   plugins: [
+    new ESLintPlugin(),
     new webpack.BannerPlugin(
       bannerText.replace(
         '{{ VERSION }}',