Browse Source

Merge pull request #7251 from yurydelendik/force-defines

Makes defines parameter non-optional in createBundle.
Yury Delendik 9 years ago
parent
commit
11a2282b95
  1. 8
      gulpfile.js

8
gulpfile.js

@ -123,8 +123,6 @@ function bundle(filename, outfilename, pathPrefix, initFiles, amdName, defines,
} }
function createBundle(defines) { function createBundle(defines) {
defines = defines || DEFINES;
var versionJSON = JSON.parse( var versionJSON = JSON.parse(
fs.readFileSync(BUILD_DIR + 'version.json').toString()); fs.readFileSync(BUILD_DIR + 'version.json').toString());
@ -319,14 +317,14 @@ gulp.task('bundle-singlefile', ['buildnumber'], function () {
gulp.task('bundle-generic', ['buildnumber'], function () { gulp.task('bundle-generic', ['buildnumber'], function () {
var defines = builder.merge(DEFINES, {GENERIC: true}); var defines = builder.merge(DEFINES, {GENERIC: true});
return streamqueue({ objectMode: true }, return streamqueue({ objectMode: true },
createBundle(), createWebBundle(defines)) createBundle(defines), createWebBundle(defines))
.pipe(gulp.dest(BUILD_DIR)); .pipe(gulp.dest(BUILD_DIR));
}); });
gulp.task('bundle-minified', ['buildnumber'], function () { gulp.task('bundle-minified', ['buildnumber'], function () {
var defines = builder.merge(DEFINES, {MINIFIED: true, GENERIC: true}); var defines = builder.merge(DEFINES, {MINIFIED: true, GENERIC: true});
return streamqueue({ objectMode: true }, return streamqueue({ objectMode: true },
createBundle(), createWebBundle(defines)) createBundle(defines), createWebBundle(defines))
.pipe(gulp.dest(BUILD_DIR)); .pipe(gulp.dest(BUILD_DIR));
}); });
@ -336,7 +334,7 @@ gulp.task('bundle-components', ['buildnumber'], function () {
}); });
gulp.task('bundle', ['buildnumber'], function () { gulp.task('bundle', ['buildnumber'], function () {
return createBundle().pipe(gulp.dest(BUILD_DIR)); return createBundle(DEFINES).pipe(gulp.dest(BUILD_DIR));
}); });
gulp.task('server', function (done) { gulp.task('server', function (done) {

Loading…
Cancel
Save