Skip to content

Commit d9b6619

Browse files
committed
Upgrade tooling
Signed-off-by: dduportal <1522731+dduportal@users.noreply.github.com>
1 parent d8535b9 commit d9b6619

File tree

4 files changed

+22
-26
lines changed

4 files changed

+22
-26
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:11-alpine
1+
FROM node:14-alpine
22

33
LABEL Maintainers="Damien DUPORTAL<damien.duportal@gmail.com>"
44

gulp/gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ var tasks_dir_path = './tasks',
66
gulp = require('gulp'),
77
file = '',
88
plugins = {
9-
asciidoctor: require('asciidoctor.js')(),
10-
asciidoctorRevealjs: require('asciidoctor-reveal.js'),
9+
asciidoctor: require('@asciidoctor/core')(),
10+
asciidoctorRevealjs: require('@asciidoctor/reveal.js'),
1111
autoprefixer: require('gulp-autoprefixer'),
1212
browserSync: require('browser-sync').create(),
1313
csso: require('gulp-csso'),

gulp/tasks/prepare-dependencies.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ module.exports = function (gulp, plugins, current_config) {
1212
.pipe(gulp.dest(revealJsDestDir + '/js/')),
1313
zenBurnCss = gulp.src(baseRevealJSPath + '/lib/css/zenburn.css')
1414
.pipe(gulp.dest(revealJsDestDir + '/lib/css/')),
15-
headMinJs = gulp.src(baseRevealJSPath + '/lib/js/head.min.js')
16-
.pipe(gulp.dest(revealJsDestDir + '/lib/js/')),
1715
notesJs = gulp.src(baseRevealJSPath + '/plugin/notes/notes.js')
1816
.pipe(gulp.dest(revealJsDestDir + '/plugin/notes/')),
1917
markedJs = gulp.src(baseRevealJSPath + '/plugin/markdown/marked.js')
@@ -28,7 +26,6 @@ module.exports = function (gulp, plugins, current_config) {
2826
paperCSS,
2927
mainRevealJs,
3028
zenBurnCss,
31-
headMinJs,
3229
notesJs,
3330
notesHtml,
3431
zoomJs,
@@ -41,19 +38,18 @@ module.exports = function (gulp, plugins, current_config) {
4138
// so.. reusing. cf. https://github.com/hakimel/reveal.js/#dependencies
4239
/////////////////
4340
gulp.task('prepare:highlightjs', function () {
44-
var highlightNodeModule = current_config.nodeModulesDir + '/highlightjs',
41+
var highlightNodeModule = current_config.nodeModulesDir + '/highlight.js',
4542
highlightDestDir = current_config.distDir + '/reveal.js/plugin/highlight',
4643
highlightjsStyleRename = gulp.src(highlightNodeModule + '/styles/*.css')
4744
.pipe(plugins.rename(function (path) {
4845
// Removing the ".min" part of the name to avoid revealjs messing up
4946
path.basename += ".min";
5047
}))
5148
.pipe(gulp.dest(highlightDestDir + '/styles/')),
52-
highlightScriptMinified = gulp.src(highlightNodeModule + '/highlight.pack.min.js')
53-
.pipe(plugins.rename('highlight.js'))
49+
highlightScript = gulp.src(highlightNodeModule + '/lib/highlight.js')
5450
.pipe(gulp.dest(highlightDestDir));
5551

56-
return plugins.mergeStreams(highlightjsStyleRename, highlightScriptMinified);
52+
return plugins.mergeStreams(highlightjsStyleRename, highlightScript);
5753

5854
});
5955

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"name": "slides",
33
"version": "1.0.0",
4-
"description": "Containous Presentations",
5-
"repository": "https://github.com/containous/slides",
4+
"description": "Damien DUPORTAL' presentations",
5+
"repository": "https://github.com/dduportal/slides",
66
"dependencies": {
7-
"highlightjs": "^9.12.0",
8-
"reveal.js": "3.7.0",
7+
"highlight.js": "^10.1.2",
98
"font-awesome": "^4.7.0"
109
},
1110
"devDependencies": {
12-
"asciidoctor-reveal.js": "2.0.0",
13-
"browser-sync": "^2.26.3",
14-
"gulp": "4.0.0",
15-
"gulp-autoprefixer": "6.0.0",
16-
"gulp-csso": "3.0.1",
17-
"gulp-exec": "3.0.2",
18-
"gulp-ignore": "2.0.2",
19-
"gulp-rename": "1.4.0",
20-
"gulp-sass": "^4.0.2",
21-
"merge-stream": "1.0.1",
22-
"npm-check-updates": "3.1.7",
23-
"qrcode": "1.3.3"
11+
"asciidoctor": "^2.2.0",
12+
"@asciidoctor/reveal.js": "4.0.1",
13+
"browser-sync": "^2.26.12",
14+
"gulp": "4.0.2",
15+
"gulp-autoprefixer": "7.0.1",
16+
"gulp-csso": "4.0.1",
17+
"gulp-exec": "5.0.0",
18+
"gulp-ignore": "3.0.0",
19+
"gulp-rename": "2.0.0",
20+
"gulp-sass": "^4.1.0",
21+
"merge-stream": "2.0.0",
22+
"npm-check-updates": "7.0.2",
23+
"qrcode": "1.4.4"
2424
}
2525
}

0 commit comments

Comments
 (0)