REFACTOR: PreloadStore to ES6

.eslintignore

@@ -1,7 +1,6 @@
 app/assets/javascripts/env.js
 app/assets/javascripts/main_include.js
 app/assets/javascripts/main_include_admin.js
-app/assets/javascripts/preload_store.js
 app/assets/javascripts/pagedown_custom.js
 app/assets/javascripts/vendor.js
 app/assets/javascripts/locales/i18n.js

.eslintrc

@@ -14,7 +14,6 @@
     "RSVP":true,
     "Discourse":true,
     "Em":true,
-    "PreloadStore":true,
     "Handlebars":true,
     "I18n":true,
     "bootbox":true,

app/assets/javascripts/admin/models/backup.js.es6

@@ -1,4 +1,6 @@
 import { ajax } from 'discourse/lib/ajax';
+import PreloadStore from 'preload-store';
+
 const Backup = Discourse.Model.extend({
 
   destroy() {

app/assets/javascripts/admin/routes/admin-backups-logs.js.es6

@@ -1,3 +1,5 @@
+import PreloadStore from 'preload-store';
+
 export default Ember.Route.extend({
 
   // since the logs are pushed via the message bus

app/assets/javascripts/admin/routes/admin-backups.js.es6

@@ -2,6 +2,7 @@ import { ajax } from 'discourse/lib/ajax';
 import showModal from 'discourse/lib/show-modal';
 import BackupStatus from 'admin/models/backup-status';
 import Backup from 'admin/models/backup';
+import PreloadStore from 'preload-store';
 
 const LOG_CHANNEL = "/admin/backups/logs";
 

app/assets/javascripts/discourse/adapters/topic-list.js.es6

@@ -1,5 +1,6 @@
 import { ajax } from 'discourse/lib/ajax';
 import RestAdapter from 'discourse/adapters/rest';
+import PreloadStore from 'preload-store';
 
 export function finderFor(filter, params) {
   return function() {

app/assets/javascripts/discourse/helpers/custom-html.js.es6

@@ -1,4 +1,5 @@
 import { registerHelper } from 'discourse/lib/helpers';
+import PreloadStore from 'preload-store';
 
 const _customizations = {};
 

app/assets/javascripts/discourse/initializers/banner.js.es6

@@ -1,3 +1,5 @@
+import PreloadStore from 'preload-store';
+
 export default {
   name: "banner",
   after: "message-bus",

app/assets/javascripts/discourse/initializers/enable-emoji.js.es6

@@ -1,5 +1,6 @@
 import { withPluginApi } from 'discourse/lib/plugin-api';
 import { registerEmoji } from 'pretty-text/emoji';
+import PreloadStore from 'preload-store';
 
 export default {
   name: 'enable-emoji',

app/assets/javascripts/discourse/initializers/localization.js.es6

@@ -1,3 +1,5 @@
+import PreloadStore from 'preload-store';
+
 export default {
   name: 'localization',
   after: 'inject-objects',

app/assets/javascripts/discourse/lib/raw-handlebars.js.es6

@@ -133,32 +133,37 @@ if (Handlebars.Compiler) {
     var environment = new RawHandlebars.Compiler().compile(ast, options);
     var templateSpec = new RawHandlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
 
-    var template = RawHandlebars.template(templateSpec);
-    template.isMethod = false;
+    var t = RawHandlebars.template(templateSpec);
+    t.isMethod = false;
 
-    return template;
-  };
-
-  RawHandlebars.get = function(ctx, property, options) {
-    if (options.types && options.data.view) {
-      var view = options.data.view;
-      return view.getStream ? view.getStream(property).value() : view.getAttr(property);
-    } else {
-      return Ember.get(ctx, property);
-    }
+    return t;
   };
 }
 
-export function precompile(value, asObject) {
-  return RawHandlebars.precompile(value, asObject);
+
+RawHandlebars.get = function(ctx, property, options) {
+  if (options.types && options.data.view) {
+    var view = options.data.view;
+    return view.getStream ? view.getStream(property).value() : view.getAttr(property);
+  } else {
+    return Ember.get(ctx, property);
+  }
+};
+
+export function template() {
+  return RawHandlebars.template.apply(this, arguments);
 }
 
-export function compile(string) {
-  return RawHandlebars.compile(string);
+export function precompile() {
+  return RawHandlebars.precompile.apply(this, arguments);
 }
 
-export function get(ctx, property, options) {
-  return RawHandlebars.get(ctx, property, options);
+export function compile() {
+  return RawHandlebars.compile.apply(this, arguments);
+}
+
+export function get() {
+  return RawHandlebars.get.apply(this, arguments);
 }
 
 export default RawHandlebars;

app/assets/javascripts/discourse/models/category-list.js.es6

@@ -1,3 +1,4 @@
+import PreloadStore from 'preload-store';
 import { ajax } from 'discourse/lib/ajax';
 
 const CategoryList = Ember.ArrayProxy.extend({

app/assets/javascripts/discourse/models/site.js.es6

@@ -3,6 +3,7 @@ import Archetype from 'discourse/models/archetype';
 import PostActionType from 'discourse/models/post-action-type';
 import Singleton from 'discourse/mixins/singleton';
 import RestModel from 'discourse/models/rest';
+import PreloadStore from 'preload-store';
 
 const Site = RestModel.extend({
 

app/assets/javascripts/discourse/models/topic-tracking-state.js.es6

@@ -2,6 +2,7 @@ import { NotificationLevels } from 'discourse/lib/notification-levels';
 import computed from "ember-addons/ember-computed-decorators";
 import { on } from "ember-addons/ember-computed-decorators";
 import { defaultHomepage } from 'discourse/lib/utilities';
+import PreloadStore from 'preload-store';
 
 function isNew(topic) {
   return topic.last_read_post_number === null &&

app/assets/javascripts/discourse/models/topic.js.es6

@@ -8,6 +8,7 @@ import ActionSummary from 'discourse/models/action-summary';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 import { censor } from 'pretty-text/censored-words';
 import { emojiUnescape } from 'discourse/lib/text';
+import PreloadStore from 'preload-store';
 
 export function loadTopicView(topic, args) {
   const topicId = topic.get('id');

app/assets/javascripts/discourse/models/user.js.es6

@@ -13,6 +13,7 @@ import UserAction from 'discourse/models/user-action';
 import Group from 'discourse/models/group';
 import Topic from 'discourse/models/topic';
 import { emojiUnescape } from 'discourse/lib/text';
+import PreloadStore from 'preload-store';
 
 const User = RestModel.extend({
 

app/assets/javascripts/discourse/routes/badges-index.js.es6

@@ -1,4 +1,5 @@
 import Badge from 'discourse/models/badge';
+import PreloadStore from 'preload-store';
 
 export default Discourse.Route.extend({
   model() {

app/assets/javascripts/discourse/routes/badges-show.js.es6

@@ -1,5 +1,6 @@
 import UserBadge from 'discourse/models/user-badge';
 import Badge from 'discourse/models/badge';
+import PreloadStore from 'preload-store';
 
 export default Discourse.Route.extend({
   queryParams: {

app/assets/javascripts/discourse/routes/discovery-categories.js.es6

@@ -2,6 +2,7 @@ import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
 import CategoryList from "discourse/models/category-list";
 import { defaultHomepage } from 'discourse/lib/utilities';
+import PreloadStore from 'preload-store';
 
 const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
   renderTemplate() {

app/assets/javascripts/discourse/routes/full-page-search.js.es6

@@ -1,6 +1,7 @@
 import { ajax } from 'discourse/lib/ajax';
 import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib/search";
 import Composer from 'discourse/models/composer';
+import PreloadStore from 'preload-store';
 
 export default Discourse.Route.extend({
   queryParams: { q: {}, context_id: {}, context: {}, skip_context: {} },

app/assets/javascripts/preload-store.js.es6

@@ -0,0 +1,54 @@
+/**
+  We can insert data into the PreloadStore when the document is loaded.
+  The data can be accessed once by a key, after which it is removed
+
+  @class PreloadStore
+**/
+export default {
+  data: {},
+
+  store(key, value) {
+    this.data[key] = value;
+  },
+
+  /**
+    To retrieve a key, you provide the key you want, plus a finder to load
+    it if the key cannot be found. Once the key is used once, it is removed
+    from the store.
+    So, for example, you can't load a preloaded topic more than once.
+  **/
+  getAndRemove(key, finder) {
+    if (this.data[key]) {
+      var promise = Em.RSVP.resolve(this.data[key]);
+      delete this.data[key];
+      return promise;
+    }
+
+    if (finder) {
+      return new Ember.RSVP.Promise(function(resolve, reject) {
+        var result = finder();
+
+        // If the finder returns a promise, we support that too
+        if (result && result.then) {
+          result.then(toResolve => resolve(toResolve)).catch(toReject => reject(toReject));
+        } else {
+          resolve(result);
+        }
+      });
+    }
+
+    return Ember.RSVP.resolve(null);
+  },
+
+  get(key) {
+    return this.data[key];
+  },
+
+  remove(key) {
+    if (this.data[key]) delete this.data[key];
+  },
+
+  reset() {
+    this.data = {};
+  }
+};

app/assets/javascripts/preload_store.js

@@ -1,90 +0,0 @@
-
-/**
-  We can insert data into the PreloadStore when the document is loaded.
-  The data can be accessed once by a key, after which it is removed
-
-  @class PreloadStore
-**/
-window.PreloadStore = {
-  data: {},
-
-  /**
-    Store an object in the store
-
-    @method store
-    @param {String} key the key to store the object with
-    @param {String} value the object we're inserting into the store
-  **/
-  store: function(key, value) {
-    this.data[key] = value;
-  },
-
-  /**
-    To retrieve a key, you provide the key you want, plus a finder to load
-    it if the key cannot be found. Once the key is used once, it is removed
-    from the store.
-    So, for example, you can't load a preloaded topic more than once.
-
-    @method getAndRemove
-    @param {String} key the key to look up the object with
-    @param {function} finder a function to find the object with
-    @returns {Promise} a promise that will eventually be the object we want.
-  **/
-  getAndRemove: function(key, finder) {
-    if (this.data[key]) {
-      var promise = Em.RSVP.resolve(this.data[key]);
-      delete this.data[key];
-      return promise;
-    }
-
-    if (finder) {
-      return new Ember.RSVP.Promise(function(resolve, reject) {
-        var result = finder();
-
-        // If the finder returns a promise, we support that too
-        if (result && result.then) {
-          result.then(function(result) {
-            return resolve(result);
-          }, function(result) {
-            return reject(result);
-          });
-        } else {
-          resolve(result);
-        }
-      });
-    }
-
-    return Ember.RSVP.resolve(null);
-  },
-
-  /**
-    If we are sure it's preloaded, we don't have to supply a finder.
-    Just returns undefined if it's not in the store.
-
-    @method get
-    @param {String} key the key to look up the object with
-    @returns {Object} the object from the store
-  **/
-  "get": function(key) {
-    return this.data[key];
-  },
-
-  /**
-    Removes the stored value if the key exists
-
-    @method remove
-    @param {String} key the key to remove
-  **/
-  remove: function(key) {
-    if (this.data[key]) delete this.data[key];
-  },
-
-  /**
-    Resets the contents of the store. Used in testing.
-
-  **/
-  reset: function() {
-    this.data = {};
-  }
-
-};

app/assets/javascripts/pretty-text/sanitizer.js.es6

@@ -60,13 +60,12 @@ export function sanitize(text, whiteLister) {
 
   const whiteList = whiteLister.getWhiteList();
 
-  let hadIframe = false;
   let result = xss(text, {
     whiteList: whiteList.tagList,
     stripIgnoreTag: true,
     stripIgnoreTagBody: ['script', 'table'],
+
     onIgnoreTagAttr(tag, name, value) {
-      hadIframe = hadIframe || tag === 'iframe';
       const forTag = whiteList.attrList[tag];
       if (forTag) {
         const forAttr = forTag[name];

app/views/common/_discourse_javascript.html.erb

@@ -39,23 +39,27 @@
     });
   <%- end %>
 
-  Discourse.CDN = '<%= Rails.configuration.action_controller.asset_host %>';
-  Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname %>'.replace(/:[\d]*$/,"");
-  Discourse.BaseUri = '<%= Discourse::base_uri %>';
-  Discourse.Environment = '<%= Rails.env %>';
-  Discourse.SiteSettings = PreloadStore.get('siteSettings');
-  Discourse.LetterAvatarVersion = '<%= LetterAvatar.version %>';
-  I18n.defaultLocale = '<%= SiteSetting.default_locale %>';
-  Discourse.start();
-  Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
-  Discourse.Session.currentProp("disableCustomCSS", <%= loading_admin? %>);
-  Discourse.HighlightJSPath = <%= HighlightJs.path.inspect.html_safe %>;
-  <%- if SiteSetting.enable_s3_uploads %>
-    <%- if SiteSetting.s3_cdn_url.present? %>
-      Discourse.S3CDN = '<%= SiteSetting.s3_cdn_url %>';
+  (function() {
+    var ps = require('preload-store').default;
+
+    Discourse.CDN = '<%= Rails.configuration.action_controller.asset_host %>';
+    Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname %>'.replace(/:[\d]*$/,"");
+    Discourse.BaseUri = '<%= Discourse::base_uri %>';
+    Discourse.Environment = '<%= Rails.env %>';
+    Discourse.SiteSettings = ps.get('siteSettings');
+    Discourse.LetterAvatarVersion = '<%= LetterAvatar.version %>';
+    I18n.defaultLocale = '<%= SiteSetting.default_locale %>';
+    Discourse.start();
+    Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
+    Discourse.Session.currentProp("disableCustomCSS", <%= loading_admin? %>);
+    Discourse.HighlightJSPath = <%= HighlightJs.path.inspect.html_safe %>;
+    <%- if SiteSetting.enable_s3_uploads %>
+      <%- if SiteSetting.s3_cdn_url.present? %>
+        Discourse.S3CDN = '<%= SiteSetting.s3_cdn_url %>';
+      <%- end %>
+      Discourse.S3BaseUrl = '<%= Discourse.store.absolute_base_url %>';
     <%- end %>
-    Discourse.S3BaseUrl = '<%= Discourse.store.absolute_base_url %>';
-  <%- end %>
+  })();
 </script>
 
 <%= script 'browser-update' %>

app/views/layouts/application.html.erb

@@ -22,9 +22,9 @@
       window.EmberENV['FORCE_JQUERY'] = true;
     </script>
 
-    <%= script "preload_store" %>
     <%= script "locales/#{I18n.locale}" %>
     <%= script "ember_jquery" %>
+    <%= script "preload-store" %>
     <%= script "vendor" %>
     <%= script "pretty-text-bundle" %>
     <%= script "application" %>
@@ -89,9 +89,12 @@
 
     <%- if @preloaded.present? %>
       <script>
-      <%- @preloaded.each do |key, json| %>
-        PreloadStore.store("<%= key %>",<%= escape_unicode(json) %>);
-      <% end %>
+      (function() {
+        var ps = require('preload-store').default;
+        <%- @preloaded.each do |key, json| %>
+          ps.store("<%= key %>", <%= escape_unicode(json) %>);
+        <% end %>
+      })();
       </script>
     <%- end %>
 

config/application.rb

@@ -70,7 +70,7 @@ module Discourse
     end]
 
     config.assets.precompile += ['vendor.js', 'common.css', 'desktop.css', 'mobile.css',
-                                 'admin.js', 'admin.css', 'shiny/shiny.css', 'preload_store.js',
+                                 'admin.js', 'admin.css', 'shiny/shiny.css', 'preload-store.js.es6',
                                  'browser-update.js', 'embed.css', 'break_string.js', 'ember_jquery.js',
                                  'pretty-text-bundle.js']
 

lib/freedom_patches/raw_handlebars.rb

@@ -40,7 +40,7 @@ module Discourse
     module Handlebars
       module Helper
         def precompile_handlebars(string)
-          "Discourse.EmberCompatHandlebars.template(#{Barber::Precompiler.compile(string)});"
+          "require('discourse/lib/raw-handlebars').template(#{Barber::Precompiler.compile(string)});"
         end
 
         def compile_handlebars(string)

test/javascripts/helpers/current_user.js

@@ -1 +0,0 @@
-PreloadStore.store("currentUser", {"id":42,"username":"eviltrout","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","name":"Evil Trout","unread_notifications":0,"unread_private_messages":0,"admin":false,"notification_channel_position":null,"site_flagged_posts_count":0,"moderator":false,"staff":false,"reply_count":0,"topic_count":0,"enable_quoting":true,"external_links_in_new_tab":false,"dynamic_favicon":false,"trust_level":0,"can_edit":true}); 

test/javascripts/helpers/custom-html-test.js.es6

@@ -1,4 +1,6 @@
 import { blank } from 'helpers/qunit-helpers';
+import PreloadStore from 'preload-store';
+
 module("helper:custom-html");
 
 import { getCustomHTML, setCustomHTML } from 'discourse/helpers/custom-html';
@@ -11,5 +13,4 @@ test("customHTML", function() {
 
   PreloadStore.store('customHTML', {cookie: 'monster'});
   equal(getCustomHTML('cookie'), 'monster', 'it returns HTML fragments from the PreloadStore');
-
 });

test/javascripts/lib/preload-store-test.js.es6

@@ -1,7 +1,8 @@
 import { blank } from 'helpers/qunit-helpers';
+import PreloadStore from 'preload-store';
 
-module("Discourse.PreloadStore", {
-  setup: function() {
+module("preload-store", {
+  setup() {
     PreloadStore.store('bane', 'evil');
   }
 });

test/javascripts/test_helper.js

@@ -1,7 +1,6 @@
 /*global document, sinon, QUnit, Logster */
 
 //= require env
-//= require preload_store
 //= require probes
 //= require jquery.debug
 //= require jquery.ui.widget
@@ -14,6 +13,7 @@
 //= require route-recognizer
 //= require pretender
 //= require loader
+//= require preload-store
 
 //= require locales/i18n
 //= require locales/en
@@ -41,6 +41,7 @@
 //
 //= require jquery.magnific-popup-min.js
 
+window.TestPreloadStore = require('preload-store').default;
 window.inTestEnv = true;
 
 // Stop the message bus so we don't get ajax calls
@@ -75,6 +76,13 @@ function dup(obj) {
   return jQuery.extend(true, {}, obj);
 }
 
+function resetSite() {
+  var createStore = require('helpers/create-store').default;
+  var siteAttrs = dup(fixtures['site.json'].site);
+  siteAttrs.store = createStore();
+  Discourse.Site.resetCurrent(Discourse.Site.create(siteAttrs));
+}
+
 QUnit.testStart(function(ctx) {
   server = createPretendServer();
 
@@ -84,14 +92,15 @@ QUnit.testStart(function(ctx) {
   Discourse.BaseUrl = "localhost";
   Discourse.Session.resetCurrent();
   Discourse.User.resetCurrent();
-  Discourse.Site.resetCurrent(Discourse.Site.create(dup(fixtures['site.json'].site)));
+  resetSite();
 
   _DiscourseURL.redirectedTo = null;
   _DiscourseURL.redirectTo = function(url) {
     _DiscourseURL.redirectedTo = url;
   };
 
-  PreloadStore.reset();
+  var ps = require('preload-store').default;
+  ps.reset();
 
   window.sandbox = sinon.sandbox.create();
   window.sandbox.stub(ScrollingDOMMethods, "screenNotFull");
@@ -132,4 +141,5 @@ Object.keys(requirejs.entries).forEach(function(entry) {
   }
 });
 require('mdtest/mdtest', null, null, true);
+resetSite();