Fix lint npm command & use it in GitHub workflow (openhab#952)

Signed-off-by: Kevin Haunschmied <darkc.futarialone@gmail.com>
hubsif · Mar 10, 2021 · f601eb2 · f601eb2
1 parent 0a1848e
commit f601eb2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/mainui.yml b/.github/workflows/mainui.yml
@@ -37,9 +37,9 @@ jobs:
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci
-        
+
       - name: Run ESLint
-        run: npx eslint --ext js --ext vue src
+        run: npm run lint
 
   webpack-stats:
     runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci
-        
+
       - name: Build and generate report
         run: npm run webpack-analyzer-report-stats
 

diff --git a/bundles/org.openhab.ui/web/package.json b/bundles/org.openhab.ui/web/package.json
@@ -44,8 +44,8 @@
     "webpack-analyzer-report-stats": "cross-env NODE_ENV=production cross-env WEBPACK_ANALYZER=1 WEBPACK_ANALYZER_REPORT=1 WEBPACK_ANALYZER_REPORT_STATS=1 node ./build/build.js",
     "dev": "cross-env NODE_ENV=development webpack-dev-server --config ./build/webpack.config.js",
     "start": "npm run dev",
-    "lint": "npx eslint './**/*.{js,vue}'",
-    "lint:fix": "npx eslint --fix './**/*.{js,vue}'",
+    "lint": "npx eslint --ext js --ext vue src",
+    "lint:fix": "npx eslint --fix --ext js --ext vue src",
     "test:unit": "npx jest",
     "test:unit:watch": "npx jest --watch",
     "test:e2e": "npx cypress run",