lib/ember/appkit/rails/engine.rb in ember-appkit-rails-0.3.2 vs lib/ember/appkit/rails/engine.rb in ember-appkit-rails-0.4.0

- old
+ new

@@ -6,12 +6,10 @@ config.ember.paths.app = 'app' config.ember.paths.config = 'config' config.ember.namespaces.app = 'app' config.ember.namespaces.config = 'config' - - config.ember.enable_logging = ::Rails.env.development? config.ember.api_version = 1 generators do |app| app.config.generators.helper false app.config.generators.assets false @@ -60,12 +58,17 @@ end initializer :appkit_sprockets do assets = Sprockets::Railtie.config.assets + precompile_index = config.assets.precompile.index { |i| i =~ File.join(Rails.root, 'app/assets/javascripts/application.js') } + config.assets.precompile[precompile_index] = /(?<!assets\/javascripts)(?:\/|\\|\A)application\.(css|js)$/ + assets_javascript = assets.paths.delete(::Rails.root.join('app','assets','javascripts').to_s) + assets.paths.delete(::Rails.root.join('lib', 'assets','javascript').to_s) - index_of_last_app_assets = assets.paths.rindex{|s| s.start_with?(::Rails.root.join('app').to_s) } + 1 + index_of_last_app_assets = assets.paths.rindex { |path| path.to_s.start_with?(::Rails.root.join('app').to_s) } + 1 + assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, 'lib')) assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.paths.app)) assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.paths.config)) end initializer :appkit_setup_vendor, after: :append_assets_path, :group => :all do |app|