Fix protoc-gen-js situation so we can finally move to recent protoc v…

…ersions Thanks to protocolbuffers/protobuf-javascript#127 (comment)
tnyim · Mar 17, 2023 · 9822bce · 9822bce
1 parent b85c533
commit 9822bce
Show file tree

Hide file tree

Showing 12 changed files with 1,303 additions and 87 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -8,17 +8,18 @@
     "start": "sirv public --no-clear"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "@rollup/plugin-replace": "^2.4.2",
-    "@rollup/plugin-typescript": "^8.3.0",
+    "@rollup/plugin-commonjs": "^24.0.1",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-replace": "^5.0.2",
+    "@rollup/plugin-typescript": "^11.0.0",
     "@tsconfig/svelte": "^1.0.0",
     "@types/luxon": "^1.26.5",
     "@types/youtube-player": "^5.5.3",
     "autoprefixer": "^10.2.6",
     "clean-css": "^5.2.4",
     "postcss": "^8.3.5",
     "postcss-load-config": "^3.1.0",
+    "protoc-gen-js": "^3.21.2",
     "rollup": "^2.3.4",
     "rollup-plugin-css-only": "^3.1.0",
     "rollup-plugin-livereload": "^2.0.0",
@@ -53,7 +54,7 @@
     "emoji-picker-element": "^1.8.1",
     "emoji-regex": "^10.1.0",
     "fuse.js": "^6.6.0",
-    "google-protobuf": "3.20.1",
+    "google-protobuf": "^3.21.2",
     "luxon": "^1.27.0",
     "marked": "^4.0.12",
     "post-me": "^0.4.5",

diff --git a/app/rollup.config.js b/app/rollup.config.js
@@ -51,10 +51,8 @@ export default [
 		},
 		plugins: [
 			replace({
-				globalThis: JSON.stringify({
-					API_HOST: production ? "https://jungletv.live" : "use-origin",
-					PRODUCTION_BUILD: production,
-				}),
+				"globalThis.API_HOST": JSON.stringify(production ? "https://jungletv.live" : "use-origin"),
+				"globalThis.PRODUCTION_BUILD": JSON.stringify(production),
 				preventAssignment: true,
 			}),
 			replace({
@@ -196,10 +194,8 @@ export default [
 		},
 		plugins: [
 			replace({
-				globalThis: JSON.stringify({
-					EXPECTED_PARENT_WINDOW_ORIGIN: production ? "https://jungletv.live" : "*",
-					PRODUCTION_BUILD: production,
-				}),
+				"globalThis.EXPECTED_PARENT_WINDOW_ORIGIN": JSON.stringify(production ? "https://jungletv.live" : "*"),
+				"globalThis.PRODUCTION_BUILD": JSON.stringify(production),
 				preventAssignment: true,
 			}),
 			replace({

diff --git a/app/src/proto/application_editor_pb.js b/app/src/proto/application_editor_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js');
 goog.object.extend(proto, google_protobuf_timestamp_pb);

diff --git a/app/src/proto/application_runtime_pb.js b/app/src/proto/application_runtime_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js');
 goog.object.extend(proto, google_protobuf_timestamp_pb);

diff --git a/app/src/proto/common_pb.js b/app/src/proto/common_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 goog.exportSymbol('proto.jungletv.PaginationParameters', null, global);
 goog.exportSymbol('proto.jungletv.User', null, global);

diff --git a/app/src/proto/jungletv_pb.js b/app/src/proto/jungletv_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js');
 goog.object.extend(proto, google_protobuf_timestamp_pb);
@@ -43248,7 +43254,8 @@ proto.jungletv.PointsTransaction.prototype.getExtraMap = function(opt_noLazyCrea
  */
 proto.jungletv.PointsTransaction.prototype.clearExtraMap = function() {
   this.getExtraMap().clear();
-  return this;};
+  return this;
+};
 
 
 

diff --git a/proto/application_editor.pb.go b/proto/application_editor.pb.go
diff --git a/proto/application_runtime.pb.go b/proto/application_runtime.pb.go
diff --git a/proto/common.pb.go b/proto/common.pb.go
diff --git a/proto/jungletv.pb.go b/proto/jungletv.pb.go
diff --git a/protogen.bat b/protogen.bat
@@ -1,5 +1,6 @@
 protoc ^
   --plugin=protoc-gen-ts=.\app\node_modules\.bin\protoc-gen-ts.cmd ^
+  --plugin=protoc-gen-js=.\app\node_modules\.bin\protoc-gen-js.cmd ^
   -I .\proto ^
   --js_out=import_style=commonjs,binary:.\app\src\proto ^
   --go_opt=paths=source_relative ^