2019-05-03 06:17:27 +08:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2020-07-16 03:29:12 +08:00
|
|
|
def public_root
|
|
|
|
"#{Rails.root}/public"
|
|
|
|
end
|
|
|
|
|
2018-10-03 22:15:43 +08:00
|
|
|
def public_js
|
2020-07-16 03:29:12 +08:00
|
|
|
"#{public_root}/javascripts"
|
2018-10-03 22:15:43 +08:00
|
|
|
end
|
|
|
|
|
|
|
|
def vendor_js
|
|
|
|
"#{Rails.root}/vendor/assets/javascripts"
|
|
|
|
end
|
|
|
|
|
|
|
|
def library_src
|
|
|
|
"#{Rails.root}/node_modules"
|
|
|
|
end
|
|
|
|
|
2020-11-25 23:58:19 +08:00
|
|
|
def html_for_section(group)
|
|
|
|
icons =
|
|
|
|
group["icons"].map do |icon|
|
|
|
|
class_attr = icon["diversity"] ? " class=\"diversity\"" : ""
|
2022-09-23 06:21:34 +08:00
|
|
|
" {{replace-emoji \":#{icon["name"]}:\" (hash lazy=true#{class_attr} tabIndex=\"0\")}}"
|
2020-11-25 23:58:19 +08:00
|
|
|
end
|
|
|
|
|
DEV: Correctly tag heredocs (#16061)
This allows text editors to use correct syntax coloring for the heredoc sections.
Heredoc tag names we use:
languages: SQL, JS, RUBY, LUA, HTML, CSS, SCSS, SH, HBS, XML, YAML/YML, MF, ICS
other: MD, TEXT/TXT, RAW, EMAIL
2022-03-01 03:50:55 +08:00
|
|
|
<<~HTML
|
2020-11-25 23:58:19 +08:00
|
|
|
<div class="section" data-section="#{group["name"]}">
|
|
|
|
<div class="section-header">
|
|
|
|
<span class="title">{{i18n "emoji_picker.#{group["name"]}"}}</span>
|
|
|
|
</div>
|
|
|
|
<div class="section-group">
|
|
|
|
#{icons.join("\n").strip}
|
|
|
|
</div>
|
|
|
|
</div>
|
DEV: Correctly tag heredocs (#16061)
This allows text editors to use correct syntax coloring for the heredoc sections.
Heredoc tag names we use:
languages: SQL, JS, RUBY, LUA, HTML, CSS, SCSS, SH, HBS, XML, YAML/YML, MF, ICS
other: MD, TEXT/TXT, RAW, EMAIL
2022-03-01 03:50:55 +08:00
|
|
|
HTML
|
2020-11-25 23:58:19 +08:00
|
|
|
end
|
|
|
|
|
2020-09-12 01:53:56 +08:00
|
|
|
def write_template(path, task_name, template)
|
DEV: Correctly tag heredocs (#16061)
This allows text editors to use correct syntax coloring for the heredoc sections.
Heredoc tag names we use:
languages: SQL, JS, RUBY, LUA, HTML, CSS, SCSS, SH, HBS, XML, YAML/YML, MF, ICS
other: MD, TEXT/TXT, RAW, EMAIL
2022-03-01 03:50:55 +08:00
|
|
|
header = <<~JS
|
2020-05-09 01:25:25 +08:00
|
|
|
// DO NOT EDIT THIS FILE!!!
|
2020-09-12 01:53:56 +08:00
|
|
|
// Update it by running `rake javascript:#{task_name}`
|
DEV: Correctly tag heredocs (#16061)
This allows text editors to use correct syntax coloring for the heredoc sections.
Heredoc tag names we use:
languages: SQL, JS, RUBY, LUA, HTML, CSS, SCSS, SH, HBS, XML, YAML/YML, MF, ICS
other: MD, TEXT/TXT, RAW, EMAIL
2022-03-01 03:50:55 +08:00
|
|
|
JS
|
2020-05-12 03:29:46 +08:00
|
|
|
|
2020-05-12 03:43:09 +08:00
|
|
|
basename = File.basename(path)
|
|
|
|
output_path = "#{Rails.root}/app/assets/javascripts/#{path}"
|
|
|
|
|
|
|
|
File.write(output_path, "#{header}\n\n#{template}")
|
|
|
|
puts "#{basename} created"
|
2024-09-03 17:51:07 +08:00
|
|
|
system("pnpm prettier --write #{output_path}", exception: true)
|
2020-05-12 03:43:09 +08:00
|
|
|
puts "#{basename} prettified"
|
|
|
|
end
|
2020-05-09 01:25:25 +08:00
|
|
|
|
2020-11-25 23:58:19 +08:00
|
|
|
def write_hbs_template(path, task_name, template)
|
DEV: Correctly tag heredocs (#16061)
This allows text editors to use correct syntax coloring for the heredoc sections.
Heredoc tag names we use:
languages: SQL, JS, RUBY, LUA, HTML, CSS, SCSS, SH, HBS, XML, YAML/YML, MF, ICS
other: MD, TEXT/TXT, RAW, EMAIL
2022-03-01 03:50:55 +08:00
|
|
|
header = <<~HBS
|
2020-11-25 23:58:19 +08:00
|
|
|
{{!-- DO NOT EDIT THIS FILE!!! --}}
|
|
|
|
{{!-- Update it by running `rake javascript:#{task_name}` --}}
|
DEV: Correctly tag heredocs (#16061)
This allows text editors to use correct syntax coloring for the heredoc sections.
Heredoc tag names we use:
languages: SQL, JS, RUBY, LUA, HTML, CSS, SCSS, SH, HBS, XML, YAML/YML, MF, ICS
other: MD, TEXT/TXT, RAW, EMAIL
2022-03-01 03:50:55 +08:00
|
|
|
HBS
|
2020-11-25 23:58:19 +08:00
|
|
|
|
|
|
|
basename = File.basename(path)
|
|
|
|
output_path = "#{Rails.root}/app/assets/javascripts/#{path}"
|
|
|
|
File.write(output_path, "#{header}\n#{template}")
|
2024-09-03 17:51:07 +08:00
|
|
|
system("pnpm prettier --write #{output_path}", exception: true)
|
2020-11-25 23:58:19 +08:00
|
|
|
puts "#{basename} created"
|
|
|
|
end
|
|
|
|
|
2020-09-22 03:06:56 +08:00
|
|
|
def dependencies
|
|
|
|
[
|
2022-06-16 01:49:04 +08:00
|
|
|
{ source: "chart.js/dist/chart.min.js", public: true },
|
2020-08-06 23:57:06 +08:00
|
|
|
{ source: "chartjs-plugin-datalabels/dist/chartjs-plugin-datalabels.min.js", public: true },
|
2018-10-03 22:15:43 +08:00
|
|
|
{ source: "magnific-popup/dist/jquery.magnific-popup.min.js", public: true },
|
|
|
|
{ source: "pikaday/pikaday.js", public: true },
|
2019-02-13 02:57:52 +08:00
|
|
|
{ source: "moment/moment.js" },
|
2022-02-26 09:06:12 +08:00
|
|
|
{ source: "moment/locale/.", destination: "moment-locale" },
|
2023-01-09 20:10:19 +08:00
|
|
|
{
|
2019-05-08 11:42:49 +08:00
|
|
|
source: "moment-timezone/builds/moment-timezone-with-data-10-year-range.js",
|
|
|
|
destination: "moment-timezone-with-data.js",
|
2023-01-09 20:10:19 +08:00
|
|
|
},
|
|
|
|
{
|
2022-02-26 09:06:12 +08:00
|
|
|
source: "@discourse/moment-timezone-names-translations/locales/.",
|
2019-02-26 03:40:02 +08:00
|
|
|
destination: "moment-timezone-names-locale",
|
2023-01-09 20:10:19 +08:00
|
|
|
},
|
2021-06-23 23:31:12 +08:00
|
|
|
{
|
|
|
|
source: "squoosh/codecs/mozjpeg/enc/mozjpeg_enc.js",
|
|
|
|
destination: "squoosh",
|
|
|
|
public: true,
|
|
|
|
skip_versioning: true,
|
2023-01-09 20:10:19 +08:00
|
|
|
},
|
|
|
|
{
|
2021-06-23 23:31:12 +08:00
|
|
|
source: "squoosh/codecs/mozjpeg/enc/mozjpeg_enc.wasm",
|
|
|
|
destination: "squoosh",
|
2020-09-22 03:06:56 +08:00
|
|
|
public: true,
|
2021-03-01 22:15:17 +08:00
|
|
|
skip_versioning: true,
|
2021-06-23 23:31:12 +08:00
|
|
|
},
|
|
|
|
{
|
|
|
|
source: "squoosh/codecs/resize/pkg/squoosh_resize.js",
|
|
|
|
destination: "squoosh",
|
|
|
|
public: true,
|
|
|
|
skip_versioning: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
source: "squoosh/codecs/resize/pkg/squoosh_resize_bg.wasm",
|
|
|
|
destination: "squoosh",
|
|
|
|
public: true,
|
|
|
|
skip_versioning: true,
|
2021-07-07 08:39:33 +08:00
|
|
|
},
|
2018-10-03 22:15:43 +08:00
|
|
|
]
|
2020-09-22 03:06:56 +08:00
|
|
|
end
|
|
|
|
|
|
|
|
def node_package_name(f)
|
2021-03-01 22:15:17 +08:00
|
|
|
f[:package_name] || f[:source].split("/").first
|
2020-09-22 03:06:56 +08:00
|
|
|
end
|
|
|
|
|
|
|
|
def public_path_name(f)
|
|
|
|
f[:destination] || node_package_name(f)
|
|
|
|
end
|
|
|
|
|
2022-05-02 23:10:26 +08:00
|
|
|
def absolute_sourcemap(dest)
|
|
|
|
File.open(dest) do |file|
|
|
|
|
contents = file.read
|
|
|
|
contents.gsub!(/sourceMappingURL=(.*)/, 'sourceMappingURL=/\1')
|
|
|
|
File.open(dest, "w+") { |d| d.write(contents) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-09-22 03:06:56 +08:00
|
|
|
task "javascript:update_constants" => :environment do
|
|
|
|
task_name = "update_constants"
|
|
|
|
|
2023-10-25 09:45:10 +08:00
|
|
|
auto_groups =
|
|
|
|
Group::AUTO_GROUPS.inject({}) do |result, (group_name, group_id)|
|
|
|
|
result.merge(
|
|
|
|
group_name => {
|
|
|
|
id: group_id,
|
|
|
|
automatic: true,
|
|
|
|
name: group_name,
|
|
|
|
display_name: group_name,
|
|
|
|
},
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
2020-09-22 03:06:56 +08:00
|
|
|
write_template("discourse/app/lib/constants.js", task_name, <<~JS)
|
|
|
|
export const SEARCH_PRIORITIES = #{Searchable::PRIORITIES.to_json};
|
|
|
|
|
|
|
|
export const SEARCH_PHRASE_REGEXP = '#{Search::PHRASE_MATCH_REGEXP_PATTERN}';
|
2023-03-27 10:03:16 +08:00
|
|
|
|
|
|
|
export const SIDEBAR_URL = {
|
|
|
|
max_icon_length: #{SidebarUrl::MAX_ICON_LENGTH},
|
|
|
|
max_name_length: #{SidebarUrl::MAX_NAME_LENGTH},
|
|
|
|
max_value_length: #{SidebarUrl::MAX_VALUE_LENGTH}
|
|
|
|
}
|
|
|
|
|
|
|
|
export const SIDEBAR_SECTION = {
|
|
|
|
max_title_length: #{SidebarSection::MAX_TITLE_LENGTH},
|
|
|
|
}
|
2023-10-25 09:45:10 +08:00
|
|
|
|
|
|
|
export const AUTO_GROUPS = #{auto_groups.to_json};
|
2024-01-16 09:50:55 +08:00
|
|
|
|
2024-07-18 08:33:14 +08:00
|
|
|
export const GROUP_SMTP_SSL_MODES = #{Group.smtp_ssl_modes.to_json};
|
|
|
|
|
2024-01-16 09:50:55 +08:00
|
|
|
export const MAX_NOTIFICATIONS_LIMIT_PARAMS = #{NotificationsController::INDEX_LIMIT};
|
2024-04-29 08:34:46 +08:00
|
|
|
|
|
|
|
export const TOPIC_VISIBILITY_REASONS = #{Topic.visibility_reasons.to_json};
|
2024-06-05 11:27:06 +08:00
|
|
|
|
2024-10-30 22:46:56 +08:00
|
|
|
export const SYSTEM_FLAG_IDS = #{PostActionType.types.to_json};
|
2024-06-19 14:01:24 +08:00
|
|
|
|
2024-10-30 22:46:56 +08:00
|
|
|
export const SITE_SETTING_REQUIRES_CONFIRMATION_TYPES = #{SiteSettings::TypeSupervisor::REQUIRES_CONFIRMATION_TYPES.to_json};
|
|
|
|
|
|
|
|
export const MAX_UNOPTIMIZED_CATEGORIES = #{CategoryList::MAX_UNOPTIMIZED_CATEGORIES};
|
2020-09-22 03:06:56 +08:00
|
|
|
JS
|
|
|
|
|
2020-10-09 03:40:06 +08:00
|
|
|
pretty_notifications = Notification.types.map { |n| " #{n[0]}: #{n[1]}," }.join("\n")
|
|
|
|
|
|
|
|
write_template("discourse/tests/fixtures/concerns/notification-types.js", task_name, <<~JS)
|
|
|
|
export const NOTIFICATION_TYPES = {
|
|
|
|
#{pretty_notifications}
|
|
|
|
};
|
|
|
|
JS
|
|
|
|
|
2020-09-22 03:06:56 +08:00
|
|
|
write_template("pretty-text/addon/emoji/data.js", task_name, <<~JS)
|
|
|
|
export const emojis = #{Emoji.standard.map(&:name).flatten.inspect};
|
|
|
|
export const tonableEmojis = #{Emoji.tonable_emojis.flatten.inspect};
|
|
|
|
export const aliases = #{Emoji.aliases.inspect.gsub("=>", ":")};
|
|
|
|
export const searchAliases = #{Emoji.search_aliases.inspect.gsub("=>", ":")};
|
|
|
|
export const translations = #{Emoji.translations.inspect.gsub("=>", ":")};
|
|
|
|
export const replacements = #{Emoji.unicode_replacements_json};
|
|
|
|
JS
|
|
|
|
|
|
|
|
write_template("pretty-text/addon/emoji/version.js", task_name, <<~JS)
|
|
|
|
export const IMAGE_VERSION = "#{Emoji::EMOJI_VERSION}";
|
|
|
|
JS
|
2020-11-25 23:58:19 +08:00
|
|
|
|
|
|
|
groups_json = JSON.parse(File.read("lib/emoji/groups.json"))
|
|
|
|
|
|
|
|
emoji_buttons = groups_json.map { |group| <<~HTML }
|
DEV: Remove usage of {{action}} modifiers - Take 2 (#18476)
This PR enables the [`no-action-modifiers`](https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-action-modifiers.md) template lint rule and removes all usages of the `{{action}}` modifier in core.
In general, instances of `{{action "x"}}` have been replaced with `{{on "click" (action "x")}}`.
In many cases, such as for `a` elements, we also need to prevent default event handling to avoid unwanted side effects. While the `{{action}}` modifier internally calls `event.preventDefault()`, we need to handle these cases more explicitly. For this purpose, this PR also adds the [ember-event-helpers](https://github.com/buschtoens/ember-event-helpers) dependency so we can use the `prevent-default` handler. For instance:
```
<a href {{on "click" (prevent-default (action "x"))}}>Do X</a>
```
Note that `action` has not in general been refactored away as a helper yet. In general, all event handlers should be methods on the corresponding component and referenced directly (e.g. `{{on "click" this.doSomething}}`). However, the `action` helper is used extensively throughout the codebase and often references methods in the `actions` hash on controllers or routes. Thus this refactor will also be extensive and probably deserves a separate PR.
Note: This work was done to complement #17767 by minimizing the potential impact of the `action` modifier override, which uses private API and arguably should be replaced with an AST transform.
This is a followup to #18333, which had to be reverted because it did not account for the default treatment of modifier keys by the {{action}} modifier.
Commits:
* Enable `no-action-modifiers` template lint rule
* Replace {{action "x"}} with {{on "click" (action "x")}}
* Remove unnecessary action helper usage
* Remove ctl+click tests for user-menu
These tests now break in Chrome when used with addEventListener. As per the comment, they can probably be safely removed.
* Prevent default event handlers to avoid unwanted side effects
Uses `event.preventDefault()` in event handlers to prevent default event handling. This had been done automatically by the `action` modifier, but is not always desirable or necessary.
* Restore UserCardContents#showUser action to avoid regression
By keeping the `showUser` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showUser` argument that's been passed.
* Revert EditCategoryTab#selectTab -> EditCategoryTab#select
Avoid potential breaking change in themes / plugins
* Restore GroupCardContents#showGroup action to avoid regression
By keeping the `showGroup` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showGroup` argument that's been passed.
* Restore SecondFactorAddTotp#showSecondFactorKey action to avoid regression
By keeping the `showSecondFactorKey` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showSecondFactorKey` property that's maintained on the controller.
* Refactor away from `actions` hash in ChooseMessage component
* Modernize EmojiPicker#onCategorySelection usage
* Modernize SearchResultEntry#logClick usage
* Modernize Discovery::Categories#showInserted usage
* Modernize Preferences::Account#resendConfirmationEmail usage
* Modernize MultiSelect::SelectedCategory#onSelectedNameClick usage
* Favor fn over action in SelectedChoice component
* Modernize WizardStep event handlers
* Favor fn over action usage in buttons
* Restore Login#forgotPassword action to avoid possible regression
* Introduce modKeysPressed utility
Returns an array of modifier keys that are pressed during a given `MouseEvent` or `KeyboardEvent`.
* Don't interfere with click events on links with `href` values when modifier keys are pressed
2022-10-05 20:08:54 +08:00
|
|
|
<button type="button" data-section="#{group["name"]}" {{on "click" (fn this.onCategorySelection "#{group["name"]}")}} class="btn btn-default category-button emoji">
|
2020-11-25 23:58:19 +08:00
|
|
|
{{replace-emoji ":#{group["tabicon"]}:"}}
|
|
|
|
</button>
|
DEV: Correctly tag heredocs (#16061)
This allows text editors to use correct syntax coloring for the heredoc sections.
Heredoc tag names we use:
languages: SQL, JS, RUBY, LUA, HTML, CSS, SCSS, SH, HBS, XML, YAML/YML, MF, ICS
other: MD, TEXT/TXT, RAW, EMAIL
2022-03-01 03:50:55 +08:00
|
|
|
HTML
|
2020-11-25 23:58:19 +08:00
|
|
|
|
|
|
|
emoji_sections = groups_json.map { |group| html_for_section(group) }
|
|
|
|
|
2023-02-20 11:20:47 +08:00
|
|
|
components_dir = "discourse/app/components"
|
2020-11-25 23:58:19 +08:00
|
|
|
write_hbs_template("#{components_dir}/emoji-group-buttons.hbs", task_name, emoji_buttons.join)
|
|
|
|
write_hbs_template("#{components_dir}/emoji-group-sections.hbs", task_name, emoji_sections.join)
|
2020-09-22 03:06:56 +08:00
|
|
|
end
|
|
|
|
|
|
|
|
task "javascript:update" => "clean_up" do
|
|
|
|
require "uglifier"
|
|
|
|
|
2024-09-03 17:51:07 +08:00
|
|
|
system("pnpm install", exception: true)
|
2018-10-03 22:15:43 +08:00
|
|
|
|
2020-09-12 01:53:56 +08:00
|
|
|
versions = {}
|
2018-10-03 22:15:43 +08:00
|
|
|
start = Time.now
|
|
|
|
|
|
|
|
dependencies.each do |f|
|
|
|
|
src = "#{library_src}/#{f[:source]}"
|
|
|
|
|
2023-02-16 17:40:11 +08:00
|
|
|
if f[:destination]
|
2018-10-03 22:15:43 +08:00
|
|
|
filename = f[:destination]
|
2023-02-16 17:40:11 +08:00
|
|
|
else
|
|
|
|
filename = f[:source].split("/").last
|
2018-10-03 22:15:43 +08:00
|
|
|
end
|
|
|
|
|
2020-07-16 03:29:12 +08:00
|
|
|
if f[:public_root]
|
|
|
|
dest = "#{public_root}/#{filename}"
|
|
|
|
elsif f[:public]
|
2020-09-22 03:06:56 +08:00
|
|
|
if f[:skip_versioning]
|
|
|
|
dest = "#{public_js}/#{filename}"
|
|
|
|
else
|
|
|
|
package_dir_name = public_path_name(f)
|
|
|
|
package_version =
|
|
|
|
JSON.parse(File.read("#{library_src}/#{node_package_name(f)}/package.json"))["version"]
|
2022-06-16 01:49:04 +08:00
|
|
|
versions[filename.downcase] = "#{package_dir_name}/#{package_version}/#{filename}"
|
2020-09-22 03:06:56 +08:00
|
|
|
|
|
|
|
path = "#{public_js}/#{package_dir_name}/#{package_version}"
|
|
|
|
dest = "#{path}/#{filename}"
|
2020-09-12 01:53:56 +08:00
|
|
|
|
2022-01-06 01:45:08 +08:00
|
|
|
FileUtils.mkdir_p(path) unless File.exist?(path)
|
2020-09-22 03:06:56 +08:00
|
|
|
end
|
2018-10-03 22:15:43 +08:00
|
|
|
else
|
|
|
|
dest = "#{vendor_js}/#{filename}"
|
|
|
|
end
|
|
|
|
|
|
|
|
STDERR.puts "New dependency added: #{dest}" unless File.exist?(dest)
|
|
|
|
|
2023-06-29 18:23:46 +08:00
|
|
|
FileUtils.cp_r(src, dest)
|
2018-10-03 22:15:43 +08:00
|
|
|
end
|
|
|
|
|
2020-09-12 01:53:56 +08:00
|
|
|
write_template("discourse/app/lib/public-js-versions.js", "update", <<~JS)
|
|
|
|
export const PUBLIC_JS_VERSIONS = #{versions.to_json};
|
|
|
|
JS
|
|
|
|
|
2018-10-03 22:15:43 +08:00
|
|
|
STDERR.puts "Completed copying dependencies: #{(Time.now - start).round(2)} secs"
|
|
|
|
end
|
2020-09-22 03:06:56 +08:00
|
|
|
|
|
|
|
task "javascript:clean_up" do
|
|
|
|
processed = []
|
|
|
|
dependencies.each do |f|
|
|
|
|
next unless f[:public] && !f[:skip_versioning]
|
|
|
|
|
|
|
|
package_dir_name = public_path_name(f)
|
|
|
|
next if processed.include?(package_dir_name)
|
|
|
|
|
|
|
|
versions = Dir["#{File.join(public_js, package_dir_name)}/*"].collect { |p| p.split("/").last }
|
2024-05-27 18:27:13 +08:00
|
|
|
next if versions.blank?
|
2020-09-22 03:06:56 +08:00
|
|
|
|
|
|
|
versions = versions.sort { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }
|
|
|
|
puts "Keeping #{package_dir_name} version: #{versions[-1]}"
|
|
|
|
|
|
|
|
# Keep the most recent version
|
|
|
|
versions[0..-2].each do |version|
|
|
|
|
remove_path = File.join(public_js, package_dir_name, version)
|
|
|
|
puts "Removing: #{remove_path}"
|
|
|
|
FileUtils.remove_dir(remove_path)
|
|
|
|
end
|
|
|
|
|
|
|
|
processed << package_dir_name
|
|
|
|
end
|
|
|
|
end
|