diff options
author | murgatroid99 <mlumish@google.com> | 2016-02-24 13:44:57 -0800 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2016-02-24 13:44:57 -0800 |
commit | a862b6b77f49527bf1f6e1da54265d82256c4bf1 (patch) | |
tree | 3ce9fdde957b0fea1193b8384c17a15e5ac02b82 /js/commonjs/rewrite_tests_for_commonjs.js | |
parent | 8f67b165f0a949219fafc48c533be3fbf53497b7 (diff) | |
download | protobuf-a862b6b77f49527bf1f6e1da54265d82256c4bf1.tar.gz protobuf-a862b6b77f49527bf1f6e1da54265d82256c4bf1.tar.bz2 protobuf-a862b6b77f49527bf1f6e1da54265d82256c4bf1.zip |
Fix CommonJS relative require generation, and test it
Diffstat (limited to 'js/commonjs/rewrite_tests_for_commonjs.js')
-rw-r--r-- | js/commonjs/rewrite_tests_for_commonjs.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/commonjs/rewrite_tests_for_commonjs.js b/js/commonjs/rewrite_tests_for_commonjs.js index dc5effec..ffa87722 100644 --- a/js/commonjs/rewrite_tests_for_commonjs.js +++ b/js/commonjs/rewrite_tests_for_commonjs.js @@ -80,11 +80,12 @@ lineReader.on('line', function(line) { console.log("// Bring asserts into the global namespace."); console.log("googleProtobuf.object.extend(global, asserts);"); } - module = camelCase(isLoadFromFile[1]) + var module_path = isLoadFromFile[1].split('/'); + module = camelCase(module_path[module_path.length - 1]); pkg = isLoadFromFile[2]; if (module != "googleProtobuf") { // We unconditionally require this in the header. - console.log("var " + module + " = require('" + isLoadFromFile[1] + "');"); + console.log("var " + module + " = require('./" + isLoadFromFile[1] + "');"); } } else if (!isSetTestOnly) { // Remove goog.setTestOnly() lines. console.log(line); |