REFACTOR: Remove Discourse.__widget_helpers

It's now a variable in the context where the templates are created.
SongJunxi2000 · Aug 6, 2020 · 7df57b3 · 7df57b3
1 parent 792bd3f
commit 7df57b3
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 22 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -99,3 +99,4 @@
 //= require_tree ./discourse/app/services
 
 //= require_tree ./discourse/app/widgets
+//= require ./widget-runtime
diff --git a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
@@ -89,11 +89,6 @@ export function convertIconClass(icon) {
     .trim();
 }
 
-// TODO: Improve how helpers are registered for vdom compliation
-if (typeof Discourse !== "undefined") {
-  Discourse.__widget_helpers.iconNode = iconNode;
-}
-
 export function registerIconRenderer(renderer) {
   _renderers.unshift(renderer);
 }

diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
@@ -8,7 +8,6 @@ const _pluginCallbacks = [];
 
 const Discourse = Application.extend({
   rootElement: "#main",
-  __widget_helpers: {},
 
   customEvents: {
     paste: "paste"

diff --git a/app/assets/javascripts/discourse/app/helpers/node.js b/app/assets/javascripts/discourse/app/helpers/node.js
@@ -17,11 +17,6 @@ export function dateNode(dt) {
   }
 }
 
-// TODO: Improve how helpers are registered for vdom compliation
-if (typeof Discourse !== "undefined") {
-  Discourse.__widget_helpers.dateNode = dateNode;
-}
-
 export function numberNode(num, opts) {
   opts = opts || {};
   num = parseInt(num, 10);

diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -64,11 +64,6 @@ export function avatarFor(wanted, attrs) {
   );
 }
 
-// TODO: Improve how helpers are registered for vdom compliation
-if (typeof Discourse !== "undefined") {
-  Discourse.__widget_helpers.avatar = avatarFor;
-}
-
 createWidget("select-post", {
   tagName: "div.select-posts",
 

diff --git a/app/assets/javascripts/discourse/app/widgets/raw-html.js b/app/assets/javascripts/discourse/app/widgets/raw-html.js
@@ -22,8 +22,3 @@ export default class RawHtml {
 }
 
 RawHtml.prototype.type = "Widget";
-
-// TODO: Improve how helpers are registered for vdom compliation
-if (typeof Discourse !== "undefined") {
-  Discourse.__widget_helpers.rawHtml = RawHtml;
-}
diff --git a/app/assets/javascripts/widget-runtime.js b/app/assets/javascripts/widget-runtime.js
@@ -0,0 +1,11 @@
+// discourse-skip-module
+
+(function(context) {
+  // register widget helpers for compiled `hbs`
+  context.__widget_helpers = {
+    avatar: require("discourse/widgets/post").avatarFor,
+    dateNode: require("discourse/helpers/node").dateNode,
+    iconNode: require("discourse-common/lib/icon-library").iconNode,
+    rawHtml: require("discourse/widgets/raw-html").default
+  };
+})(this);
diff --git a/lib/javascripts/widget-hbs-compiler.js b/lib/javascripts/widget-hbs-compiler.js
@@ -283,7 +283,7 @@ function compile(template) {
 
   Object.keys(compiler.state.helpersUsed).forEach(h => {
     let id = compiler.state.helpersUsed[h];
-    imports += `var __h${id} = Discourse.__widget_helpers.${h}; `;
+    imports += `var __h${id} = __widget_helpers.${h}; `;
   });
 
   return `function(attrs, state) { ${imports}var _r = [];\n${code}\nreturn _r; }`;

diff --git a/script/test_hbs_compiler.rb b/script/test_hbs_compiler.rb
@@ -6,6 +6,7 @@
   {{actions-summary-item attrs=as}}
   {{attach widget="actions-summary-item" attrs=as}}
   {{testing value="hello"}}
+  {{date "today"}}
 HBS
 
 ctx = MiniRacer::Context.new(timeout: 15000)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,3 +99,4 @@
		//= require_tree ./discourse/app/services

		//= require_tree ./discourse/app/widgets
		//= require ./widget-runtime