Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
{
"extends": ["eslint:recommended"],
"env" : {
"env": {
"browser": true,
"node": true,
"es6": true
},
"parserOptions": {
"ecmaVersion": 2020,
"sourceType": "module"
},
"globals": {
"AOS": true
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea
.vscode
.DS_Store
node_modules
./js
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.16.0
20.18.0
33 changes: 19 additions & 14 deletions build/styles.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import dartSass from 'sass';
import * as dartSass from 'sass';
import gulpSass from 'gulp-sass';
import prefix from 'gulp-autoprefixer';
import cleanCSS from 'gulp-clean-css';
Expand All @@ -7,19 +7,24 @@ const sass = gulpSass(dartSass);
const scssPath = 'scss/*.scss';
const destPath = 'site/css';

const styles = gulp => {
gulp.task('styles', () => gulp
.src(scssPath)
.pipe(sass({
includePaths: ['scss'],
outputStyle: 'compressed'
}))
.pipe(prefix({
overrideBrowsersList: ['last 2 versions'],
cascade: false
}))
.pipe(cleanCSS({compatibility: 'ie8'}))
.pipe(gulp.dest(destPath))
const styles = (gulp) => {
gulp.task('styles', () =>
gulp
.src(scssPath)
.pipe(
sass({
includePaths: ['scss'],
style: 'compressed',
}).on('error', sass.logError)
)
.pipe(
prefix({
overrideBrowsersList: ['last 2 versions'],
cascade: false,
})
)
.pipe(cleanCSS({ compatibility: 'ie8' }))
.pipe(gulp.dest(destPath))
);
};

Expand Down
12 changes: 0 additions & 12 deletions gulpfile.esm.js

This file was deleted.

20 changes: 20 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import gulp from 'gulp';
import browsersync from './build/browsersync.js';
import build from './build/build.js';
import images from './build/images.js';
import scripts from './build/scripts.js';
import staticFiles from './build/static.js';
import styles from './build/styles.js';
import views from './build/views.js';

for (const task of [
images,
scripts,
staticFiles,
styles,
views,
build,
browsersync,
]) {
task(gulp);
}
Loading
Loading