IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "DEV: Merge package.json files (#21172)" (#21182)

Browse Source 
This reverts commit 49a1e1cd0e.

Is causing issues in prod-adjacent environments (Jenkins)
This commit is contained in:
Jarek Radosz
2023-04-20 14:57:40 +02:00
committed by GitHub
parent 49a1e1cd0e
commit 43e0025141
14 changed files with 10694 additions and 8624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/pretty_text.rb
View File

@@ -91,22 +91,22 @@ module PrettyText
ctx.attach("__helpers.#{method}", PrettyText::Helpers.method(method))
end
workspace_path = "#{Rails.root}/app/assets/javascripts/"
ctx.load("#{Rails.root}/node_modules/loader.js/dist/loader/loader.js")
ctx.load("#{workspace_path}handlebars-shim.js")
ctx.load("#{Rails.root}/node_modules/xss/dist/xss.js")
root_path = "#{Rails.root}/app/assets/javascripts/"
ctx_load(ctx, "#{root_path}/node_modules/loader.js/dist/loader/loader.js")
ctx_load(ctx, "#{root_path}/handlebars-shim.js")
ctx_load(ctx, "#{root_path}/node_modules/xss/dist/xss.js")
ctx.load("#{Rails.root}/lib/pretty_text/vendor-shims.js")
ctx_load_directory(ctx, "pretty-text/addon")
ctx_load_directory(ctx, "pretty-text/engines/discourse-markdown")
ctx.load("#{Rails.root}/node_modules/markdown-it/dist/markdown-it.js")
ctx_load(ctx, "#{root_path}/node_modules/markdown-it/dist/markdown-it.js")
apply_es6_file(ctx, workspace_path, "discourse-common/addon/lib/get-url")
apply_es6_file(ctx, workspace_path, "discourse-common/addon/lib/object")
apply_es6_file(ctx, workspace_path, "discourse-common/addon/lib/deprecated")
apply_es6_file(ctx, workspace_path, "discourse-common/addon/lib/escape")
apply_es6_file(ctx, workspace_path, "discourse-common/addon/utils/watched-words")
apply_es6_file(ctx, workspace_path, "discourse/app/lib/to-markdown")
apply_es6_file(ctx, workspace_path, "discourse/app/lib/utilities")
apply_es6_file(ctx, root_path, "discourse-common/addon/lib/get-url")
apply_es6_file(ctx, root_path, "discourse-common/addon/lib/object")
apply_es6_file(ctx, root_path, "discourse-common/addon/lib/deprecated")
apply_es6_file(ctx, root_path, "discourse-common/addon/lib/escape")
apply_es6_file(ctx, root_path, "discourse-common/addon/utils/watched-words")
apply_es6_file(ctx, root_path, "discourse/app/lib/to-markdown")
apply_es6_file(ctx, root_path, "discourse/app/lib/utilities")
ctx.load("#{Rails.root}/lib/pretty_text/shims.js")
ctx.eval("__setUnicode(#{Emoji.unicode_replacements_json})")
@@ -664,7 +664,7 @@ module PrettyText
end
def self.ctx_load(ctx, *files)
files.each { |file| ctx.load(file) }
files.each { |file| ctx.load(app_root + file) }
end
private