chore: bump build-tools dependencies, fix lint config

vaadin · Mar 16, 2022 · 53bd437 · 53bd437
1 parent 17bbcaf
commit 53bd437
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 75 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": "vaadin",
+  "extends": "./build-tools/node_modules/eslint-config-vaadin/index.js",
   "rules": {
     "linebreak-style": 0,
     "object-curly-spacing": 0

diff --git a/.stylelintrc b/.stylelintrc
@@ -1,3 +1,6 @@
 {
-  "extends": "stylelint-config-vaadin"
+  "extends": "stylelint-config-vaadin",
+  "rules": {
+    "no-eol-whitespace": null
+  }
 }
diff --git a/build-tools/gulpfile.js b/build-tools/gulpfile.js
@@ -5,8 +5,6 @@ var eslint = require('gulp-eslint');
 var htmlExtract = require('gulp-html-extract');
 var stylelint = require('gulp-stylelint');
 
-gulp.task('lint', ['lint:js', 'lint:html', 'lint:css']);
-
 gulp.task('lint:js', function() {
   return gulp.src([
     'gulpfile.js',
@@ -45,3 +43,5 @@ gulp.task('lint:css', function() {
       ]
     }));
 });
+
+gulp.task('lint', gulp.series('lint:js', 'lint:html', 'lint:css'));
diff --git a/build-tools/package.json b/build-tools/package.json
@@ -5,15 +5,15 @@
   "author": "Vaadin Ltd",
   "license": "SEE LICENSE IN http://vaadin.com/license/cvtl-1",
   "devDependencies": {
-    "eslint": "^5.0.0",
+    "eslint": "^8.11.0",
     "eslint-config-vaadin": "^0.2.7",
-    "eslint-plugin-html": "^4.0.0",
-    "gulp": "^3.9.1",
-    "gulp-eslint": "^5.0.0",
+    "eslint-plugin-html": "^6.2.0",
+    "gulp": "^4.0.2",
+    "gulp-eslint": "^6.0.0",
     "gulp-html-extract": "^0.3.0",
-    "gulp-stylelint": "^7.0.0",
-    "stylelint": "^9.0.0",
-    "stylelint-config-vaadin": "^0.1.4"
+    "gulp-stylelint": "^13.0.0",
+    "stylelint": "^14.6.0",
+    "stylelint-config-vaadin": "^0.3.0"
   },
   "scripts": {
     "lint": "gulp lint"

diff --git a/package-lock.json b/package-lock.json
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
         <selenium.version>4.1.2</selenium.version>
 
         <!-- Plugins -->
-        <frontend.maven.plugin.version>1.6</frontend.maven.plugin.version>
+        <frontend.maven.plugin.version>1.12.1</frontend.maven.plugin.version>
         <maven.war.plugin.version>3.1.0</maven.war.plugin.version>
         <maven.resources.plugin.version>3.0.2</maven.resources.plugin.version>
         <maven.clean.plugin.version>3.0.0</maven.clean.plugin.version>

diff --git a/src/main/resources/META-INF/resources/offline-page.html b/src/main/resources/META-INF/resources/offline-page.html
@@ -86,7 +86,7 @@
         height: auto;
       }
     }
-  </style>
+</style>
 </head>
 <body class="page">
   <div class="offline">