Skip to content

Commit 347a9a9

Browse files
durrankangas
authored andcommitted
INT-1316 Allow generateTemplates to receive multiargs
(cherry picked from commit f3b2243)
1 parent b540b69 commit 347a9a9

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
]
2525
},
2626
"scripts": {
27-
"prestart": "node scripts/templatize.js && node scripts/prestart.js",
27+
"prestart": "node scripts/prestart.js",
2828
"start": "node scripts/start.js",
2929
"//": "Run only the fast unit tests",
3030
"pretest": "node scripts/templatize.js",

scripts/prestart.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ var format = require('util').format;
3636
var run = require('electron-installer-run');
3737
var checkPython = require('check-python');
3838
var async = require('async');
39+
var generateTemplates = require('./templatize');
3940

4041
function checkNpmAndNodejs(done) {
4142
run('npm', ['version', '--json', '--loglevel', 'error'], {
@@ -77,7 +78,8 @@ function main() {
7778
cli.spinner('verifying current environment meets requirements');
7879
async.series([
7980
checkPython,
80-
checkNpmAndNodejs
81+
checkNpmAndNodejs,
82+
generateTemplates
8183
], function(err) {
8284
cli.abortIfError(err);
8385
cli.debug('Environment verified as sane!');

scripts/templatize.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@ var path = require('path');
33
var createCLI = require('mongodb-js-cli');
44
var cli = createCLI('mongodb-compass:scripts:templatize');
55

6-
function generateTemplates(CONFIG, done) {
6+
function generateTemplates(config, done) {
7+
var callback = done;
8+
if (typeof config === 'function') {
9+
callback = config;
10+
}
711
var appdir = path.join(__dirname, '..', 'src', 'app');
8-
templatizer(appdir, path.join(appdir, 'templates.js'), done);
12+
templatizer(appdir, path.join(appdir, 'templates.js'), callback);
913
}
1014

1115
module.exports = generateTemplates;
1216

1317
function main() {
14-
generateTemplates({}, function() {
18+
generateTemplates(function() {
1519
cli.debug('Generated jade template functions.');
1620
});
1721
}

0 commit comments

Comments
 (0)