Skip to content

Commit c135995

Browse files
author
Przemysław Szejna
committed
fix: dependencies and gulp 4 tasks
1 parent fbcbaf6 commit c135995

File tree

7 files changed

+4649
-23843
lines changed

7 files changed

+4649
-23843
lines changed

.github/workflows/push.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup
1515
uses: actions/setup-node@v1
1616
with:
17-
node-version: '10.x'
17+
node-version: '16.x'
1818
- uses: actions/cache@v1
1919
id: yarn-cache
2020
with:
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup
3737
uses: actions/setup-node@v1
3838
with:
39-
node-version: '10.x'
39+
node-version: '16.x'
4040
- uses: actions/cache@v1
4141
id: yarn-cache
4242
with:
@@ -50,7 +50,7 @@ jobs:
5050
- name: test
5151
run: yarn test
5252

53-
notify:
53+
notify:
5454
name: Notify
5555
runs-on: ubuntu-latest
5656
if: always()
@@ -79,7 +79,7 @@ jobs:
7979
- name: Setup
8080
uses: actions/setup-node@v1
8181
with:
82-
node-version: '10.x'
82+
node-version: '16.x'
8383
- uses: actions/cache@v1
8484
id: yarn-cache
8585
with:
@@ -96,4 +96,3 @@ jobs:
9696
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9797
run: yarn release
9898

99-

gulpfile.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,51 @@ const DOCS_COMMAND = process.env.DOCS_COMMAND || 'yarn docs'
22
const DOCS_OUTPUT = process.env.DOCS_OUTPUT || '../docs'
33

44
const gulp = require('gulp')
5-
const sass = require('gulp-sass')
5+
const sass = require('gulp-sass')(require('sass'))
66
const autoprefixer = require('gulp-autoprefixer')
7-
const run = require('gulp-run')
87
const babel = require('gulp-babel')
98
const uglify = require('gulp-uglify')
109
const rename = require('gulp-rename')
1110
const concat = require('gulp-concat')
1211
const path = require('path')
1312
const browserSync = require('browser-sync').create()
13+
const exec = require('child_process').exec;
1414

15-
gulp.task('sass', () => {
15+
gulp.task('sass', () =>
1616
gulp.src('styles/app.sass')
1717
.pipe(sass({
1818
outputStyle: 'compressed',
1919
}))
2020
.pipe(autoprefixer())
21-
.pipe(rename({ suffix: '.min' }))
21+
.pipe(rename({suffix: '.min'}))
2222
.pipe(gulp.dest('static/styles'))
23-
})
23+
)
2424

25-
gulp.task('js', () => {
26-
gulp.src(path.join('scripts/', '*.js'), { base: 'app' })
25+
gulp.task('js', () =>
26+
gulp.src(path.join('scripts/', '*.js'), {base: 'app'})
2727
.pipe(concat('app.js'))
2828
.pipe(babel({
29-
presets: ['@babel/env'],
29+
presets: ['@babel/preset-env'],
3030
}))
3131
.pipe(uglify())
32-
.pipe(rename({ suffix: '.min' }))
32+
.pipe(rename({suffix: '.min'}))
3333
.pipe(gulp.dest('static/scripts'))
34-
})
34+
)
3535

36-
gulp.task('docs', function() {
37-
return run(`cd .. && ${DOCS_COMMAND}`).exec()
38-
})
36+
gulp.task('docs', (cb) => exec(`cd .. && ${DOCS_COMMAND}`, cb))
3937

40-
gulp.task('watch', () => {
41-
gulp.watch('styles/**/*.sass', ['sass', 'docs'])
42-
gulp.watch('scripts/**/*.js', ['js', 'docs'])
43-
gulp.watch('tmpl/**/*.tmpl', ['docs'])
44-
gulp.watch('publish.js', ['docs'])
38+
gulp.task('watch', function () {
39+
gulp.watch('styles/**/*.sass', gulp.series(['sass', 'docs']))
40+
gulp.watch('scripts/**/*.js', gulp.series(['js', 'docs']))
41+
gulp.watch('tmpl/**/*.tmpl', gulp.series(['docs']))
42+
gulp.watch('publish.js', gulp.series(['docs']))
4543
if (process.env.DOCS) {
4644
const array = [
4745
...process.env.DOCS.split(','),
4846
...process.env.DOCS.split(',').map(src => '!' + src.replace('**/*', 'node_modules/**/*'))
4947
]
5048
console.log(array)
51-
gulp.watch(array, ['docs'])
49+
gulp.watch(array, gulp.series(['docs']))
5250
}
5351
})
5452

@@ -57,8 +55,10 @@ gulp.task('sync', () => {
5755
server: {
5856
baseDir: DOCS_OUTPUT
5957
}
60-
})
61-
gulp.watch(`${DOCS_OUTPUT}/*`).on('change', browserSync.reload)
58+
});
59+
60+
return gulp.watch(`${DOCS_OUTPUT}/*`, gulp.series([browserSync.reload]))
6261
})
6362

64-
gulp.task('default', ['sass', 'js', 'docs', 'watch', 'sync'])
63+
gulp.task('default', gulp.series(['sass', 'js', 'docs', gulp.parallel(['watch', 'sync'])]))
64+

0 commit comments

Comments
 (0)