diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 4f405fc8efac4..3df6dc5b6b888 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -739,11 +739,11 @@ def test_skip_javascript_option def test_webpack_option generator([destination_root], javascript: "webpack") - webpacker_called = 0 + webpack_called = 0 command_check = -> command, *_ do case command when "javascript:install:webpack" - webpacker_called += 1 + webpack_called += 1 end end @@ -751,7 +751,7 @@ def test_webpack_option run_generator_instance end - assert_equal 1, webpacker_called, "`javascript:install:webpack` expected to be called once, but was called #{webpacker_called} times." + assert_equal 1, webpack_called, "`javascript:install:webpack` expected to be called once, but was called #{webpack_called} times." assert_gem "jsbundling-rails" assert_node_files end diff --git a/railties/test/isolation/assets/config/webpack/base.js b/railties/test/isolation/assets/config/webpack/base.js deleted file mode 100644 index a081a4abd6458..0000000000000 --- a/railties/test/isolation/assets/config/webpack/base.js +++ /dev/null @@ -1,3 +0,0 @@ -const { webpackConfig } = require('@rails/webpacker') - -module.exports = webpackConfig diff --git a/railties/test/isolation/assets/config/webpack/development.js b/railties/test/isolation/assets/config/webpack/development.js deleted file mode 100644 index c84a413b59dfe..0000000000000 --- a/railties/test/isolation/assets/config/webpack/development.js +++ /dev/null @@ -1,5 +0,0 @@ -process.env.NODE_ENV = process.env.NODE_ENV || 'development' - -const webpackConfig = require('./base') - -module.exports = webpackConfig diff --git a/railties/test/isolation/assets/config/webpack/production.js b/railties/test/isolation/assets/config/webpack/production.js deleted file mode 100644 index c41e0436014e0..0000000000000 --- a/railties/test/isolation/assets/config/webpack/production.js +++ /dev/null @@ -1,5 +0,0 @@ -process.env.NODE_ENV = process.env.NODE_ENV || 'production' - -const webpackConfig = require('./base') - -module.exports = webpackConfig diff --git a/railties/test/isolation/assets/config/webpack/test.js b/railties/test/isolation/assets/config/webpack/test.js deleted file mode 100644 index c84a413b59dfe..0000000000000 --- a/railties/test/isolation/assets/config/webpack/test.js +++ /dev/null @@ -1,5 +0,0 @@ -process.env.NODE_ENV = process.env.NODE_ENV || 'development' - -const webpackConfig = require('./base') - -module.exports = webpackConfig diff --git a/railties/test/isolation/assets/config/webpacker.yml b/railties/test/isolation/assets/config/webpacker.yml deleted file mode 100644 index c1707a862b47e..0000000000000 --- a/railties/test/isolation/assets/config/webpacker.yml +++ /dev/null @@ -1,61 +0,0 @@ -# Note: You must restart bin/webpack-dev-server for changes to take effect - -default: &default - source_path: app/packs - source_entry_path: entrypoints - public_root_path: public - public_output_path: packs - cache_path: tmp/webpacker - webpack_compile_output: true - - # Additional paths webpack should look up modules - # ['app/assets', 'engine/foo/app/assets'] - additional_paths: [] - - # Reload manifest.json on all requests so we reload latest compiled packs - cache_manifest: false - -development: - <<: *default - compile: true - - # Reference: https://webpack.js.org/configuration/dev-server/ - dev_server: - https: false - host: localhost - port: 3035 - public: localhost:3035 - # Hot Module Replacement updates modules while the application is running without a full reload - hmr: false - # Should we show a full-screen overlay in the browser when there are compiler errors or warnings? - overlay: true - # Should we use gzip compression? - compress: true - # Note that apps that do not check the host are vulnerable to DNS rebinding attacks - disable_host_check: true - # This option lets the browser open with your local IP - use_local_ip: false - # When enabled, nothing except the initial startup information will be written to the console. - # This also means that errors or warnings from webpack are not visible. - quiet: false - pretty: true - headers: - 'Access-Control-Allow-Origin': '*' - watch_options: - ignored: '**/node_modules/**' - -test: - <<: *default - compile: true - - # Compile test packs to a separate directory - public_output_path: packs-test - -production: - <<: *default - - # Production depends on precompilation of packs prior to booting for performance. - compile: false - - # Cache manifest.json for performance - cache_manifest: true diff --git a/railties/test/isolation/assets/package.json b/railties/test/isolation/assets/package.json index 7f4565c2903a2..1eec482908dd5 100644 --- a/railties/test/isolation/assets/package.json +++ b/railties/test/isolation/assets/package.json @@ -4,7 +4,6 @@ "dependencies": { "@rails/actioncable": "file:../../../../actioncable", "@rails/activestorage": "file:../../../../activestorage", - "@rails/ujs": "file:../../../../actionview", - "@rails/webpacker": "^6.0.0-rc.5" + "@rails/ujs": "file:../../../../actionview" } }