r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Drop yarn, upgrade to gulp 4

Browse Source
This commit is contained in:
Igor Zhukov 2019-05-09 21:38:47 +02:00
parent ba01736e7d
commit 388dd8a673
4 changed files with 16742 additions and 1241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

328
gulpfile.js
View File

@ -1,12 +1,10 @@
var packageJson = require('./package.json')
var gulp = require('gulp')
var $ = require('gulp-load-plugins')({lazy: false})
var es = require('event-stream')
var $ = require('gulp-load-plugins')({ lazy: false })
var path = require('path')
var http = require('http')
var st = require('st')
var del = require('del')
var runSequence = require('run-sequence')
var swPrecache = require('sw-precache')
var Server = require('karma').Server
@ -29,9 +27,9 @@ gulp.task('clean-templates', function () {
gulp.task('usemin-index', function () {
return gulp.src('app/index.html')
.pipe($.usemin({
html: [$.minifyHtml({empty: true})],
js: ['concat', $.ngAnnotate(), $.uglify({outSourceMap: false})],
css: ['concat', $.minifyCss({compatibility: true, keepBreaks: true})]
html: [$.minifyHtml({ empty: true })],
js: ['concat', $.ngAnnotate(), $.uglify({ outSourceMap: false })],
css: ['concat', $.minifyCss({ compatibility: true, keepBreaks: true })]
}))
.pipe(gulp.dest('dist'))
})
@ -39,8 +37,8 @@ gulp.task('usemin-index', function () {
gulp.task('usemin-badbrowser', function () {
return gulp.src('app/badbrowser.html')
.pipe($.usemin({
html: [$.minifyHtml({empty: true})],
css: ['concat', $.minifyCss({compatibility: true, keepBreaks: true})]
html: [$.minifyHtml({ empty: true })],
css: ['concat', $.minifyCss({ compatibility: true, keepBreaks: true })]
}))
.pipe(gulp.dest('dist'))
})
@ -52,16 +50,8 @@ gulp.task('imagemin', function () {
.pipe(gulp.dest('dist/img'))
})
gulp.task('less', function () {
gulp.src('app/less/*.less')
.pipe($.less({
paths: [path.join(__dirname, 'less', 'includes')]
}))
.pipe(gulp.dest('app/css'))
})
gulp.task('standard', function () {
gulp.src(['app/**/*.js', '!app/vendor/**/*', 'gulpfile.js'])
return gulp.src(['app/**/*.js', '!app/vendor/**/*', 'gulpfile.js'])
.pipe($.standard())
.pipe($.standard.reporter('default', {
breakOnError: true
@ -73,36 +63,54 @@ gulp.task('copy-images', function () {
.pipe(gulp.dest('dist/img'))
})
gulp.task('copy', function () {
return es.concat(
gulp.src(['app/favicon.ico', 'app/favicon_unread.ico', 'app/manifest.webapp', 'app/manifest.webapp.json', 'app/manifest.json', 'app/**/*worker.js'])
.pipe(gulp.dest('dist')),
gulp.src(['app/img/**/*.wav'])
.pipe(gulp.dest('dist/img')),
// gulp.src(['app/fonts/*'])
// .pipe(gulp.dest('dist/fonts')),
gulp.src(['app/js/lib/polyfill.js', 'app/js/lib/bin_utils.js'])
.pipe(gulp.dest('dist/js/lib')),
gulp.src('app/vendor/closure/long.js')
.pipe(gulp.dest('dist/vendor/closure')),
gulp.src(['app/css/desktop.css', 'app/css/mobile.css'])
.pipe(gulp.dest('dist/css')),
gulp.src('app/vendor/jsbn/jsbn_combined.js')
.pipe(gulp.dest('dist/vendor/jsbn')),
gulp.src('app/vendor/leemon_bigint/bigint.js')
.pipe(gulp.dest('dist/vendor/leemon_bigint')),
gulp.src('app/vendor/rusha/rusha.js')
.pipe(gulp.dest('dist/vendor/rusha')),
gulp.src('app/vendor/cryptoJS/crypto.js')
.pipe(gulp.dest('dist/vendor/cryptoJS')),
gulp.src(['app/nacl/mtproto_crypto.pexe', 'app/nacl/mtproto_crypto.nmf'])
.pipe(gulp.dest('dist/nacl/')),
gulp.src('app/js/background.js')
gulp.task('copy', gulp.parallel(
function () {
return gulp.src(['app/favicon.ico', 'app/favicon_unread.ico', 'app/manifest.webapp', 'app/manifest.webapp.json', 'app/manifest.json', 'app/**/*worker.js'])
.pipe(gulp.dest('dist'))
},
function () {
return gulp.src(['app/img/**/*.wav'])
.pipe(gulp.dest('dist/img'))
},
function () {
return gulp.src(['app/js/lib/polyfill.js', 'app/js/lib/bin_utils.js'])
.pipe(gulp.dest('dist/js/lib'))
},
function () {
return gulp.src('app/vendor/closure/long.js')
.pipe(gulp.dest('dist/vendor/closure'))
},
function () {
return gulp.src(['app/css/desktop.css', 'app/css/mobile.css'])
.pipe(gulp.dest('dist/css'))
},
function () {
return gulp.src('app/vendor/jsbn/jsbn_combined.js')
.pipe(gulp.dest('dist/vendor/jsbn'))
},
function () {
return gulp.src('app/vendor/leemon_bigint/bigint.js')
.pipe(gulp.dest('dist/vendor/leemon_bigint'))
},
function () {
return gulp.src('app/vendor/rusha/rusha.js')
.pipe(gulp.dest('dist/vendor/rusha'))
},
function () {
return gulp.src('app/vendor/cryptoJS/crypto.js')
.pipe(gulp.dest('dist/vendor/cryptoJS'))
},
function () {
return gulp.src(['app/nacl/mtproto_crypto.pexe', 'app/nacl/mtproto_crypto.nmf'])
.pipe(gulp.dest('dist/nacl/'))
},
function () {
return gulp.src('app/js/background.js')
.pipe(gulp.dest('dist/js'))
)
})
}
))
gulp.task('copy-locales', function () {
gulp.task('copy-locales', function (callback) {
var langpackSrc = []
var ngSrc = []
@ -110,23 +118,80 @@ gulp.task('copy-locales', function () {
langpackSrc.push('app/js/locales/' + locale + '.json')
ngSrc.push('app/vendor/angular/i18n/angular-locale_' + locale + '.js')
})
return es.concat(
gulp.src(langpackSrc)
.pipe(gulp.dest('dist/js/locales/')),
gulp.src(ngSrc)
.pipe(gulp.dest('dist/vendor/angular/i18n/'))
)
gulp.parallel(
function () {
return gulp.src(langpackSrc)
.pipe(gulp.dest('dist/js/locales/'))
},
function () {
return gulp.src(ngSrc)
.pipe(gulp.dest('dist/vendor/angular/i18n/'))
}
)(callback)
})
gulp.task('compress-dist', ['build'], function () {
return gulp.src('**/*', {cwd: path.join(process.cwd(), '/dist')})
gulp.task('clean', function () {
return del(['dist/*', 'app/js/templates.js', 'app/css/*', '!dist/.git'])
})
gulp.task('less', function () {
return gulp.src('app/less/*.less')
.pipe($.less({
paths: [path.join(__dirname, 'less', 'includes')],
javascriptEnabled: true
}))
.pipe(gulp.dest('app/css'))
})
gulp.task('disable-production', gulp.parallel(
function () {
return gulp.src('app/index.html')
.pipe($.replace(/PRODUCTION_ONLY_BEGIN-->/g, 'PRODUCTION_ONLY_BEGIN'))
.pipe($.replace(/<!--PRODUCTION_ONLY_END/g, 'PRODUCTION_ONLY_END'))
.pipe(gulp.dest('app'))
},
function () {
return gulp.src('app/**/*.js')
.pipe($.replace(/PRODUCTION_ONLY_BEGIN(\*\/)?/g, 'PRODUCTION_ONLY_BEGIN'))
.pipe($.replace(/(\/\*)?PRODUCTION_ONLY_END/g, 'PRODUCTION_ONLY_END'))
.pipe(gulp.dest('app'))
}
))
gulp.task('enable-production', gulp.parallel(
function () {
return gulp.src('app/**/*.html')
.pipe($.replace(/PRODUCTION_ONLY_BEGIN/g, 'PRODUCTION_ONLY_BEGIN-->'))
.pipe($.replace(/PRODUCTION_ONLY_END/, '<!--PRODUCTION_ONLY_END'))
.pipe(gulp.dest('app'))
},
function () {
return gulp.src('app/**/*.js')
.pipe($.replace(/PRODUCTION_ONLY_BEGIN(\*\/)?/g, 'PRODUCTION_ONLY_BEGIN*/'))
.pipe($.replace(/(\/\*)?PRODUCTION_ONLY_END/g, '/*PRODUCTION_ONLY_END'))
.pipe(gulp.dest('app'))
}
))
gulp.task('build', gulp.series(
'clean',
gulp.parallel('less', 'templates'),
'enable-production',
'usemin-index',
'usemin-badbrowser',
gulp.parallel('copy', 'copy-locales', 'copy-images', 'disable-production'),
'clean-templates'
))
gulp.task('compress-dist', gulp.series('build', function () {
return gulp.src('**/*', { cwd: path.join(process.cwd(), '/dist') })
.pipe($.zip('webogram_v' + packageJson.version + '.zip'))
.pipe(gulp.dest('releases'))
})
}))
gulp.task('cleanup-dist', ['compress-dist'], function () {
gulp.task('cleanup-dist', gulp.series('compress-dist', function () {
return del(['releases/**/*', '!releases/*.zip'])
})
}))
gulp.task('bump-version-manifests', function () {
return gulp.src(['app/manifest.webapp', 'app/manifest.json'])
@ -146,32 +211,6 @@ gulp.task('bump-version-comments', function () {
.pipe(gulp.dest('app'))
})
gulp.task('enable-production', function () {
return es.concat(
gulp.src('app/**/*.html')
.pipe($.replace(/PRODUCTION_ONLY_BEGIN/g, 'PRODUCTION_ONLY_BEGIN-->'))
.pipe($.replace(/PRODUCTION_ONLY_END/, '<!--PRODUCTION_ONLY_END'))
.pipe(gulp.dest('app')),
gulp.src('app/**/*.js')
.pipe($.replace(/PRODUCTION_ONLY_BEGIN(\*\/)?/g, 'PRODUCTION_ONLY_BEGIN*/'))
.pipe($.replace(/(\/\*)?PRODUCTION_ONLY_END/g, '/*PRODUCTION_ONLY_END'))
.pipe(gulp.dest('app'))
)
})
gulp.task('disable-production', function () {
return es.concat(
gulp.src('app/index.html')
.pipe($.replace(/PRODUCTION_ONLY_BEGIN-->/g, 'PRODUCTION_ONLY_BEGIN'))
.pipe($.replace(/<!--PRODUCTION_ONLY_END/g, 'PRODUCTION_ONLY_END'))
.pipe(gulp.dest('app')),
gulp.src('app/**/*.js')
.pipe($.replace(/PRODUCTION_ONLY_BEGIN(\*\/)?/g, 'PRODUCTION_ONLY_BEGIN'))
.pipe($.replace(/(\/\*)?PRODUCTION_ONLY_END/g, 'PRODUCTION_ONLY_END'))
.pipe(gulp.dest('app'))
)
})
var fileGlobs = [
'./dist/**/*',
'!dist/manifest.*',
@ -192,16 +231,16 @@ function writeServiceWorkerFile (rootDir, handleFetch, callback) {
importScripts: ['js/lib/push_worker.js'],
verbose: true,
maximumFileSizeToCacheInBytes: 3004152, // about 3MB, default is "2097152" 2MB,
navigateFallback: "index.html",
navigateFallback: 'index.html'
}
swPrecache.write(path.join(rootDir, 'service_worker.js'), config, callback)
}
gulp.task('generate-service-worker', ['build'], function (callback) {
gulp.task('generate-service-worker', gulp.series('build', function (callback) {
writeServiceWorkerFile('dist', true, callback)
})
}))
gulp.task('add-appcache-manifest', ['build'], function () {
gulp.task('add-appcache-manifest', gulp.series('build', function () {
return gulp.src(fileGlobs)
.pipe($.manifest({
timestamp: false,
@ -210,74 +249,83 @@ gulp.task('add-appcache-manifest', ['build'], function () {
filename: 'webogram.appcache',
exclude: ['webogram.appcache', 'app.manifest']
})
)
)
.pipe(gulp.dest('./dist'))
})
}))
gulp.task('package-dev', function () {
return es.concat(
gulp.src('app/partials/*.html')
gulp.task('package-dev', gulp.parallel(
function () {
return gulp.src('app/partials/*.html')
.pipe($.angularTemplatecache('templates.js', {
root: 'partials',
module: 'myApp.templates',
standalone: true
}))
.pipe(gulp.dest('dist_package/js')),
gulp.src(['app/favicon.ico', 'app/favicon_unread.ico', 'app/manifest.webapp', 'app/manifest.json'])
.pipe(gulp.dest('dist_package')),
gulp.src(['app/css/**/*'])
.pipe(gulp.dest('dist_package/css')),
gulp.src(['app/img/**/*'])
.pipe(gulp.dest('dist_package/img')),
gulp.src('app/vendor/**/*')
.pipe(gulp.dest('dist_package/vendor')),
gulp.src('app/**/*.json')
.pipe(gulp.dest('dist_package')),
gulp.src('app/**/*.html')
.pipe(gulp.dest('dist_package/js'));
},
function () {
return gulp.src(['app/favicon.ico', 'app/favicon_unread.ico', 'app/manifest.webapp', 'app/manifest.json'])
.pipe(gulp.dest('dist_package'));
},
function () {
return gulp.src(['app/css/**/*'])
.pipe(gulp.dest('dist_package/css'));
},
function () {
return gulp.src(['app/img/**/*'])
.pipe(gulp.dest('dist_package/img'));
},
function () {
return gulp.src('app/vendor/**/*')
.pipe(gulp.dest('dist_package/vendor'));
},
function () {
return gulp.src('app/**/*.json')
.pipe(gulp.dest('dist_package'));
},
function () {
return gulp.src('app/**/*.html')
.pipe($.replace(/PRODUCTION_ONLY_BEGIN/g, 'PRODUCTION_ONLY_BEGIN-->'))
.pipe($.replace(/PRODUCTION_ONLY_END/, '<!--PRODUCTION_ONLY_END'))
.pipe(gulp.dest('dist_package')),
.pipe(gulp.dest('dist_package'));
},
gulp.src('app/**/*.js')
function () {
return gulp.src('app/**/*.js')
.pipe($.ngAnnotate())
.pipe($.replace(/PRODUCTION_ONLY_BEGIN(\*\/)?/g, 'PRODUCTION_ONLY_BEGIN*/'))
.pipe($.replace(/(\/\*)?PRODUCTION_ONLY_END/g, '/*PRODUCTION_ONLY_END'))
.pipe(gulp.dest('dist_package'))
)
})
.pipe(gulp.dest('dist_package'));
}
)
)
gulp.task('watchcss', function () {
gulp.src('app/css/*.css')
return gulp.src('app/css/*.css')
.pipe($.livereload())
})
gulp.task('watchhtml', function () {
gulp.src('app/partials/**/*.html')
return gulp.src('app/partials/**/*.html')
.pipe($.livereload())
})
gulp.task('watch', ['server', 'less'], function () {
$.livereload.listen({ basePath: 'app' })
gulp.watch('app/css/*.css', ['watchcss'])
gulp.watch('app/less/**/*.less', ['less'])
gulp.watch('app/partials/**/*.html', ['watchhtml'])
})
gulp.task('server', function (done) {
http.createServer(
st({ path: __dirname, index: 'index.html', cache: false })
).listen(8000, done)
})
gulp.task('clean', function () {
return del(['dist/*', 'app/js/templates.js', 'app/css/*', '!dist/.git'])
})
gulp.task('watch', gulp.series(gulp.parallel('server', 'less'), function () {
$.livereload.listen({ basePath: 'app' })
gulp.watch('app/css/*.css', gulp.series('watchcss'))
gulp.watch('app/less/**/*.less', gulp.series('less'))
gulp.watch('app/partials/**/*.html', gulp.series('watchhtml'))
}))
gulp.task('bump', ['bump-version-manifests', 'bump-version-config'], function () {
gulp.task('bump', gulp.series(gulp.parallel('bump-version-manifests', 'bump-version-config'), function () {
gulp.start('bump-version-comments')
})
}))
// Single run of karma
gulp.task('karma-single', function (done) {
@ -294,39 +342,17 @@ gulp.task('karma-tdd', function (done) {
}, done).start()
})
gulp.task('test', function (callback) {
runSequence(
'templates', 'karma-single', 'clean-templates',
callback
)
})
gulp.task('test', gulp.series('templates', 'karma-single', 'clean-templates'))
gulp.task('tdd', function (callback) {
runSequence(
'templates', 'karma-tdd',
callback
)
})
gulp.task('tdd', gulp.series('templates', 'karma-tdd'))
gulp.task('build', ['clean'], function (callback) {
runSequence(
['less', 'templates'],
'enable-production',
'usemin-index',
'usemin-badbrowser',
['copy', 'copy-locales', 'copy-images', 'disable-production'],
'clean-templates',
callback
)
})
gulp.task('package', gulp.series('cleanup-dist'))
gulp.task('package', ['cleanup-dist'])
gulp.task('publish', ['add-appcache-manifest', 'generate-service-worker'])
gulp.task('publish', gulp.series('add-appcache-manifest', 'generate-service-worker'))
gulp.task('deploy', function () {
return gulp.src('./dist/**/*')
.pipe($.ghPages())
})
gulp.task('default', ['build'])
gulp.task('default', gulp.series('build'))

13529
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

21
package.json
View File

@ -44,17 +44,16 @@
],
"homepage": "http://zhukov.github.io/webogram",
"devDependencies": {
"del": "^1.2.0",
"event-stream": "~3.1.0",
"gulp": "^3.9.0",
"del": "^4.1.1",
"gulp": "^4.0.2",
"gulp-angular-templatecache": "^1.1.0",
"gulp-concat": "^2.1.7",
"gulp-gh-pages": "^0.5.4",
"gulp-grep-stream": "0.0.2",
"gulp-imagemin": "^2.3.0",
"gulp-less": "^3.0.5",
"gulp-livereload": "^3.8.1",
"gulp-load-plugins": "^0.4.0",
"gulp-imagemin": "^5.0.3",
"gulp-less": "^4.0.1",
"gulp-livereload": "^4.0.1",
"gulp-load-plugins": "^1.5.0",
"gulp-manifest": "0.1.1",
"gulp-minify-css": "^0.3.12",
"gulp-minify-html": "^0.1.1",
@ -63,17 +62,16 @@
"gulp-rev": "^1.1.0",
"gulp-standard": "^7.0.1",
"gulp-uglify": "^1.0.2",
"gulp-usemin": "=0.3.11",
"gulp-usemin": "^0.3.29",
"gulp-util": "^3.0.7",
"gulp-zip": "^0.1.2",
"http": "0.0.0",
"jasmine-core": "^2.5.2",
"karma": "^1.3.0",
"karma": "^4.1.0",
"karma-coverage": "^1.1.1",
"karma-jasmine": "^1.1.0",
"karma-phantomjs-launcher": "^1.0.2",
"phantomjs-prebuilt": "^2.1.14",
"run-sequence": "^1.0.2",
"st": ">=1.2.2",
"sw-precache": "^3.2.0"
},
@ -83,5 +81,6 @@
"$",
"chrome"
]
}
},
"dependencies": {}
}

4105
yarn.lock
View File

File diff suppressed because it is too large Load Diff