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

This reverts commit 49a1e1cd0eac1af823963b9095ac65329d330daf.

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

View File

@ -106,7 +106,7 @@ class DiscourseJsProcessor
end
def self.load_file_in_context(ctx, path, wrap_in_module: nil)
contents = File.read(path)
contents = File.read("#{Rails.root}/app/assets/javascripts/#{path}")
contents = <<~JS if wrap_in_module
define(#{wrap_in_module.to_json}, ["exports", "require", "module"], function(exports, require, module){
#{contents}
@ -134,10 +134,10 @@ class DiscourseJsProcessor
JS
# define/require support
load_file_in_context(ctx, "#{Rails.root}/node_modules/loader.js/dist/loader/loader.js")
load_file_in_context(ctx, "node_modules/loader.js/dist/loader/loader.js")
# Babel
load_file_in_context(ctx, "#{Rails.root}/node_modules/@babel/standalone/babel.js")
load_file_in_context(ctx, "node_modules/@babel/standalone/babel.js")
ctx.eval <<~JS
globalThis.rawBabelTransform = function(){
return Babel.transform(...arguments).code;
@ -145,42 +145,39 @@ class DiscourseJsProcessor
JS
# Terser
load_file_in_context(ctx, "#{Rails.root}/node_modules/source-map/dist/source-map.js")
load_file_in_context(ctx, "#{Rails.root}/node_modules/terser/dist/bundle.min.js")
load_file_in_context(ctx, "node_modules/source-map/dist/source-map.js")
load_file_in_context(ctx, "node_modules/terser/dist/bundle.min.js")
# Template Compiler
load_file_in_context(ctx, "node_modules/ember-source/dist/ember-template-compiler.js")
load_file_in_context(
ctx,
"#{Rails.root}/node_modules/ember-source/dist/ember-template-compiler.js",
)
load_file_in_context(
ctx,
"#{Rails.root}/node_modules/babel-plugin-ember-template-compilation/src/plugin.js",
"node_modules/babel-plugin-ember-template-compilation/src/plugin.js",
wrap_in_module: "babel-plugin-ember-template-compilation/index",
)
load_file_in_context(
ctx,
"#{Rails.root}/node_modules/babel-plugin-ember-template-compilation/src/expression-parser.js",
"node_modules/babel-plugin-ember-template-compilation/src/expression-parser.js",
wrap_in_module: "babel-plugin-ember-template-compilation/expression-parser",
)
load_file_in_context(
ctx,
"#{Rails.root}/node_modules/babel-plugin-ember-template-compilation/src/js-utils.js",
"node_modules/babel-plugin-ember-template-compilation/src/js-utils.js",
wrap_in_module: "babel-plugin-ember-template-compilation/js-utils",
)
load_file_in_context(
ctx,
"#{Rails.root}/node_modules/babel-plugin-ember-template-compilation/src/public-types.js",
"node_modules/babel-plugin-ember-template-compilation/src/public-types.js",
wrap_in_module: "babel-plugin-ember-template-compilation/public-types",
)
load_file_in_context(
ctx,
"#{Rails.root}/node_modules/babel-import-util/src/index.js",
"node_modules/babel-import-util/src/index.js",
wrap_in_module: "babel-import-util",
)
load_file_in_context(
ctx,
"#{Rails.root}/node_modules/ember-cli-htmlbars/lib/colocated-babel-plugin.js",
"node_modules/ember-cli-htmlbars/lib/colocated-babel-plugin.js",
wrap_in_module: "colocated-babel-plugin",
)
@ -205,7 +202,7 @@ class DiscourseJsProcessor
# Raw HBS compiler
load_file_in_context(
ctx,
"#{Rails.root}/node_modules/handlebars/dist/handlebars.js",
"node_modules/handlebars/dist/handlebars.js",
wrap_in_module: "handlebars",
)
@ -229,7 +226,7 @@ class DiscourseJsProcessor
# Theme template AST transformation plugins
load_file_in_context(
ctx,
"#{Rails.root}/app/assets/javascripts/discourse-js-processor.js",
"discourse-js-processor.js",
wrap_in_module: "discourse-js-processor",
)