fix: Correct ES6 wrapper imports in static-module output (#2151)

dcodeIO · web-flow · commit 88f5a76332df · 2026-04-24T02:40:48.000+02:00
diff --git a/cli/targets/static-module.js b/cli/targets/static-module.js
@@ -18,7 +18,11 @@ function static_module_target(root, options, callback) {
             return;
         }
         try {
-            output = util.wrap(output, protobuf.util.merge({ dependency: "protobufjs/minimal" }, options));
+            output = util.wrap(output, protobuf.util.merge({
+                dependency: options.wrap === "es6"
+                    ? "protobufjs/minimal.js"
+                    : "protobufjs/minimal"
+            }, options));
         } catch (e) {
             callback(e);
             return;
diff --git a/cli/wrappers/es6.js b/cli/wrappers/es6.js
@@ -1,4 +1,4 @@
-import * as $protobuf from $DEPENDENCY;
+import $protobuf from $DEPENDENCY;
 
 $OUTPUT;
 
diff --git a/tests/cli.js b/tests/cli.js
@@ -93,6 +93,23 @@ tape.test("pbjs generates static code", function(test) {
     });
 });
 
+tape.test("pbjs generates correct ES6 static-module imports", function(test) {
+    cliTest(test, function() {
+        var root = protobuf.loadSync("tests/data/cli/test.proto");
+        root.resolveAll();
+
+        var staticModuleTarget = require("../cli/targets/static-module");
+
+        staticModuleTarget(root, {
+            wrap: "es6",
+        }, function(err, jsCode) {
+            test.error(err, "static-module code generation worked");
+            test.ok(jsCode.includes("import $protobuf from \"protobufjs/minimal.js\";"), "es6 wrapper uses a default import and explicit .js extension");
+            test.end();
+        });
+    });
+});
+
 tape.test("without null-defaults, absent optional fields have zero values", function(test) {
     cliTest(test, function() {
         var root = protobuf.loadSync("tests/data/cli/null-defaults.proto");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as $protobuf from $DEPENDENCY;`
	`1`	`+import $protobuf from $DEPENDENCY;`
`2`	`2`
`3`	`3`	`$OUTPUT;`
`4`	`4`