diff --git a/app/assets/stylesheets/ember_cli.scss b/app/assets/stylesheets/ember_cli.scss new file mode 100644 index 00000000000..175fe19cf75 --- /dev/null +++ b/app/assets/stylesheets/ember_cli.scss @@ -0,0 +1,16 @@ +body.requires-ember-cli { + margin: 2rem; + font-family: Arial, Helvetica; + background-color: white; +} + +pre { + background-color: lightgrey; +} + +pre, +code { + padding: 0; + margin: 0; + padding: 0.5rem; +} diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6903b9df652..adad4c685fb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -94,15 +94,23 @@ class ApplicationController < ActionController::Base end end + def ember_cli_required? + ENV['NO_EMBER_CLI'] != '1' && Rails.env.development? + end + + def application_layout + ember_cli_required? ? "ember_cli" : "application" + end + def set_layout case request.headers["Discourse-Render"] when "desktop" - return "application" + return application_layout when "crawler" return "crawler" end - use_crawler_layout? ? 'crawler' : 'application' + use_crawler_layout? ? 'crawler' : application_layout end class RenderEmpty < StandardError; end diff --git a/app/views/layouts/ember_cli.html.erb b/app/views/layouts/ember_cli.html.erb new file mode 100644 index 00000000000..dd4e070c54c --- /dev/null +++ b/app/views/layouts/ember_cli.html.erb @@ -0,0 +1,27 @@ + + + + + <%= content_for?(:title) ? yield(:title) : SiteSetting.title %> + + <%= stylesheet_link_tag(:ember_cli) %> + + + +
+

Ember CLI is Required in Development Mode

+ +

To run Ember CLI in development mode, please do the following:

+ + 
$ bin/ember-cli
+ +

If it's your first time starting Ember CLI you'll have to run yarn:

+ + 
$ cd app/assets/javascripts/discourse && yarn
+ +

Then visit the following URL to use Discourse:

+ + http://localhost:4200 +
+ + diff --git a/bin/ember-cli b/bin/ember-cli index 1a3da32de00..21ac6b8241d 100755 --- a/bin/ember-cli +++ b/bin/ember-cli @@ -4,7 +4,7 @@ require 'pathname' RAILS_ROOT = File.expand_path("../../", Pathname.new(__FILE__).realpath) -PORT = ENV["UNICORN_PORT"] ||= "9292" +PORT = ENV["UNICORN_PORT"] ||= "3000" Dir.chdir(RAILS_ROOT) # rubocop:disable Discourse/NoChdir Dir.chdir("app/assets/javascripts/discourse") # rubocop:disable Discourse/NoChdir diff --git a/spec/components/stylesheet/compiler_spec.rb b/spec/components/stylesheet/compiler_spec.rb index b71b2d6cce3..4e91d109b32 100644 --- a/spec/components/stylesheet/compiler_spec.rb +++ b/spec/components/stylesheet/compiler_spec.rb @@ -6,6 +6,8 @@ require 'stylesheet/compiler' describe Stylesheet::Compiler do describe 'compilation' do Dir["#{Rails.root.join("app/assets/stylesheets")}/*.scss"].each do |path| + next if path =~ /ember_cli/ + path = File.basename(path, '.scss') it "can compile '#{path}' css" do