Merge pull request #941 from benbristow/add-semicolons

Add semi-colons to generated JavaScript
reactjs · Oct 8, 2018 · 92a5b0a · 92a5b0a
2 parents 2f032e9 + 6c1d8a6
commit 92a5b0a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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