Skip to content

Commit

Permalink
Merge pull request #2362 from ataylorme/master
Browse files Browse the repository at this point in the history 
Use 'gulp-load-plugins' to load gulp plugins
  • Loading branch information
@erwinmombay
erwinmombay committed Mar 1, 2016
2 parents e25131f + 446c048 commit 6123d04
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 39 deletions.
71 changes: 32 additions & 39 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,22 @@

checkMinVersion();

var $$ = require('gulp-load-plugins')();
var autoprefixer = require('autoprefixer');
var babel = require('babelify');
var browserify = require('browserify');
var buffer = require('vinyl-buffer');
var closureCompile = require('./build-system/tasks/compile').closureCompile;
var cssnano = require('cssnano');
var file = require('gulp-file');
var fs = require('fs-extra');
var gulp = require('gulp-help')(require('gulp'));
var gulpWatch = require('gulp-watch');
var gulp = $$.help(require('gulp'));
var lazypipe = require('lazypipe');
var minimist = require('minimist');
var postcss = require('postcss');
var rename = require('gulp-rename');
var replace = require('gulp-replace');
var source = require('vinyl-source-stream');
var sourcemaps = require('gulp-sourcemaps');
var touch = require('touch');
var uglify = require('gulp-uglify');
var util = require('gulp-util');
var watchify = require('watchify');
var windowConfig = require('./build-system/window-config');
var wrap = require('gulp-wrap');
var internalRuntimeVersion = require('./build-system/internal-version').VERSION;
var internalRuntimeToken = require('./build-system/internal-version').TOKEN;

