From cafad7a23a02a0deeab13dc9f2e03fdacdec70f8 Mon Sep 17 00:00:00 2001 From: Akhil G Krishnan Date: Fri, 8 Sep 2023 11:22:09 +0000 Subject: [PATCH] Remove unused webpacker related files --- actiontext/bin/webpack | 29 ------------------- actiontext/bin/webpack-dev-server | 29 ------------------- .../install/templates/actiontext.css | 7 ++--- guides/source/configuring.md | 3 +- 4 files changed, 4 insertions(+), 64 deletions(-) delete mode 100755 actiontext/bin/webpack delete mode 100755 actiontext/bin/webpack-dev-server diff --git a/actiontext/bin/webpack b/actiontext/bin/webpack deleted file mode 100755 index ac959ee7e5..0000000000 --- a/actiontext/bin/webpack +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env ruby -# frozen_string_literal: true - -# -# This file was generated by Bundler. -# -# The application 'webpack' is installed as part of a gem, and -# this file is here to facilitate running it. -# - -require "pathname" -ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", - Pathname.new(__FILE__).realpath) - -bundle_binstub = File.expand_path("../bundle", __FILE__) - -if File.file?(bundle_binstub) - if File.read(bundle_binstub, 150).include?("This file was generated by Bundler") - load(bundle_binstub) - else - abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. -Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") - end -end - -require "rubygems" -require "bundler/setup" - -load Gem.bin_path("webpacker", "webpack") diff --git a/actiontext/bin/webpack-dev-server b/actiontext/bin/webpack-dev-server deleted file mode 100755 index 54b03c0b9f..0000000000 --- a/actiontext/bin/webpack-dev-server +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env ruby -# frozen_string_literal: true - -# -# This file was generated by Bundler. -# -# The application 'webpack-dev-server' is installed as part of a gem, and -# this file is here to facilitate running it. -# - -require "pathname" -ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", - Pathname.new(__FILE__).realpath) - -bundle_binstub = File.expand_path("../bundle", __FILE__) - -if File.file?(bundle_binstub) - if File.read(bundle_binstub, 150).include?("This file was generated by Bundler") - load(bundle_binstub) - else - abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. -Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") - end -end - -require "rubygems" -require "bundler/setup" - -load Gem.bin_path("webpacker", "webpack-dev-server") diff --git a/actiontext/lib/generators/action_text/install/templates/actiontext.css b/actiontext/lib/generators/action_text/install/templates/actiontext.css index 1f667ba251..e11395ca63 100644 --- a/actiontext/lib/generators/action_text/install/templates/actiontext.css +++ b/actiontext/lib/generators/action_text/install/templates/actiontext.css @@ -3,11 +3,8 @@ * the trix-editor content (whether displayed or under editing). Feel free to incorporate this * inclusion directly in any other asset bundle and remove this file. * -<%- if defined?(Webpacker::Engine) -%> - *= require trix/dist/trix -<%- else -%> - *= require trix -<% end -%> + +*= require trix */ /* diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 0bc3253ae1..416f521df8 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -443,7 +443,8 @@ attacks. #### `config.javascript_path` -Sets the path where your app's JavaScript lives relative to the `app` directory. The default is `javascript`, used by [webpacker](https://github.com/rails/webpacker). An app's configured `javascript_path` will be excluded from `autoload_paths`. +Sets the path where your app's JavaScript lives relative to the `app` directory and the default value is `javascript`. +An app's configured `javascript_path` will be excluded from `autoload_paths`. #### `config.log_file_size`