From 27641f21e4c7a3294ac14408cdc5fd266f8d899c Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 23 Mar 2020 15:05:03 -0400 Subject: [PATCH] Migrate `discourse-common` from es6 -> js --- .../config/{environment.js.es6 => environment.js} | 0 .../helpers/{bound-i18n.js.es6 => bound-i18n.js} | 0 ...ent-for-collection.js.es6 => component-for-collection.js} | 0 .../{component-for-row.js.es6 => component-for-row.js} | 0 .../discourse-common/helpers/{d-icon.js.es6 => d-icon.js} | 0 .../discourse-common/helpers/{fa-icon.js.es6 => fa-icon.js} | 0 .../discourse-common/helpers/{get-url.js.es6 => get-url.js} | 0 .../helpers/{html-safe.js.es6 => html-safe.js} | 0 .../discourse-common/helpers/{i18n.js.es6 => i18n.js} | 0 .../helpers/{popular-themes.js.es6 => popular-themes.js} | 0 .../lib/{attribute-hook.js.es6 => attribute-hook.js} | 0 .../lib/{deprecated.js.es6 => deprecated.js} | 0 .../discourse-common/lib/{get-owner.js.es6 => get-owner.js} | 5 +++-- .../discourse-common/lib/{get-url.js.es6 => get-url.js} | 0 .../discourse-common/lib/{helpers.js.es6 => helpers.js} | 0 .../lib/{icon-library.js.es6 => icon-library.js} | 0 ...w-handlebars-helpers.js.es6 => raw-handlebars-helpers.js} | 0 .../lib/{raw-handlebars.js.es6 => raw-handlebars.js} | 0 .../mixins/{focus-event.js.es6 => focus-event.js} | 0 .../discourse-common/{resolver.js.es6 => resolver.js} | 0 .../utils/{decorators.js.es6 => decorators.js} | 1 + lib/discourse_js_processor.rb | 3 ++- lib/freedom_patches/raw_handlebars.rb | 2 +- 23 files changed, 7 insertions(+), 4 deletions(-) rename app/assets/javascripts/discourse-common/config/{environment.js.es6 => environment.js} (100%) rename app/assets/javascripts/discourse-common/helpers/{bound-i18n.js.es6 => bound-i18n.js} (100%) rename app/assets/javascripts/discourse-common/helpers/{component-for-collection.js.es6 => component-for-collection.js} (100%) rename app/assets/javascripts/discourse-common/helpers/{component-for-row.js.es6 => component-for-row.js} (100%) rename app/assets/javascripts/discourse-common/helpers/{d-icon.js.es6 => d-icon.js} (100%) rename app/assets/javascripts/discourse-common/helpers/{fa-icon.js.es6 => fa-icon.js} (100%) rename app/assets/javascripts/discourse-common/helpers/{get-url.js.es6 => get-url.js} (100%) rename app/assets/javascripts/discourse-common/helpers/{html-safe.js.es6 => html-safe.js} (100%) rename app/assets/javascripts/discourse-common/helpers/{i18n.js.es6 => i18n.js} (100%) rename app/assets/javascripts/discourse-common/helpers/{popular-themes.js.es6 => popular-themes.js} (100%) rename app/assets/javascripts/discourse-common/lib/{attribute-hook.js.es6 => attribute-hook.js} (100%) rename app/assets/javascripts/discourse-common/lib/{deprecated.js.es6 => deprecated.js} (100%) rename app/assets/javascripts/discourse-common/lib/{get-owner.js.es6 => get-owner.js} (85%) rename app/assets/javascripts/discourse-common/lib/{get-url.js.es6 => get-url.js} (100%) rename app/assets/javascripts/discourse-common/lib/{helpers.js.es6 => helpers.js} (100%) rename app/assets/javascripts/discourse-common/lib/{icon-library.js.es6 => icon-library.js} (100%) rename app/assets/javascripts/discourse-common/lib/{raw-handlebars-helpers.js.es6 => raw-handlebars-helpers.js} (100%) rename app/assets/javascripts/discourse-common/lib/{raw-handlebars.js.es6 => raw-handlebars.js} (100%) rename app/assets/javascripts/discourse-common/mixins/{focus-event.js.es6 => focus-event.js} (100%) rename app/assets/javascripts/discourse-common/{resolver.js.es6 => resolver.js} (100%) rename app/assets/javascripts/discourse-common/utils/{decorators.js.es6 => decorators.js} (99%) diff --git a/app/assets/javascripts/discourse-common/config/environment.js.es6 b/app/assets/javascripts/discourse-common/config/environment.js similarity index 100% rename from app/assets/javascripts/discourse-common/config/environment.js.es6 rename to app/assets/javascripts/discourse-common/config/environment.js diff --git a/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/bound-i18n.js similarity index 100% rename from app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6 rename to app/assets/javascripts/discourse-common/helpers/bound-i18n.js diff --git a/app/assets/javascripts/discourse-common/helpers/component-for-collection.js.es6 b/app/assets/javascripts/discourse-common/helpers/component-for-collection.js similarity index 100% rename from app/assets/javascripts/discourse-common/helpers/component-for-collection.js.es6 rename to app/assets/javascripts/discourse-common/helpers/component-for-collection.js diff --git a/app/assets/javascripts/discourse-common/helpers/component-for-row.js.es6 b/app/assets/javascripts/discourse-common/helpers/component-for-row.js similarity index 100% rename from app/assets/javascripts/discourse-common/helpers/component-for-row.js.es6 rename to app/assets/javascripts/discourse-common/helpers/component-for-row.js diff --git a/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/d-icon.js similarity index 100% rename from app/assets/javascripts/discourse-common/helpers/d-icon.js.es6 rename to app/assets/javascripts/discourse-common/helpers/d-icon.js diff --git a/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/fa-icon.js similarity index 100% rename from app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6 rename to app/assets/javascripts/discourse-common/helpers/fa-icon.js diff --git a/app/assets/javascripts/discourse-common/helpers/get-url.js.es6 b/app/assets/javascripts/discourse-common/helpers/get-url.js similarity index 100% rename from app/assets/javascripts/discourse-common/helpers/get-url.js.es6 rename to app/assets/javascripts/discourse-common/helpers/get-url.js diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 b/app/assets/javascripts/discourse-common/helpers/html-safe.js similarity index 100% rename from app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 rename to app/assets/javascripts/discourse-common/helpers/html-safe.js diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js similarity index 100% rename from app/assets/javascripts/discourse-common/helpers/i18n.js.es6 rename to app/assets/javascripts/discourse-common/helpers/i18n.js diff --git a/app/assets/javascripts/discourse-common/helpers/popular-themes.js.es6 b/app/assets/javascripts/discourse-common/helpers/popular-themes.js similarity index 100% rename from app/assets/javascripts/discourse-common/helpers/popular-themes.js.es6 rename to app/assets/javascripts/discourse-common/helpers/popular-themes.js diff --git a/app/assets/javascripts/discourse-common/lib/attribute-hook.js.es6 b/app/assets/javascripts/discourse-common/lib/attribute-hook.js similarity index 100% rename from app/assets/javascripts/discourse-common/lib/attribute-hook.js.es6 rename to app/assets/javascripts/discourse-common/lib/attribute-hook.js diff --git a/app/assets/javascripts/discourse-common/lib/deprecated.js.es6 b/app/assets/javascripts/discourse-common/lib/deprecated.js similarity index 100% rename from app/assets/javascripts/discourse-common/lib/deprecated.js.es6 rename to app/assets/javascripts/discourse-common/lib/deprecated.js diff --git a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6 b/app/assets/javascripts/discourse-common/lib/get-owner.js similarity index 85% rename from app/assets/javascripts/discourse-common/lib/get-owner.js.es6 rename to app/assets/javascripts/discourse-common/lib/get-owner.js index 38b75b80a00..0fd653bb9be 100644 --- a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6 +++ b/app/assets/javascripts/discourse-common/lib/get-owner.js @@ -1,8 +1,9 @@ import deprecated from "discourse-common/lib/deprecated"; +import { getOwner as emberGetOwner } from "@ember/application"; export function getOwner(obj) { - if (Ember.getOwner) { - return Ember.getOwner(obj) || Discourse.__container__; + if (emberGetOwner) { + return emberGetOwner(obj) || Discourse.__container__; } return obj.container; diff --git a/app/assets/javascripts/discourse-common/lib/get-url.js.es6 b/app/assets/javascripts/discourse-common/lib/get-url.js similarity index 100% rename from app/assets/javascripts/discourse-common/lib/get-url.js.es6 rename to app/assets/javascripts/discourse-common/lib/get-url.js diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js similarity index 100% rename from app/assets/javascripts/discourse-common/lib/helpers.js.es6 rename to app/assets/javascripts/discourse-common/lib/helpers.js diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js similarity index 100% rename from app/assets/javascripts/discourse-common/lib/icon-library.js.es6 rename to app/assets/javascripts/discourse-common/lib/icon-library.js diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js similarity index 100% rename from app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js.es6 rename to app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js similarity index 100% rename from app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 rename to app/assets/javascripts/discourse-common/lib/raw-handlebars.js diff --git a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6 b/app/assets/javascripts/discourse-common/mixins/focus-event.js similarity index 100% rename from app/assets/javascripts/discourse-common/mixins/focus-event.js.es6 rename to app/assets/javascripts/discourse-common/mixins/focus-event.js diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js similarity index 100% rename from app/assets/javascripts/discourse-common/resolver.js.es6 rename to app/assets/javascripts/discourse-common/resolver.js diff --git a/app/assets/javascripts/discourse-common/utils/decorators.js.es6 b/app/assets/javascripts/discourse-common/utils/decorators.js similarity index 99% rename from app/assets/javascripts/discourse-common/utils/decorators.js.es6 rename to app/assets/javascripts/discourse-common/utils/decorators.js index 3339eb03fa5..36e537a063a 100644 --- a/app/assets/javascripts/discourse-common/utils/decorators.js.es6 +++ b/app/assets/javascripts/discourse-common/utils/decorators.js @@ -41,6 +41,7 @@ export function readOnly(target, name, desc) { import decoratorAlias from "ember-addons/decorator-alias"; +/* eslint-disable */ export var on = decoratorAlias(Ember.on, "Can not `on` without event names"); export var observes = decoratorAlias( Ember.observer, diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb index e1530090deb..d2d671e0ac5 100644 --- a/lib/discourse_js_processor.rb +++ b/lib/discourse_js_processor.rb @@ -40,7 +40,8 @@ class DiscourseJsProcessor relative_path.start_with?("app/assets/javascripts/admin/") || 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/wizard/") || + relative_path.start_with?("app/assets/javascripts/discourse-common/") end def self.skip_module?(data) diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb index 488061fb560..0f4a0bd8f7f 100644 --- a/lib/freedom_patches/raw_handlebars.rb +++ b/lib/freedom_patches/raw_handlebars.rb @@ -11,7 +11,7 @@ class Barber::Precompiler def precompiler if !@precompiler - source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6") + source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/lib/raw-handlebars.js") transpiler = DiscourseJsProcessor::Transpiler.new(skip_module: true) transpiled = transpiler.perform(source)