Expand Down Expand Up @@ -160,7 +153,7 @@ function compileCss() {
console.info('Recompiling CSS.');
return jsifyCssPromise('css/amp.css').then(function(css) {
return gulp.src('css/**.css')
.pipe(file('css.js', 'export const cssText = ' + css))
.pipe($$.file('css.js', 'export const cssText = ' + css))
.pipe(gulp.dest('build'));
});
}
Expand Down Expand Up @@ -192,7 +185,7 @@ function jsifyCssPromise(filename) {
* Enables watching for file changes in css, extensions, and examples.
*/
function watch() {
gulpWatch('css/**/*.css', function() {
$$.watch('css/**/*.css', function() {
compileCss();
});
buildExtensions({
Expand Down Expand Up @@ -231,7 +224,7 @@ function buildExtension(name, version, hasCss, options) {
// Do not set watchers again when we get called by the watcher.
var copy = Object.create(options);
copy.watch = false;
gulpWatch(path + '/*', function() {
$$.watch(path + '/*', function() {
buildExtension(name, version, hasCss, copy);
});
}
Expand Down Expand Up @@ -265,7 +258,7 @@ function buildExtensionJs(js, path, name, version, options) {
var minifiedName = name + '-' + version + '.js';
var latestName = name + '-latest.js';
return gulp.src(path + '/*.js')
.pipe(file(builtName, js))
.pipe($$.file(builtName, js))
.pipe(gulp.dest('build/all/v0/'))
.on('end', function() {
compileJs('./build/all/v0/', builtName, './dist/v0', {
Expand Down Expand Up @@ -308,17 +301,17 @@ function dist() {
*/
function buildExamples(watch) {
if (watch) {
gulpWatch('examples/*.html', function() {
$$.watch('examples/*.html', function() {
buildExamples(false);
});
}

fs.copy('examples/', 'examples.build/', {clobber: true},
function(err) {
if (err) {
return util.log(util.colors.red('copy error: ', err));
return $$.util.log($$.util.colors.red('copy error: ', err));
}
util.log(util.colors.green('copied examples to examples.build'));
$$.util.log($$.util.colors.green('copied examples to examples.build'));
});

// Also update test-example-validation.js
Expand Down Expand Up @@ -375,14 +368,14 @@ function buildExample(name) {
max = max.replace('https://cdn.ampproject.org/v0.max.js', '../dist/amp.js');
max = max.replace(/https:\/\/cdn.ampproject.org\/v0\//g, '../dist/v0/');
gulp.src(input)
.pipe(file(name.replace('.html', '.max.html'),max))
.pipe($$.file(name.replace('.html', '.max.html'),max))
.pipe(gulp.dest('examples.build/'));

var min = max;
min = min.replace(/\.max\.js/g, '.js');
min = min.replace('../dist/amp.js', '../dist/v0.js');
gulp.src(input)
.pipe(file(name.replace('.html', '.min.html'), min))
.pipe($$.file(name.replace('.html', '.min.html'), min))
.pipe(gulp.dest('examples.build/'));
}

Expand All @@ -396,7 +389,7 @@ function buildExample(name) {
function thirdPartyBootstrap(watch, shouldMinify) {
var input = '3p/frame.max.html';
if (watch) {
gulpWatch(input, function() {
$$.watch(input, function() {
thirdPartyBootstrap(false);
});
}
Expand All @@ -414,7 +407,7 @@ function thirdPartyBootstrap(watch, shouldMinify) {
// Convert default relative URL to absolute min URL.
min = min.replace(/\.\/integration\.js/g, jsPrefix + '/f.js');
gulp.src(input)
.pipe(file('frame.html', min))
.pipe($$.file('frame.html', min))
.pipe(gulp.dest('dist.3p/' + internalRuntimeVersion))
.on('end', function() {
var aliasToLatestBuild = 'dist.3p/current';
Expand Down Expand Up @@ -454,13 +447,13 @@ function compileJs(srcDir, srcFilename, destDir, options) {
var lazybuild = lazypipe()
.pipe(source, srcFilename)
.pipe(buffer)
.pipe(replace, /\$internalRuntimeVersion\$/g, internalRuntimeVersion)
.pipe(replace, /\$internalRuntimeToken\$/g, internalRuntimeToken)
.pipe(wrap, wrapper)
.pipe(sourcemaps.init.bind(sourcemaps), {loadMaps: true});
.pipe($$.replace, /\$internalRuntimeVersion\$/g, internalRuntimeVersion)
.pipe($$.replace, /\$internalRuntimeToken\$/g, internalRuntimeToken)
.pipe($$.wrap, wrapper)
.pipe($$.sourcemaps.init.bind($$.sourcemaps), {loadMaps: true});

var lazywrite = lazypipe()
.pipe(sourcemaps.write.bind(sourcemaps), './')
.pipe($$.sourcemaps.write.bind($$.sourcemaps), './')
.pipe(gulp.dest.bind(gulp), destDir);

function rebundle() {
Expand All @@ -469,18 +462,18 @@ function compileJs(srcDir, srcFilename, destDir, options) {
.on('error', function(err) {
activeBundleOperationCount--;
if (err instanceof SyntaxError) {
console.error(util.colors.red('Syntax error:', err.message));
console.error($$.util.colors.red('Syntax error:', err.message));
} else {
console.error(err);
}
})
.pipe(lazybuild())
.pipe(rename(options.toName || srcFilename))
.pipe($$.rename(options.toName || srcFilename))
.pipe(lazywrite())
.on('end', function() {
activeBundleOperationCount--;
if (activeBundleOperationCount == 0) {
console.info(util.colors.green('All current JS updates done.'));
console.info($$.util.colors.green('All current JS updates done.'));
}
});
}
Expand Down Expand Up @@ -518,10 +511,10 @@ function compileJs(srcDir, srcFilename, destDir, options) {
bundler.bundle()
.on('error', function(err) { console.error(err); this.emit('end'); })
.pipe(lazybuild())
.pipe(uglify({
.pipe($$.uglify({
preserveComments: 'some'
}))
.pipe(rename(options.minifiedName))
.pipe($$.rename(options.minifiedName))
.pipe(lazywrite())
.on('end', function() {
fs.writeFileSync(destDir + '/version.txt', internalRuntimeVersion);
Expand Down Expand Up @@ -552,9 +545,9 @@ function buildExperiments(options) {

function copyHandler(name, err) {
if (err) {
return util.log(util.colors.red('copy error: ', err));
return $$.util.log($$.util.colors.red('copy error: ', err));
}
util.log(util.colors.green('copied ' + name));
$$.util.log($$.util.colors.green('copied ' + name));
}

var path = 'tools/experiments';
Expand All @@ -572,7 +565,7 @@ function buildExperiments(options) {
// Do not set watchers again when we get called by the watcher.
var copy = Object.create(options);
copy.watch = false;
gulpWatch(path + '/*', function() {
$$.watch(path + '/*', function() {
buildExperiments(copy);
});
}
Expand All @@ -583,15 +576,15 @@ function buildExperiments(options) {
var minHtml = html.replace('../../dist.tools/experiments/experiments.max.js',
'https://cdn.ampproject.org/v0/experiments.js');
gulp.src(htmlPath)
.pipe(file('experiments.cdn.html', minHtml))
.pipe($$.file('experiments.cdn.html', minHtml))
.pipe(gulp.dest('dist.tools/experiments/'));

// Build JS.
var js = fs.readFileSync(jsPath, 'utf8');
var builtName = 'experiments.max.js';
var minifiedName = 'experiments.js';
return gulp.src(path + '/*.js')
.pipe(file(builtName, js))
.pipe($$.file(builtName, js))
.pipe(gulp.dest('build/experiments/'))
.on('end', function() {
compileJs('./build/experiments/', builtName, './dist.tools/experiments/', {
Expand Down Expand Up @@ -623,9 +616,9 @@ function buildLoginDoneVersion(version, options) {

function copyHandler(name, err) {
if (err) {
return util.log(util.colors.red('copy error: ', err));
return $$.util.log($$.util.colors.red('copy error: ', err));
}
util.log(util.colors.green('copied ' + name));
$$.util.log($$.util.colors.green('copied ' + name));
}

var path = 'extensions/amp-access/' + version + '/';
Expand All @@ -643,7 +636,7 @@ function buildLoginDoneVersion(version, options) {
// Do not set watchers again when we get called by the watcher.
var copy = Object.create(options);
copy.watch = false;
gulpWatch(path + '/*', function() {
$$.watch(path + '/*', function() {
buildLoginDoneVersion(version, copy);
});
}
Expand Down Expand Up @@ -677,7 +670,7 @@ function buildLoginDoneVersion(version, options) {
var minifiedName = 'amp-login-done-' + version + '.js';
var latestName = 'amp-login-done-latest.js';
return gulp.src(path + '/*.js')
.pipe(file(builtName, js))
.pipe($$.file(builtName, js))
.pipe(gulp.dest('build/all/v0/'))
.on('end', function() {
compileJs('./build/all/v0/', builtName, './dist/v0/', {
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"gulp-if": "2.0.0",
"gulp-image-diff": "0.3.0",
"gulp-live-server": "0.0.29",
"gulp-load-plugins": "1.2.0",
"gulp-rename": "1.2.2",
"gulp-replace": "0.5.4",
"gulp-sourcemaps": "1.5.2",
Expand Down

0 comments on commit 6123d04

Please sign in to comment.