1 files changed, 16 insertions, 28 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 0ff4c03f4a..47d42645c6 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -421,6 +421,10 @@ module TestHelpers
       file_name
     end
 
+    def app_dir(path)
+      FileUtils.mkdir_p("#{app_path}/#{path}")
+    end
+
     def remove_file(path)
       FileUtils.rm_rf "#{app_path}/#{path}"
     end
@@ -472,42 +476,26 @@ Module.new do
   FileUtils.rm_rf(app_template_path)
   FileUtils.mkdir_p(app_template_path)
 
-  Dir.chdir "#{RAILS_FRAMEWORK_ROOT}/actionview" do
-    `yarn build`
-  end
-
-  `#{Gem.ruby} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails new #{app_template_path} --skip-bundle --skip-listen --no-rc`
+  `#{Gem.ruby} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails new #{app_template_path} --skip-bundle --skip-listen --no-rc --skip-webpack-install`
   File.open("#{app_template_path}/config/boot.rb", "w") do |f|
     f.puts "require 'rails/all'"
   end
 
-  Dir.chdir(app_template_path) { `yarn add https://github.com/rails/webpacker.git` } # Use the latest version.
-
-  # Manually install `webpack` as bin symlinks are not created for sub dependencies
-  # in workspaces. See https://github.com/yarnpkg/yarn/issues/4964
-  Dir.chdir(app_template_path) { `yarn add webpack@4.17.1 --tilde` }
-  Dir.chdir(app_template_path) { `yarn add webpack-cli` }
-
-  # FIXME: Temporary fix for webpack + ajv@6.9.0 compatible issue.
-  #        See https://github.com/epoberezkin/ajv/issues/941
-  Dir.chdir(app_template_path) do
-    package = File.read("package.json")
-    resolutions = <<~EOS
-      ,
-        "resolutions": {
-          "ajv": "6.8.1"
-        }
-      }
-    EOS
-    if package =~ /\n}\n\z/
-      File.open("package.json", "w") { |f| f.puts $` + resolutions + $' }
-    end
-  end
+  assets_path = "#{RAILS_FRAMEWORK_ROOT}/railties/test/isolation/assets"
+  FileUtils.cp("#{assets_path}/package.json", "#{app_template_path}/package.json")
+  FileUtils.cp("#{assets_path}/config/webpacker.yml", "#{app_template_path}/config/webpacker.yml")
+  FileUtils.cp_r("#{assets_path}/config/webpack", "#{app_template_path}/config/webpack")
+  FileUtils.ln_s("#{assets_path}/node_modules", "#{app_template_path}/node_modules")
+  FileUtils.chdir(app_template_path) { `bin/rails webpacker:binstubs` }
 
   # Fake 'Bundler.require' -- we run using the repo's Gemfile, not an
   # app-specific one: we don't want to require every gem that lists.
   contents = File.read("#{app_template_path}/config/application.rb")
-  contents.sub!(/^Bundler\.require.*/, "%w(turbolinks webpacker).each { |r| require r }")
+  if RUBY_ENGINE == "ruby"
+    contents.sub!(/^Bundler\.require.*/, "%w(turbolinks webpacker zeitwerk).each { |r| require r }")
+  else
+    contents.sub!(/^Bundler\.require.*/, "%w(turbolinks webpacker).each { |r| require r }")
+  end
   File.write("#{app_template_path}/config/application.rb", contents)
 
   require "rails"