Skip to content

feat(build): auto format the generated dart code. #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tbosch wants to merge 1 commit into from
Closed

feat(build): auto format the generated dart code. #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ var pubbuild = require('./tools/build/pubbuild');
var dartanalyzer = require('./tools/build/dartanalyzer');
var jsserve = require('./tools/build/jsserve');
var pubserve = require('./tools/build/pubserve');
var rundartpackage = require('./tools/build/rundartpackage');
var karma = require('karma').server;
var minimist = require('minimist');

Expand Down Expand Up @@ -166,6 +167,10 @@ var CONFIG = {
},
pubspec: {
src: 'modules/*/pubspec.yaml'
},
formatDart: {
packageName: 'dart_style',
args: ['dart_style:format', '-w', 'dist/dart']
}
};

Expand Down Expand Up @@ -310,6 +315,15 @@ gulp.task('build/pubbuild.dart', pubbuild(gulp, gulpPlugins, {
command: DART_SDK.PUB
}));

// ------------
// format dart

gulp.task('build/format.dart', rundartpackage(gulp, gulpPlugins, {
pub: DART_SDK.PUB,
packageName: CONFIG.formatDart.packageName,
args: CONFIG.formatDart.args
}));

// ------------------
// web servers
gulp.task('serve.js.dev', jsserve(gulp, gulpPlugins, {
Expand Down Expand Up @@ -430,7 +444,8 @@ gulp.task('build.dart', function() {
['build/deps.js.dart2js', 'build/transpile.dart', 'build/html.dart'],
'build/pubspec.dart',
'build/pubbuild.dart',
'build/analyze.dart'
'build/analyze.dart',
'build/format.dart'
);
});

Expand Down
44 changes: 44 additions & 0 deletions tools/build/rundartpackage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
var util = require('./util');
var Q = require('q');
var spawn = require('child_process').spawn;
var readline = require('readline');

module.exports = function(gulp, plugins, config) {
return function() {
return isInstalled().then(function(installed) {
if (!installed) {
return util.processToPromise(spawn(config.pub,
['global', 'activate', config.packageName, '--no-executables'], {
stdio: 'inherit'
}));
}
}).then(function() {
return util.processToPromise(spawn(config.pub, ['global', 'run'].concat(config.args), {
stdio: 'inherit'
}));
});
};

function isInstalled() {
var subProcess = spawn(config.pub, ['global', 'list'], {
// inherit stdin and stderr, but filter stdout
stdio: [process.stdin, 'pipe', process.stderr]
});
var rl = readline.createInterface({
input: subProcess.stdout,
output: process.stdout,
terminal: false
});
var found = false;
rl.on('line', function(line) {
if (line.indexOf(config.packageName) !== -1) {
found = true;
}
console.log(line);
});
return util.processToPromise(subProcess).then( function() {
return found;
});
}

};