Skip to content

Add semi-colons to generated JavaScript #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BookOfGreg merged 3 commits into from
Oct 8, 2018
Merged

Add semi-colons to generated JavaScript #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc22e58
Add semi-colons to generated JavaScript
Oct 6, 2018
eeef8a3
Add turbolinks as a dev dependency - tests fail without it
Oct 6, 2018
6c1d8a6
Revert "Add turbolinks as a dev dependency - tests fail without it"
Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/generators/react/install_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions lib/generators/templates/server_rendering_pack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
6 changes: 3 additions & 3 deletions test/dummy_webpacker1/app/javascript/packs/server_rendering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
6 changes: 3 additions & 3 deletions test/dummy_webpacker2/app/javascript/packs/server_rendering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
6 changes: 3 additions & 3 deletions test/dummy_webpacker3/app/javascript/packs/server_rendering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
12 changes: 6 additions & 6 deletions test/generators/install_generator_webpacker_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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

Expand Down