⬆ fixed #12534

gulpfile.js

@@ -21,38 +21,32 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.6.1.0, Sep 24, 2018
+ * @version 1.7.0.0, Oct 2, 2018
  */
 
 'use strict'
-
 const gulp = require('gulp')
 const concat = require('gulp-concat')
 const uglify = require('gulp-uglify')
-const cleanCSS = require('gulp-clean-css')
-const clean = require('gulp-clean')
 const sass = require('gulp-sass')
 const rename = require('gulp-rename')
 const minifycss = require('gulp-minify-css')
-const gulpSequence = require('gulp-sequence');
-
-gulp.task('watch', function () {
-  gulp.watch('./src/main/webapp/skins/*/css/*.scss', ['sass'])
-})
+const del = require('del')
 
-gulp.task('sass', function () {
+function sassProcess () {
   return gulp.src('./src/main/webapp/skins/*/css/*.scss').
     pipe(sass().on('error', sass.logError)).
     pipe(gulp.dest('./src/main/webapp/skins/'))
-})
+}
+
+function sassProcessWatch () {
+  gulp.watch('./src/main/webapp/skins/*/css/*.scss', sassProcess)
+}
+
+gulp.task('watch', gulp.series(sassProcessWatch))
 
-gulp.task('compress', function () {
-  // min css
-  gulp.src('./src/main/webapp/js/lib/CodeMirrorEditor/codemirror.css').
-    pipe(cleanCSS()).
-    pipe(concat('codemirror.min.css')).
-    pipe(gulp.dest('./src/main/webapp/js/lib/CodeMirrorEditor/'))
 
+function miniAdmin () {
   // concat js
   const jsJqueryUpload = [
     './src/main/webapp/js/lib/jquery/jquery.min.js',
@@ -67,42 +61,48 @@ gulp.task('compress', function () {
     './src/main/webapp/js/lib/CodeMirrorEditor/editor.js',
     './src/main/webapp/js/lib/to-markdown.js',
     './src/main/webapp/js/lib/highlight.js-9.6.0/highlight.pack.js']
-  gulp.src(jsJqueryUpload).
-    pipe(uglify({output: {ascii_only:true}})). // https://github.com/b3log/solo/issues/12522
+  return gulp.src(jsJqueryUpload).
+    pipe(uglify({output: {ascii_only: true}})).
+    // https://github.com/b3log/solo/issues/12522
     pipe(concat('admin-lib.min.js')).
     pipe(gulp.dest('./src/main/webapp/js/lib/compress/'))
 
+}
+
+function miniPjax (){
   // concat js
   const jsPjax = [
     './src/main/webapp/js/lib/jquery/jquery-3.1.0.min.js',
     './src/main/webapp/js/lib/jquery/jquery.pjax.js',
     './src/main/webapp/js/lib/nprogress/nprogress.js']
-  gulp.src(jsPjax).
+  return gulp.src(jsPjax).
     pipe(uglify()).
     pipe(concat('pjax.min.js')).
     pipe(gulp.dest('./src/main/webapp/js/lib/compress/'))
-})
+}
 
-gulp.task('build', function () {
-  // minify css
-  gulp.src('./src/main/webapp/skins/*/css/*.css').
+function scripts () {
+  // minify js
+  return gulp.src('./src/main/webapp/skins/*/js/*.js').
     pipe(rename({suffix: '.min'})).
-    pipe(minifycss()).
+    pipe(uglify()).
     pipe(gulp.dest('./src/main/webapp/skins/'))
+}
 
-  // minify js
-  gulp.src('./src/main/webapp/skins/*/js/*.js').
+function styles () {
+  // minify css
+  return gulp.src('./src/main/webapp/skins/*/css/*.css').
     pipe(rename({suffix: '.min'})).
-    pipe(uglify({preserveComments: 'license'})).
+    pipe(minifycss()).
     pipe(gulp.dest('./src/main/webapp/skins/'))
-})
-
-gulp.task ('clean', function () {
-  // clean css
-  gulp.src('./src/main/webapp/skins/*/css/*.min.css').pipe(clean({force: true}));
-  // clean js
-  gulp.src('./src/main/webapp/skins/*/js/*.min.js').pipe(clean({force: true}));
-});
+}
 
+function cleanProcess () {
+  return del([
+    './src/main/webapp/skins/*/css/*.min.css',
+    './src/main/webapp/skins/*/js/*.min.js'])
+}
 
-gulp.task('default',  gulpSequence('sass', 'build', 'compress'))
\ No newline at end of file
+gulp.task('default',
+  gulp.series(cleanProcess, sassProcess, gulp.parallel(scripts, styles),
+    gulp.parallel(miniPjax, miniAdmin)))
\ No newline at end of file

package.json

@@ -14,7 +14,7 @@
   "private": true,
   "scripts": {
     "dev": "gulp watch",
-    "build": "gulp clean && gulp clean && gulp"
+    "build": "gulp"
   },
   "author": "Daniel <dl882509@gmail.com> (http://88250.b3log.org) & Vanessa <v@b3log.org> (http://vanessa.b3log.org)",
   "maintainers": [
@@ -28,15 +28,14 @@
     }
   ],
   "devDependencies": {
-    "gulp": "^3.9.1",
-    "gulp-clean": "^0.4.0",
-    "gulp-clean-css": "^2.4.0",
-    "gulp-concat": "2.6.0",
+    "del": "^3.0.0",
+    "gulp": "^4.0.0",
+    "gulp-concat": "^2.6.1",
     "gulp-minify-css": "^1.2.4",
     "gulp-rename": "^1.4.0",
     "gulp-sass": "^4.0.1",
-    "gulp-sequence": "^1.0.0",
-    "gulp-uglify": "^2.1.2",
-    "marked": "^0.3.6"
-  }
+    "gulp-uglify": "^3.0.1",
+    "marked": "^0.5.1"
+  },
+  "dependencies": {}
 }

src/main/resources/local.properties

@@ -23,18 +23,18 @@
 #
 
 #### H2 runtime ####
-runtimeDatabase=H2
-jdbc.username=root
-jdbc.password=
-jdbc.driver=org.h2.Driver
-jdbc.URL=jdbc:h2:~/solo_h2/db
+#runtimeDatabase=H2
+#jdbc.username=root
+#jdbc.password=
+#jdbc.driver=org.h2.Driver
+#jdbc.URL=jdbc:h2:~/solo_h2/db
 
 #### MySQL runtime ####
-#runtimeDatabase=MYSQL
-#jdbc.username=root
-#jdbc.password=123456
-#jdbc.driver=com.mysql.cj.jdbc.Driver
-#jdbc.URL=jdbc:mysql://localhost:3306/solo?useUnicode=yes&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+runtimeDatabase=MYSQL
+jdbc.username=root
+jdbc.password=123456
+jdbc.driver=com.mysql.cj.jdbc.Driver
+jdbc.URL=jdbc:mysql://localhost:3306/solo?useUnicode=yes&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
 
 # The minConnCnt MUST larger or equal to 3
 jdbc.minConnCnt=5