mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 06:15:28 +08:00
22a7905f2d
Previously, accessing the Rails app directly in development mode would give you assets from our 'legacy' Ember asset pipeline. The only way to run with Ember CLI assets was to run ember-cli as a proxy. This was quite limiting when working on things which are bypassed when using the ember-cli proxy (e.g. changes to `application.html.erb`). Also, since `ember-auto-import` introduced chunking, visiting `/theme-qunit` under Ember CLI was failing to include all necessary chunks. This commit teaches Sprockets about our Ember CLI assets so that they can be used in development mode, and are automatically collected up under `/public/assets` during `assets:precompile`. As a bonus, this allows us to remove all the custom manifest modification from `assets:precompile`. The key changes are: - Introduce a shared `EmberCli.enabled?` helper - When ember-cli is enabled, add ember-cli `/dist/assets` as the top-priority Rails asset directory - Have ember-cli output a `chunks.json` manifest, and teach `preload_script` to read it and append the correct chunks to their associated `afterFile` - Remove most custom ember-cli logic from the `assets:precompile` step. Instead, rely on Rails to take care of pulling the 'precompiled' assets into the `public/assets` directory. Move the 'renaming' logic to runtime, so it can be used in development mode as well. - Remove fingerprinting from `ember-cli-build`, and allow Rails to take care of things Long-term, we may want to replace Sprockets with the lighter-weight Propshaft. The changes made in this commit have been made with that long-term goal in mind. tldr: when you visit the rails app directly, you'll now be served the current ember-cli assets. To keep these up-to-date make sure either `ember serve`, or `ember build --watch` is running. If you really want to load the old non-ember-cli assets, then you should start the server with `EMBER_CLI_PROD_ASSETS=0`. (the legacy asset pipeline will be removed very soon)
68 lines
1.6 KiB
Ruby
68 lines
1.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class QunitController < ApplicationController
|
|
skip_before_action *%i{
|
|
check_xhr
|
|
preload_json
|
|
redirect_to_login_if_required
|
|
}
|
|
layout false
|
|
|
|
def is_ember_cli_proxy?
|
|
request.headers["HTTP_X_DISCOURSE_EMBER_CLI"] == "true"
|
|
end
|
|
|
|
# only used in non-ember-cli test / dev
|
|
def index
|
|
raise Discourse::NotFound.new if is_ember_cli_proxy? || EmberCli.enabled?
|
|
raise Discourse::InvalidAccess.new if Rails.env.production?
|
|
end
|
|
|
|
def theme
|
|
raise Discourse::NotFound.new if !can_see_theme_qunit?
|
|
|
|
param_key = nil
|
|
@suggested_themes = nil
|
|
if (id = get_param(:id)).present?
|
|
theme = Theme.find_by(id: id.to_i)
|
|
param_key = :id
|
|
elsif (name = get_param(:name)).present?
|
|
theme = Theme.find_by(name: name)
|
|
param_key = :name
|
|
elsif (url = get_param(:url)).present?
|
|
theme = RemoteTheme.find_by(remote_url: url)&.theme
|
|
param_key = :url
|
|
end
|
|
|
|
if param_key && theme.blank?
|
|
return render plain: "Can't find theme with #{param_key} #{get_param(param_key).inspect}", status: :not_found
|
|
end
|
|
|
|
if !param_key
|
|
@suggested_themes = Theme
|
|
.where(
|
|
id: ThemeField.where(target_id: Theme.targets[:tests_js]).distinct.pluck(:theme_id)
|
|
)
|
|
.order(updated_at: :desc)
|
|
.pluck(:id, :name)
|
|
return
|
|
end
|
|
|
|
request.env[:resolved_theme_id] = theme.id
|
|
request.env[:skip_theme_ids_transformation] = true
|
|
end
|
|
|
|
protected
|
|
|
|
def can_see_theme_qunit?
|
|
return true if !Rails.env.production?
|
|
current_user&.admin?
|
|
end
|
|
|
|
private
|
|
|
|
def get_param(key)
|
|
params[:"theme_#{key}"] || params[key]
|
|
end
|
|
end
|