From f2f8ede22c7a7905a1465674779d1d1f01b24cdf Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 25 Mar 2020 11:30:33 -0400 Subject: [PATCH] Last ES6 files in our app/assets/javascripts --- .../{activate-account.js.es6 => activate-account.js} | 0 .../{auto-redirect.js.es6 => auto-redirect.js} | 0 .../confirm-new-email/{bootstrap.js.es6 => bootstrap.js} | 0 .../{confirm-new-email.js.es6 => confirm-new-email.js} | 0 .../{auth-token-dropdown.es6 => auth-token-dropdown.js} | 0 ...ities.js.es6.erb => category-search-priorities.js.erb} | 0 .../helpers/{loading-spinner.es6 => loading-spinner.js} | 0 ...earch-constants.js.es6.erb => search-constants.js.erb} | 0 .../models/{live-post-counts.es6 => live-post-counts.js} | 0 .../{embed-application.js.es6 => embed-application.js} | 0 .../{google-tag-manager.js.es6 => google-tag-manager.js} | 0 ...sal-analytics.js.es6 => google-universal-analytics.js} | 0 lib/discourse_js_processor.rb | 8 +++++++- 13 files changed, 7 insertions(+), 1 deletion(-) rename app/assets/javascripts/{activate-account.js.es6 => activate-account.js} (100%) rename app/assets/javascripts/{auto-redirect.js.es6 => auto-redirect.js} (100%) rename app/assets/javascripts/confirm-new-email/{bootstrap.js.es6 => bootstrap.js} (100%) rename app/assets/javascripts/confirm-new-email/{confirm-new-email.js.es6 => confirm-new-email.js} (100%) rename app/assets/javascripts/discourse/components/{auth-token-dropdown.es6 => auth-token-dropdown.js} (100%) rename app/assets/javascripts/discourse/components/concerns/{category-search-priorities.js.es6.erb => category-search-priorities.js.erb} (100%) rename app/assets/javascripts/discourse/helpers/{loading-spinner.es6 => loading-spinner.js} (100%) rename app/assets/javascripts/discourse/lib/concerns/{search-constants.js.es6.erb => search-constants.js.erb} (100%) rename app/assets/javascripts/discourse/models/{live-post-counts.es6 => live-post-counts.js} (100%) rename app/assets/javascripts/{embed-application.js.es6 => embed-application.js} (100%) rename app/assets/javascripts/{google-tag-manager.js.es6 => google-tag-manager.js} (100%) rename app/assets/javascripts/{google-universal-analytics.js.es6 => google-universal-analytics.js} (100%) diff --git a/app/assets/javascripts/activate-account.js.es6 b/app/assets/javascripts/activate-account.js similarity index 100% rename from app/assets/javascripts/activate-account.js.es6 rename to app/assets/javascripts/activate-account.js diff --git a/app/assets/javascripts/auto-redirect.js.es6 b/app/assets/javascripts/auto-redirect.js similarity index 100% rename from app/assets/javascripts/auto-redirect.js.es6 rename to app/assets/javascripts/auto-redirect.js diff --git a/app/assets/javascripts/confirm-new-email/bootstrap.js.es6 b/app/assets/javascripts/confirm-new-email/bootstrap.js similarity index 100% rename from app/assets/javascripts/confirm-new-email/bootstrap.js.es6 rename to app/assets/javascripts/confirm-new-email/bootstrap.js diff --git a/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6 b/app/assets/javascripts/confirm-new-email/confirm-new-email.js similarity index 100% rename from app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6 rename to app/assets/javascripts/confirm-new-email/confirm-new-email.js diff --git a/app/assets/javascripts/discourse/components/auth-token-dropdown.es6 b/app/assets/javascripts/discourse/components/auth-token-dropdown.js similarity index 100% rename from app/assets/javascripts/discourse/components/auth-token-dropdown.es6 rename to app/assets/javascripts/discourse/components/auth-token-dropdown.js diff --git a/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.es6.erb b/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb similarity index 100% rename from app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.es6.erb rename to app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb diff --git a/app/assets/javascripts/discourse/helpers/loading-spinner.es6 b/app/assets/javascripts/discourse/helpers/loading-spinner.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/loading-spinner.es6 rename to app/assets/javascripts/discourse/helpers/loading-spinner.js diff --git a/app/assets/javascripts/discourse/lib/concerns/search-constants.js.es6.erb b/app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb similarity index 100% rename from app/assets/javascripts/discourse/lib/concerns/search-constants.js.es6.erb rename to app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb diff --git a/app/assets/javascripts/discourse/models/live-post-counts.es6 b/app/assets/javascripts/discourse/models/live-post-counts.js similarity index 100% rename from app/assets/javascripts/discourse/models/live-post-counts.es6 rename to app/assets/javascripts/discourse/models/live-post-counts.js diff --git a/app/assets/javascripts/embed-application.js.es6 b/app/assets/javascripts/embed-application.js similarity index 100% rename from app/assets/javascripts/embed-application.js.es6 rename to app/assets/javascripts/embed-application.js diff --git a/app/assets/javascripts/google-tag-manager.js.es6 b/app/assets/javascripts/google-tag-manager.js similarity index 100% rename from app/assets/javascripts/google-tag-manager.js.es6 rename to app/assets/javascripts/google-tag-manager.js diff --git a/app/assets/javascripts/google-universal-analytics.js.es6 b/app/assets/javascripts/google-universal-analytics.js similarity index 100% rename from app/assets/javascripts/google-universal-analytics.js.es6 rename to app/assets/javascripts/google-universal-analytics.js diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb index 3e101328cf6..bbadfa84afa 100644 --- a/lib/discourse_js_processor.rb +++ b/lib/discourse_js_processor.rb @@ -43,11 +43,17 @@ class DiscourseJsProcessor relative_path.start_with?("app/assets/javascripts/wizard/") || relative_path.start_with?("app/assets/javascripts/discourse-common/") || relative_path.start_with?("app/assets/javascripts/ember-addons/") || + relative_path.start_with?("app/assets/javascripts/confirm-new-email/") || relative_path == "app/assets/javascripts/preload-store.js" || relative_path == "app/assets/javascripts/preload-application-data.js" || relative_path == "app/assets/javascripts/wizard-start.js" || relative_path == "app/assets/javascripts/onpopstate-handler.js" || - relative_path == "app/assets/javascripts/discourse.js" + relative_path == "app/assets/javascripts/discourse.js" || + relative_path == "app/assets/javascripts/google-tag-manager.js" || + relative_path == "app/assets/javascripts/google-universal-analytics.js" || + relative_path == "app/assets/javascripts/activate-account.js" || + relative_path == "app/assets/javascripts/auto-redirect.js" || + relative_path == "app/assets/javascripts/embed-application.js" end def self.skip_module?(data)