diff --git a/lib/generators/react/install_generator.rb b/lib/generators/react/install_generator.rb index d37ad2c7..694b3e54 100644 --- a/lib/generators/react/install_generator.rb +++ b/lib/generators/react/install_generator.rb @@ -96,9 +96,9 @@ def setup_react_sprockets WEBPACKER_SETUP_UJS = <<-JS // Support component names relative to this directory: -var componentRequireContext = require.context("components", true) -var ReactRailsUJS = require("react_ujs") -ReactRailsUJS.useContext(componentRequireContext) +var componentRequireContext = require.context("components", true); +var ReactRailsUJS = require("react_ujs"); +ReactRailsUJS.useContext(componentRequireContext); JS def setup_react_webpacker diff --git a/lib/generators/templates/server_rendering_pack.js b/lib/generators/templates/server_rendering_pack.js index 0db0eb26..a31e683d 100644 --- a/lib/generators/templates/server_rendering_pack.js +++ b/lib/generators/templates/server_rendering_pack.js @@ -1,5 +1,5 @@ // By default, this pack is loaded for server-side rendering. // It must expose react_ujs as `ReactRailsUJS` and prepare a require context. -var componentRequireContext = require.context("components", true) -var ReactRailsUJS = require("react_ujs") -ReactRailsUJS.useContext(componentRequireContext) +var componentRequireContext = require.context("components", true); +var ReactRailsUJS = require("react_ujs"); +ReactRailsUJS.useContext(componentRequireContext); diff --git a/test/dummy_webpacker1/app/javascript/packs/server_rendering.js b/test/dummy_webpacker1/app/javascript/packs/server_rendering.js index dd8d4575..ee90c75a 100644 --- a/test/dummy_webpacker1/app/javascript/packs/server_rendering.js +++ b/test/dummy_webpacker1/app/javascript/packs/server_rendering.js @@ -1,5 +1,5 @@ // By default, this pack is loaded for server-side rendering. // It must expose react_ujs as `ReactRailsUJS` and prepare a require context. -var componentRequireContext = require.context("components", true) -var ReactRailsUJS = require("../../../../../react_ujs/index") -ReactRailsUJS.useContext(componentRequireContext) +var componentRequireContext = require.context("components", true); +var ReactRailsUJS = require("../../../../../react_ujs/index"); +ReactRailsUJS.useContext(componentRequireContext); diff --git a/test/dummy_webpacker2/app/javascript/packs/server_rendering.js b/test/dummy_webpacker2/app/javascript/packs/server_rendering.js index 0db0eb26..a31e683d 100644 --- a/test/dummy_webpacker2/app/javascript/packs/server_rendering.js +++ b/test/dummy_webpacker2/app/javascript/packs/server_rendering.js @@ -1,5 +1,5 @@ // By default, this pack is loaded for server-side rendering. // It must expose react_ujs as `ReactRailsUJS` and prepare a require context. -var componentRequireContext = require.context("components", true) -var ReactRailsUJS = require("react_ujs") -ReactRailsUJS.useContext(componentRequireContext) +var componentRequireContext = require.context("components", true); +var ReactRailsUJS = require("react_ujs"); +ReactRailsUJS.useContext(componentRequireContext); diff --git a/test/dummy_webpacker3/app/javascript/packs/server_rendering.js b/test/dummy_webpacker3/app/javascript/packs/server_rendering.js index 0db0eb26..a31e683d 100644 --- a/test/dummy_webpacker3/app/javascript/packs/server_rendering.js +++ b/test/dummy_webpacker3/app/javascript/packs/server_rendering.js @@ -1,5 +1,5 @@ // By default, this pack is loaded for server-side rendering. // It must expose react_ujs as `ReactRailsUJS` and prepare a require context. -var componentRequireContext = require.context("components", true) -var ReactRailsUJS = require("react_ujs") -ReactRailsUJS.useContext(componentRequireContext) +var componentRequireContext = require.context("components", true); +var ReactRailsUJS = require("react_ujs"); +ReactRailsUJS.useContext(componentRequireContext); diff --git a/test/generators/install_generator_webpacker_test.rb b/test/generators/install_generator_webpacker_test.rb index 3bec1799..cf1a825e 100644 --- a/test/generators/install_generator_webpacker_test.rb +++ b/test/generators/install_generator_webpacker_test.rb @@ -8,9 +8,9 @@ class InstallGeneratorWebpackerTest < Rails::Generators::TestCase setup :prepare_destination EXPECTED_SETUP = %|// Support component names relative to this directory: -var componentRequireContext = require.context("components", true) -var ReactRailsUJS = require("react_ujs") -ReactRailsUJS.useContext(componentRequireContext) +var componentRequireContext = require.context("components", true); +var ReactRailsUJS = require("react_ujs"); +ReactRailsUJS.useContext(componentRequireContext); | DEFAULT_SERVER_RENDERING_PACK_PATH = 'app/javascript/packs/server_rendering.js' @@ -32,9 +32,9 @@ def copy_directory(dir) test 'creates server_rendering.js with default requires' do run_generator assert_file DEFAULT_SERVER_RENDERING_PACK_PATH do |contents| - assert_includes contents, "var componentRequireContext = require.context(\"components\", true)\n" - assert_includes contents, "var ReactRailsUJS = require(\"react_ujs\")\n" - assert_includes contents, "ReactRailsUJS.useContext(componentRequireContext)\n" + assert_includes contents, "var componentRequireContext = require.context(\"components\", true);\n" + assert_includes contents, "var ReactRailsUJS = require(\"react_ujs\");\n" + assert_includes contents, "ReactRailsUJS.useContext(componentRequireContext);\n" end end