diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-02-29 10:09:56 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2016-02-29 10:09:56 -0800 |
commit | 52f62e3652ce80ab14593331f4277539e7fa29c8 (patch) | |
tree | 7fa2adc29c693ceefd0c78d094e85b4f57784476 /js/commonjs/rewrite_tests_for_commonjs.js | |
parent | 9f775a82cd1b5881ef9d32297a21946ab1ea6493 (diff) | |
parent | c9f8a1b00607be071d8be9e2bdc42ffcf97442aa (diff) | |
download | protobuf-52f62e3652ce80ab14593331f4277539e7fa29c8.tar.gz protobuf-52f62e3652ce80ab14593331f4277539e7fa29c8.tar.bz2 protobuf-52f62e3652ce80ab14593331f4277539e7fa29c8.zip |
Merge pull request #1274 from murgatroid99/node_relative_requires
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); |