Skip to content

Commit 92a5b0a

Browse files
authored
Merge pull request #941 from benbristow/add-semicolons
Add semi-colons to generated JavaScript
2 parents 2f032e9 + 6c1d8a6 commit 92a5b0a

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

lib/generators/react/install_generator.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ def setup_react_sprockets
9696

9797
WEBPACKER_SETUP_UJS = <<-JS
9898
// Support component names relative to this directory:
99-
var componentRequireContext = require.context("components", true)
100-
var ReactRailsUJS = require("react_ujs")
101-
ReactRailsUJS.useContext(componentRequireContext)
99+
var componentRequireContext = require.context("components", true);
100+
var ReactRailsUJS = require("react_ujs");
101+
ReactRailsUJS.useContext(componentRequireContext);
102102
JS
103103

104104
def setup_react_webpacker
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// By default, this pack is loaded for server-side rendering.
22
// It must expose react_ujs as `ReactRailsUJS` and prepare a require context.
3-
var componentRequireContext = require.context("components", true)
4-
var ReactRailsUJS = require("react_ujs")
5-
ReactRailsUJS.useContext(componentRequireContext)
3+
var componentRequireContext = require.context("components", true);
4+
var ReactRailsUJS = require("react_ujs");
5+
ReactRailsUJS.useContext(componentRequireContext);
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// By default, this pack is loaded for server-side rendering.
22
// It must expose react_ujs as `ReactRailsUJS` and prepare a require context.
3-
var componentRequireContext = require.context("components", true)
4-
var ReactRailsUJS = require("../../../../../react_ujs/index")
5-
ReactRailsUJS.useContext(componentRequireContext)
3+
var componentRequireContext = require.context("components", true);
4+
var ReactRailsUJS = require("../../../../../react_ujs/index");
5+
ReactRailsUJS.useContext(componentRequireContext);
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// By default, this pack is loaded for server-side rendering.
22
// It must expose react_ujs as `ReactRailsUJS` and prepare a require context.
3-
var componentRequireContext = require.context("components", true)
4-
var ReactRailsUJS = require("react_ujs")
5-
ReactRailsUJS.useContext(componentRequireContext)
3+
var componentRequireContext = require.context("components", true);
4+
var ReactRailsUJS = require("react_ujs");
5+
ReactRailsUJS.useContext(componentRequireContext);
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// By default, this pack is loaded for server-side rendering.
22
// It must expose react_ujs as `ReactRailsUJS` and prepare a require context.
3-
var componentRequireContext = require.context("components", true)
4-
var ReactRailsUJS = require("react_ujs")
5-
ReactRailsUJS.useContext(componentRequireContext)
3+
var componentRequireContext = require.context("components", true);
4+
var ReactRailsUJS = require("react_ujs");
5+
ReactRailsUJS.useContext(componentRequireContext);

test/generators/install_generator_webpacker_test.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ class InstallGeneratorWebpackerTest < Rails::Generators::TestCase
88
setup :prepare_destination
99

1010
EXPECTED_SETUP = %|// Support component names relative to this directory:
11-
var componentRequireContext = require.context("components", true)
12-
var ReactRailsUJS = require("react_ujs")
13-
ReactRailsUJS.useContext(componentRequireContext)
11+
var componentRequireContext = require.context("components", true);
12+
var ReactRailsUJS = require("react_ujs");
13+
ReactRailsUJS.useContext(componentRequireContext);
1414
|
1515

1616
DEFAULT_SERVER_RENDERING_PACK_PATH = 'app/javascript/packs/server_rendering.js'
@@ -32,9 +32,9 @@ def copy_directory(dir)
3232
test 'creates server_rendering.js with default requires' do
3333
run_generator
3434
assert_file DEFAULT_SERVER_RENDERING_PACK_PATH do |contents|
35-
assert_includes contents, "var componentRequireContext = require.context(\"components\", true)\n"
36-
assert_includes contents, "var ReactRailsUJS = require(\"react_ujs\")\n"
37-
assert_includes contents, "ReactRailsUJS.useContext(componentRequireContext)\n"
35+
assert_includes contents, "var componentRequireContext = require.context(\"components\", true);\n"
36+
assert_includes contents, "var ReactRailsUJS = require(\"react_ujs\");\n"
37+
assert_includes contents, "ReactRailsUJS.useContext(componentRequireContext);\n"
3838
end
3939
end
4040

0 commit comments

Comments
 (0)