From 4d190c93b6c993ddefce9fbb8b344c19507b96af Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 24 Mar 2020 16:10:51 -0400 Subject: [PATCH] Migrate ember-addons from ES6 -> JS --- .../{decorator-alias.js.es6 => decorator-alias.js} | 0 app/assets/javascripts/ember-addons/{fmt.js.es6 => fmt.js} | 0 .../ember-addons/{macro-alias.js.es6 => macro-alias.js} | 0 .../utils/{extract-value.js.es6 => extract-value.js} | 0 .../utils/{handle-descriptor.js.es6 => handle-descriptor.js} | 0 .../utils/{is-descriptor.js.es6 => is-descriptor.js} | 0 lib/discourse_js_processor.rb | 3 ++- 7 files changed, 2 insertions(+), 1 deletion(-) rename app/assets/javascripts/ember-addons/{decorator-alias.js.es6 => decorator-alias.js} (100%) rename app/assets/javascripts/ember-addons/{fmt.js.es6 => fmt.js} (100%) rename app/assets/javascripts/ember-addons/{macro-alias.js.es6 => macro-alias.js} (100%) rename app/assets/javascripts/ember-addons/utils/{extract-value.js.es6 => extract-value.js} (100%) rename app/assets/javascripts/ember-addons/utils/{handle-descriptor.js.es6 => handle-descriptor.js} (100%) rename app/assets/javascripts/ember-addons/utils/{is-descriptor.js.es6 => is-descriptor.js} (100%) diff --git a/app/assets/javascripts/ember-addons/decorator-alias.js.es6 b/app/assets/javascripts/ember-addons/decorator-alias.js similarity index 100% rename from app/assets/javascripts/ember-addons/decorator-alias.js.es6 rename to app/assets/javascripts/ember-addons/decorator-alias.js diff --git a/app/assets/javascripts/ember-addons/fmt.js.es6 b/app/assets/javascripts/ember-addons/fmt.js similarity index 100% rename from app/assets/javascripts/ember-addons/fmt.js.es6 rename to app/assets/javascripts/ember-addons/fmt.js diff --git a/app/assets/javascripts/ember-addons/macro-alias.js.es6 b/app/assets/javascripts/ember-addons/macro-alias.js similarity index 100% rename from app/assets/javascripts/ember-addons/macro-alias.js.es6 rename to app/assets/javascripts/ember-addons/macro-alias.js diff --git a/app/assets/javascripts/ember-addons/utils/extract-value.js.es6 b/app/assets/javascripts/ember-addons/utils/extract-value.js similarity index 100% rename from app/assets/javascripts/ember-addons/utils/extract-value.js.es6 rename to app/assets/javascripts/ember-addons/utils/extract-value.js diff --git a/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js similarity index 100% rename from app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6 rename to app/assets/javascripts/ember-addons/utils/handle-descriptor.js diff --git a/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/is-descriptor.js similarity index 100% rename from app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6 rename to app/assets/javascripts/ember-addons/utils/is-descriptor.js diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb index d2d671e0ac..5d41d23bb7 100644 --- a/lib/discourse_js_processor.rb +++ b/lib/discourse_js_processor.rb @@ -41,7 +41,8 @@ class DiscourseJsProcessor relative_path.start_with?("app/assets/javascripts/pretty-text/") || relative_path.start_with?("app/assets/javascripts/select-kit/") || relative_path.start_with?("app/assets/javascripts/wizard/") || - relative_path.start_with?("app/assets/javascripts/discourse-common/") + relative_path.start_with?("app/assets/javascripts/discourse-common/") || + relative_path.start_with?("app/assets/javascripts/ember-addons/") end def self.skip_module?(data)