This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter-content.git
The following commit(s) were added to refs/heads/master by this push:
new e68ac48 SLING-12501 Update FE Tooling (#10)
e68ac48 is described below
commit e68ac48a68c283f076c46ad6f52627b3c02e13ef
Author: Stefan Seifert <[email protected]>
AuthorDate: Thu Nov 21 14:25:43 2024 +0100
SLING-12501 Update FE Tooling (#10)
update to latest FE tooling
update gulp config
replace deprecated sass import syntax
---
pom.xml | 5 ++---
src/main/frontend/gulpfile.js | 8 ++++----
src/main/frontend/package.json | 11 ++++++-----
src/main/frontend/src/fonts/OpenSans-Bold-webfont.woff | Bin
src/main/frontend/src/fonts/OpenSans-Light-webfont.woff | Bin
src/main/frontend/src/fonts/OpenSans-Regular-webfont.woff | Bin
src/main/frontend/src/fonts/OpenSans-Semibold-webfont.woff | Bin
src/main/frontend/src/img/asf-logo.svg | 0
src/main/frontend/src/img/gradient.jpg | Bin
src/main/frontend/src/scss/_fonts.scss | 0
src/main/frontend/src/scss/_grid.scss | 0
src/main/frontend/src/scss/form.scss | 0
src/main/frontend/src/scss/index.scss | 4 ++--
.../initial-content/apps/sling/starter/home/home.html.esp | 0
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 06d55e1..97de8fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.12.1</version>
+ <version>1.15.1</version>
<configuration>
<installDirectory>${frontend.target}</installDirectory>
<workingDirectory>${frontend.target}</workingDirectory>
@@ -100,8 +100,7 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
- <nodeVersion>v6.11.0</nodeVersion>
- <npmVersion>3.10.10</npmVersion>
+ <nodeVersion>v22.11.0</nodeVersion>
</configuration>
</execution>
<execution>
diff --git a/src/main/frontend/gulpfile.js b/src/main/frontend/gulpfile.js
old mode 100755
new mode 100644
index e692df5..9ac592d
--- a/src/main/frontend/gulpfile.js
+++ b/src/main/frontend/gulpfile.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
const gulp = require('gulp');
-const sass = require('gulp-sass');
+const sass = require('gulp-sass')(require('sass'));
const header = require('gulp-header');
const cleanCSS = require('gulp-clean-css');
var concatCss = require('gulp-concat-css');
@@ -50,8 +50,8 @@ gulp.task('styles', function() {
});
gulp.task('assets', function() {
-
gulp.src(['./src/{fonts,img}/**/*']).pipe(gulp.dest('./dist/initial-content/content/starter'));
+ return gulp.src(['./src/{fonts,img}/**/*'])
+ .pipe(gulp.dest('./dist/initial-content/content/starter'));
});
-
-gulp.task('default', ['styles', 'assets'], function() {});
\ No newline at end of file
+gulp.task('default', gulp.series(gulp.parallel('styles', 'assets')));
\ No newline at end of file
diff --git a/src/main/frontend/package.json b/src/main/frontend/package.json
index 13a52cc..fb20b5d 100644
--- a/src/main/frontend/package.json
+++ b/src/main/frontend/package.json
@@ -8,11 +8,12 @@
},
"dependencies": {},
"devDependencies": {
- "gulp": "^3.9.1",
- "gulp-concat-css": "^3.0.0",
- "gulp-header": "^1.8.9",
- "gulp-clean-css": "^3.9.2",
- "gulp-sass": "^3.1.0"
+ "gulp": "^5.0.0",
+ "gulp-concat-css": "^3.1.0",
+ "gulp-header": "^2.0.9",
+ "gulp-clean-css": "^4.3.0",
+ "gulp-sass": "^5.1.0",
+ "sass": "^1.81.0"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
diff --git a/src/main/frontend/src/fonts/OpenSans-Bold-webfont.woff
b/src/main/frontend/src/fonts/OpenSans-Bold-webfont.woff
old mode 100755
new mode 100644
diff --git a/src/main/frontend/src/fonts/OpenSans-Light-webfont.woff
b/src/main/frontend/src/fonts/OpenSans-Light-webfont.woff
old mode 100755
new mode 100644
diff --git a/src/main/frontend/src/fonts/OpenSans-Regular-webfont.woff
b/src/main/frontend/src/fonts/OpenSans-Regular-webfont.woff
old mode 100755
new mode 100644
diff --git a/src/main/frontend/src/fonts/OpenSans-Semibold-webfont.woff
b/src/main/frontend/src/fonts/OpenSans-Semibold-webfont.woff
old mode 100755
new mode 100644
diff --git a/src/main/frontend/src/img/asf-logo.svg
b/src/main/frontend/src/img/asf-logo.svg
old mode 100755
new mode 100644
diff --git a/src/main/frontend/src/img/gradient.jpg
b/src/main/frontend/src/img/gradient.jpg
old mode 100755
new mode 100644
diff --git a/src/main/frontend/src/scss/_fonts.scss
b/src/main/frontend/src/scss/_fonts.scss
old mode 100755
new mode 100644
diff --git a/src/main/frontend/src/scss/_grid.scss
b/src/main/frontend/src/scss/_grid.scss
old mode 100755
new mode 100644
diff --git a/src/main/frontend/src/scss/form.scss
b/src/main/frontend/src/scss/form.scss
old mode 100755
new mode 100644
diff --git a/src/main/frontend/src/scss/index.scss
b/src/main/frontend/src/scss/index.scss
old mode 100755
new mode 100644
index bf31434..0977687
--- a/src/main/frontend/src/scss/index.scss
+++ b/src/main/frontend/src/scss/index.scss
@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@import 'fonts';
-@import 'grid';
+@use 'fonts';
+@use 'grid';
* {
box-sizing: border-box;
diff --git
a/src/main/resources/initial-content/apps/sling/starter/home/home.html.esp
b/src/main/resources/initial-content/apps/sling/starter/home/home.html.esp
old mode 100755
new mode 100644
