From b9e15a240f04491729fd33657eead86417865d48 Mon Sep 17 00:00:00 2001
From: Vikhyat Korrapati <vikhyatk@gmail.com>
Date: Thu, 15 May 2014 23:44:30 +0530
Subject: [PATCH] Allow registering ES6 modules from plugins.

---
 lib/plugin/instance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 297726f77..55fffea11 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -212,7 +212,7 @@ class Plugin::Instance
 
   def register_assets!
     assets.each do |asset, opts|
-      if asset =~ /\.js$|\.js\.erb$/
+      if asset =~ /\.js$|\.js\.erb$|\.js\.es6$/
         if opts == :admin
           DiscoursePluginRegistry.admin_javascripts << asset
         else