From 7a5c55a27cafe8f181112937d92d69a1f367efa0 Mon Sep 17 00:00:00 2001
From: Kushagra Gour <chinchang457@gmail.com>
Date: Tue, 19 Jun 2018 10:49:26 +0530
Subject: [PATCH] gulp: add task to concat sw-registrations and fix fixIndex
task
---
gulpfile.js | 131 ++++++++++++++++++++++++++++++++++-----------------
package.json | 1 +
2 files changed, 89 insertions(+), 43 deletions(-)
diff --git a/gulpfile.js b/gulpfile.js
index 96eb60f..cac9e46 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -5,7 +5,8 @@ const gulp = require('gulp');
const runSequence = require('run-sequence');
const useref = require('gulp-useref');
const cleanCSS = require('gulp-clean-css');
-const rename = require("gulp-rename");
+const rename = require('gulp-rename');
+const concat = require('gulp-concat');
const babelMinify = require('babel-minify');
const child_process = require('child_process');
const merge = require('merge-stream');
@@ -18,84 +19,127 @@ function minifyJs(fileName) {
`[${fileName}]: ${content.length}kb -> ${minifiedContent.length}kb`
);
}
-gulp.task('runWebpack', function () {
+gulp.task('runWebpack', function() {
return child_process.execSync('yarn run build');
});
-gulp.task('copyFiles', function () {
+gulp.task('copyFiles', function() {
return merge(
gulp
- .src('src/lib/codemirror/theme/*')
- .pipe(gulp.dest('app/lib/codemirror/theme')),
+ .src('src/lib/codemirror/theme/*')
+ .pipe(gulp.dest('app/lib/codemirror/theme')),
gulp
- .src('src/lib/codemirror/mode/**/*')
- .pipe(gulp.dest('app/lib/codemirror/mode')),
+ .src('src/lib/codemirror/mode/**/*')
+ .pipe(gulp.dest('app/lib/codemirror/mode')),
gulp.src('src/lib/transpilers/*').pipe(gulp.dest('app/lib/transpilers')),
gulp.src('src/lib/screenlog.js').pipe(gulp.dest('app/lib')),
- gulp.src('src/preview.html').pipe(gulp.dest('app')),
- gulp.src('src/detached-window.js').pipe(gulp.dest('app')),
- gulp.src('src/icon-48.png').pipe(gulp.dest('app')),
- gulp.src('src/icon-128.png').pipe(gulp.dest('app')),
- gulp.src('src/patreon.png').pipe(gulp.dest('app')),
- gulp.src('build/bundle.*.js').pipe(rename("script.js")).pipe(gulp.dest('app')),
- gulp.src('build/vendor.*.js').pipe(rename("vendor.js")).pipe(gulp.dest('app')),
+ gulp
+ .src([
+ 'src/preview.html',
+ 'src/detached-window.js',
+ 'src/icon-48.png',
+ 'src/icon-128.png',
+ 'src/patreon.png'
+ ])
+ .pipe(gulp.dest('app')),
- gulp.src('src/lib/codemirror/lib/codemirror.css').pipe(gulp.dest('build/lib/codemirror/lib')),
- gulp.src('src/lib/codemirror/addon/hint/show-hint.css').pipe(gulp.dest('build/lib/codemirror/addon/hint')),
- gulp.src('src/lib/codemirror/addon/fold/foldgutter.css').pipe(gulp.dest('build/lib/codemirror/addon/fold')),
- gulp.src('src/lib/codemirror/addon/dialog/dialog.css').pipe(gulp.dest('build/lib/codemirror/addon/dialog')),
+ gulp
+ .src('build/bundle.*.js')
+ .pipe(rename('script.js'))
+ .pipe(gulp.dest('app')),
+ gulp
+ .src('build/vendor.*.js')
+ .pipe(rename('vendor.js'))
+ .pipe(gulp.dest('app')),
+
+ // Following CSS are copied to build/ folder where they'll be referenced by
+ // useRef plugin to concat into one.
+ gulp
+ .src('src/lib/codemirror/lib/codemirror.css')
+ .pipe(gulp.dest('build/lib/codemirror/lib')),
+ gulp
+ .src('src/lib/codemirror/addon/hint/show-hint.css')
+ .pipe(gulp.dest('build/lib/codemirror/addon/hint')),
+ gulp
+ .src('src/lib/codemirror/addon/fold/foldgutter.css')
+ .pipe(gulp.dest('build/lib/codemirror/addon/fold')),
+ gulp
+ .src('src/lib/codemirror/addon/dialog/dialog.css')
+ .pipe(gulp.dest('build/lib/codemirror/addon/dialog')),
gulp.src('src/lib/hint.min.css').pipe(gulp.dest('build/lib')),
gulp.src('src/lib/inlet.css').pipe(gulp.dest('build/lib')),
gulp.src('src/style.css').pipe(gulp.dest('build')),
gulp
- .src([
- 'src/FiraCode.ttf',
- 'src/FixedSys.ttf',
- 'src/Inconsolata.ttf',
- 'src/Monoid.ttf'
- ])
- .pipe(gulp.dest('app'))
+ .src([
+ 'src/FiraCode.ttf',
+ 'src/FixedSys.ttf',
+ 'src/Inconsolata.ttf',
+ 'src/Monoid.ttf'
+ ])
+ .pipe(gulp.dest('app'))
);
});
-gulp.task('useRef', function () {
+gulp.task('useRef', function() {
return gulp
.src('build/index.html')
.pipe(useref())
.pipe(gulp.dest('app'));
});
-gulp.task('minify', function () {
- // minifyJs('app/script.js');
+gulp.task('concatSwRegistration', function() {
+ gulp
+ .src(['app/service-worker-registration.js', 'app/script.js'])
+ .pipe(concat('script.js'))
+ .pipe(gulp.dest('app'));
+});
+
+gulp.task('minify', function() {
+ minifyJs('app/script.js');
// minifyJs('app/vendor.js');
minifyJs('app/lib/screenlog.js');
gulp
.src('app/*.css')
.pipe(
- cleanCSS({
- debug: true
- }, details => {
- console.log(`${details.name}: ${details.stats.originalSize}`);
- console.log(`${details.name}: ${details.stats.minifiedSize}`);
- })
+ cleanCSS(
+ {
+ debug: true
+ },
+ details => {
+ console.log(`${details.name}: ${details.stats.originalSize}`);
+ console.log(`${details.name}: ${details.stats.minifiedSize}`);
+ }
+ )
)
.pipe(gulp.dest('app'));
});
-gulp.task('fixIndex', function () {
+gulp.task('fixIndex', function() {
var contents = fs.readFileSync('build/index.html', 'utf8');
- contents = contents.replace(/\<\!\-\- SCRIPT-TAGS \-\-\>[\S\s]*?\<\!\-\- END-SCRIPT-TAGS \-\-\>/, '<script defer src="vendor.js"></script><script defer src="script.js"></script>');
+ // Replace hashed-filename script tags with unhashed ones
+ contents = contents.replace(
+ /\<\!\-\- SCRIPT-TAGS \-\-\>[\S\s]*?\<\!\-\- END-SCRIPT-TAGS \-\-\>/,
+ '<script defer src="vendor.js"></script><script defer src="script.js"></script>'
+ );
+
+ // vendor.hash.js gets created outside our markers, so remove it
+ contents = contents.replace(
+ /\<script src="\/vendor\.[\S\s]*?\<\/script\>/,
+ ''
+ );
+
fs.writeFileSync('build/index.html', contents, 'utf8');
});
-gulp.task('generate-service-worker', function (callback) {
+gulp.task('generate-service-worker', function(callback) {
var swPrecache = require('sw-precache');
var rootDir = 'app';
swPrecache.write(
- `${rootDir}/service-worker.js`, {
+ `${rootDir}/service-worker.js`,
+ {
staticFileGlobs: [
rootDir + '/**/*.{js,html,css,png,jpg,gif,svg,eot,ttf,woff}'
],
@@ -108,28 +152,29 @@ gulp.task('generate-service-worker', function (callback) {
);
});
-gulp.task('cleanup', function () {
+gulp.task('cleanup', function() {
return child_process.execSync('rm -rf build');
});
-gulp.task('release', function (callback) {
+gulp.task('release', function(callback) {
runSequence(
'runWebpack',
'copyFiles',
'fixIndex',
'useRef',
+ 'concatSwRegistration',
'minify',
'generate-service-worker',
'cleanup',
- function (error) {
+ function(error) {
if (error) {
console.log(error.message);
} else {
console.log('RELEASE FINISHED SUCCESSFULLY');
}
callback(error);
- });
+ }
+ );
});
-
// gulp.task('default', ['generate-service-worker']);
diff --git a/package.json b/package.json
index 88d9fd3..c9a8583 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
"eslint-config-synacor": "^2.0.2",
"gulp": "^3.9.1",
"gulp-clean-css": "^3.9.2",
+ "gulp-concat": "^2.6.1",
"gulp-rename": "^1.3.0",
"gulp-uglify": "^3.0.0",
"gulp-useref": "^3.1.3",