Sync from Piper @359788468

PROTOBUF_SYNC_PIPER

Author: haberman

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);');
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-protobuf",
-  "version": "3.14.0",
+  "version": "3.15.2",
   "description": "Protocol Buffers for JavaScript",
   "main": "google-protobuf.js",
   "files": [

src/google/protobuf/compiler/js/js_generator.cc

@@ -1628,7 +1628,7 @@ void Generator::GenerateHeader(const GeneratorOptions& options,
       " * @fileoverview\n"
       " * @enhanceable\n"
       // TODO(b/152440355): requireType/requires diverged from internal version.
-      " * @suppress {missingRequire} reports error on implict type usages.\n"
+      " * @suppress {missingRequire} reports error on implicit type usages.\n"
       " * @suppress {messageConventions} JS Compiler reports an "
       "error if a variable or\n"
       " *     field starts with 'MSG_' and isn't a translatable "