Parcourir la source

Tweak our JavaScript rewrites a bit to handle jspb.* imports.

Joshua Haberman il y a 4 ans
Parent
commit
e8aa635397
1 fichiers modifiés avec 2 ajouts et 0 suppressions
  1. 2 0
      js/commonjs/rewrite_tests_for_commonjs.js

+ 2 - 0
js/commonjs/rewrite_tests_for_commonjs.js

@@ -80,6 +80,8 @@ lineReader.on('line', function(line) {
   if (isRequire) {
     if (module) {  // Skip goog.require() lines before the first directive.
       var fullSym = isRequire[1];
+      // Skip lines importing from jspb.*, these are handled by the header above.
+      if (fullSym.match(/^jspb\./)) return;
       var sym = tryStripPrefix(fullSym, pkg);
       console.log("googleProtobuf.exportSymbol('" + fullSym + "', " + module + sym + ', global);');
     }