verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

Errores gulp solucionados

This commit is contained in:
Juan Ferrer Toribio 2017-05-17 12:07:42 +02:00
parent bdb7cf9ed3
commit a7bfd5122a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
client/client/routes.js → client/client/routes.json
View File

30
gulpfile.js
View File

@ -40,7 +40,7 @@ gulp.task('clean', function() {
var splitingFiles = './spliting/*'; var splitingFiles = './spliting/*';
gulp.task('spliting', function() { gulp.task('spliting', function(cb) {
var importTpl = fs.readFileSync('./spliting/import.tpl.js', 'utf8'); var importTpl = fs.readFileSync('./spliting/import.tpl.js', 'utf8');
var requireTpl = fs.readFileSync('./spliting/require.tpl.js', 'utf8'); var requireTpl = fs.readFileSync('./spliting/require.tpl.js', 'utf8');
@ -55,27 +55,28 @@ gulp.task('spliting', function() {
fs.appendFileSync(splitFile, importTpl); fs.appendFileSync(splitFile, importTpl);
var i = deps.length; var i = deps.length;
while (i--) { while (i--)
fs.appendFileSync(splitFile, fs.appendFileSync(splitFile,
requireTpl.replace(/\$module/g, deps[i])); requireTpl.replace(/\$module/g, deps[i]));
}
} }
cb();
}); });
// Webpack // Webpack
gulp.task('webpack', ['spliting'], function(callback) { gulp.task('webpack', ['spliting'], function(cb) {
var configCopy = Object.create(webpackConfig); var configCopy = Object.create(webpackConfig);
var compiler = webpack(configCopy); var compiler = webpack(configCopy);
compiler.run(function(err, stats) { compiler.run(function(err, stats) {
if (err) throw new gutil.PluginError('webpack', err); if (err) throw new gutil.PluginError('webpack', err);
gutil.log('[webpack]', stats.toString({colors: true})); gutil.log('[webpack]', stats.toString({colors: true}));
callback(); cb();
}); });
}); });
gulp.task('webpack-dev-server', ['spliting'], function(callback) { gulp.task('webpack-dev-server', ['spliting'], function() {
var configCopy = Object.create(webpackConfig); var configCopy = Object.create(webpackConfig);
for (var entry in configCopy.entry) { for (var entry in configCopy.entry) {
@ -124,23 +125,22 @@ gulp.task('locales', function() {
// Routes // Routes
var routeFiles = `./${srcDir}/**/routes.js`; var routeFiles = `./${srcDir}/**/routes.json`;
gulp.task('routes', function() { gulp.task('routes', function() {
var fileTpl = '\n"<%=dirname%>": <%=contents%>';
var globalTpl = 'var routes = {<%=contents%>\n}';
var regex = new RegExp('^(.*)/routes\.js$');
function cb(file) { function cb(file) {
var relative = file.relative.replace(/\\/g, '/'); var relative = file.relative.replace(/\\/g, '/');
var dirname = relative.match(regex)[1]; var dirname = relative.match(/^(.*)\/routes\.json$/)[1];
return {dirname: dirname}; return {
dirname: dirname,
json: file.contents
};
} }
return gulp.src(routeFiles) return gulp.src(routeFiles)
.pipe(wrap(fileTpl, cb)) .pipe(wrap('\n"<%=dirname%>": <%=json%>', cb))
.pipe(concat('routes.js', {newLine: ','})) .pipe(concat('routes.js', {newLine: ','}))
.pipe(wrap(globalTpl)) .pipe(wrap('var routes = {<%=contents%>\n};'))
.pipe(gulp.dest(buildDir)); .pipe(gulp.dest(buildDir));
}); });