DEV: Prepare for rename of app/assets/javascripts/ -> frontend/

This commit contains all the code changes. A followup will perform the actual move
This commit is contained in:
David Taylor
2025-10-22 16:24:11 +01:00
parent ecb5f7b910
commit e56a4bf03e
38 changed files with 131 additions and 168 deletions
+2 -2
View File
@@ -15,9 +15,9 @@ DOWNLOAD_TEMP_FILE = "#{__dir__}/../tmp/assets.tar.gz"
PRE_BUILD_ROOT = "https://get.discourse.org/discourse-assets"
JS_SOURCE_PATHS = %w[app/assets/javascripts package.json pnpm-lock.yaml]
JS_SOURCE_PATHS = %w[frontend package.json pnpm-lock.yaml]
EMBER_APP_DIR = "app/assets/javascripts/discourse"
EMBER_APP_DIR = "frontend/discourse"
BUILD_INFO_FILE = "#{EMBER_APP_DIR}/dist/BUILD_INFO.json"
Dir.chdir("#{__dir__}/..")
+10 -10
View File
@@ -7,15 +7,15 @@ require "json"
Dir.chdir("#{__dir__}/..") # rubocop:disable Discourse/NoChdir because this is not part of the app
CORE_NAMESPACES = {
"discourse/admin/*" => ["app/assets/javascripts/discourse/admin"],
"discourse/*" => ["app/assets/javascripts/discourse/app"],
"discourse/tests/*" => ["app/assets/javascripts/discourse/tests"],
"admin/*" => ["app/assets/javascripts/discourse/admin"], # TODO: remove once all core code is migrated to new import path
"pretty-text/*" => ["app/assets/javascripts/pretty-text/addon"],
"select-kit/*" => ["app/assets/javascripts/select-kit/addon"],
"float-kit/*" => ["app/assets/javascripts/float-kit/addon"],
"truth-helpers/*" => ["app/assets/javascripts/truth-helpers/addon"],
"dialog-holder/*" => ["app/assets/javascripts/dialog-holder/addon"],
"discourse/admin/*" => ["frontend/discourse/admin"],
"discourse/*" => ["frontend/discourse/app"],
"discourse/tests/*" => ["frontend/discourse/tests"],
"admin/*" => ["frontend/discourse/admin"], # TODO: remove once all core code is migrated to new import path
"pretty-text/*" => ["frontend/pretty-text/addon"],
"select-kit/*" => ["frontend/select-kit/addon"],
"float-kit/*" => ["frontend/float-kit/addon"],
"truth-helpers/*" => ["frontend/truth-helpers/addon"],
"dialog-holder/*" => ["frontend/dialog-holder/addon"],
}
def relative(from, to)
@@ -42,7 +42,7 @@ def write_config(package_dir, extras: {})
},
"include" => namespaces.flat_map { |ns, paths| paths.map { |p| relative(package_dir, p) } },
"exclude" => [
"app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js", # Native class decorators - unsupported by ts/glint
"frontend/discourse/tests/unit/utils/decorators-test.js", # Native class decorators - unsupported by ts/glint
],
}
+1 -1
View File
@@ -7,7 +7,7 @@
require "digest"
DIST_DIR = File.expand_path("#{__dir__}/../app/assets/javascripts/discourse/dist")
DIST_DIR = File.expand_path("#{__dir__}/../frontend/discourse/dist")
def collect_asset_info
files =
+1 -1
View File
@@ -26,7 +26,7 @@ end
common_env = { "DISCOURSE_DOWNLOAD_PRE_BUILT_ASSETS" => "0", "LOAD_PLUGINS" => "0" }
Dir.chdir("#{__dir__}/../app/assets/javascripts/discourse")
Dir.chdir("#{__dir__}/../frontend/discourse")
FileUtils.rm_rf("dist")
system({ **common_env, "EMBER_ENV" => "production" }, "#{__dir__}/assemble_ember_build.rb")