Browse Source

Improve getWorkerSrcFiles (builder.js)

It took a while to figure out why adding comments in worker_loader.js
caused the build to fail, because getWorkerSrcFiles did not print an
error message when it failed to parse the file. These issues have been
resolved as follows:

- Leading comments are stripped.
- The trailing comma is removed from the array.
- Errors are detected and useful error messages are printed.
Rob Wu 10 years ago
parent
commit
8ba73cb4de
  1. 16
      external/builder/builder.js

16
external/builder/builder.js vendored

@ -235,8 +235,19 @@ function getWorkerSrcFiles(filePath) {
var src = fs.readFileSync(filePath).toString(); var src = fs.readFileSync(filePath).toString();
var reSrcFiles = /var\s+otherFiles\s*=\s*(\[[^\]]*\])/; var reSrcFiles = /var\s+otherFiles\s*=\s*(\[[^\]]*\])/;
var match = reSrcFiles.exec(src); var match = reSrcFiles.exec(src);
if (!match) {
throw new Error('Cannot find otherFiles array in ' + filePath);
}
var files = match[1].replace(/'/g, '"').replace(/^\s*\/\/.*/gm, '')
.replace(/,\s*]$/, ']');
try { try {
var files = JSON.parse(match[1].replace(/'/g, '"')); files = JSON.parse(files);
} catch (e) {
throw new Error('Failed to parse otherFiles in ' + filePath + ' as JSON, ' +
e);
}
var srcFiles = files.filter(function(name) { var srcFiles = files.filter(function(name) {
return name.indexOf('external') === -1; return name.indexOf('external') === -1;
}); });
@ -247,9 +258,6 @@ function getWorkerSrcFiles(filePath) {
srcFiles: srcFiles, srcFiles: srcFiles,
externalSrcFiles: externalSrcFiles externalSrcFiles: externalSrcFiles
}; };
} catch(e) {
return {};
}
} }
exports.getWorkerSrcFiles = getWorkerSrcFiles; exports.getWorkerSrcFiles = getWorkerSrcFiles;

Loading…
Cancel
Save