Skip to content

Commit f23e0ce

Browse files
committed
per self review
1 parent 5bfb21b commit f23e0ce

File tree

103 files changed

+7
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+7
-17
lines changed

.github/workflows/ruby.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
- uses: actions/setup-node@v3
2222
- run: npm -g install yalc
2323
- run: yalc publish
24-
- run: cd test/dummy_shakapacker && yalc add react_ujs
25-
- run: cd test/dummy_shakapacker && yarn
24+
- run: cd test/app && yalc add react_ujs
25+
- run: cd test/app && yarn
2626
- uses: ruby/setup-ruby@v1
2727
with:
2828
ruby-version: 2.7.3

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ test/*/public/packs
88
react-builds/build
99
coverage/
1010
**/.yalc
11-
**/yalc.*
11+
**/yalc.*

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ task default: :test
8484

8585
task :test_setup do
8686
load 'webdrivers/Rakefile'
87-
Dir.chdir('./test/dummy_shakapacker') do
87+
Dir.chdir('./test/dummy') do
8888
`yarn install`
8989
end
9090
end

lib/react/server_rendering/bundle_renderer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def after_render(component_name, props, prerender_options)
4949
end
5050

5151
class << self
52-
attr_accessor :asset_container_class, :dont_use_webpacker_manifest
52+
attr_accessor :asset_container_class
5353
end
5454

5555
# Get an object which exposes assets by their logical path.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test/dummy_shakapacker/app/javascript/components/GreetingMessage.js renamed to test/dummy/app/javascript/components/GreetingMessage.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ module.exports = createReactClass({
77
if (typeof global !== "undefined" && global.ctx && global.ctx.greeting) {
88
initialGreeting = global.ctx.greeting
99
}
10-
console.log(`global: ${global}`)
11-
console.log(`global.ctx: ${JSON.stringify(global.ctx)}`)
1210

1311
return {
1412
greeting: initialGreeting
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test/support/sprockets_helpers.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def available?
66
# We also can't scan for defined?(Sprockets) because this is used to
77
# require Sprockets in the config/application.rb
88
# !!Bundler.locked_gems.specs.find {|gem_spec| gem_spec.name == 'sprockets'}
9-
false
9+
true
1010
end
1111

1212
# The block depends on sprockets, don't run it if sprockets is missing
@@ -42,16 +42,8 @@ def precompile_assets
4242
# - assets:precompile runs webpacker:compile when availabled
4343
# - webpacker:compile depends on `./bin/webpack`, so `.` must be the app root
4444
Dir.chdir("./test/#{DUMMY_LOCATION}") do
45-
46-
ENV['RAILS_GROUPS'] = 'assets' # required for Rails 3.2
4745
Rake::Task['assets:precompile'].reenable
4846

49-
if Rails::VERSION::MAJOR == 3
50-
Rake::Task['assets:precompile:all'].reenable
51-
Rake::Task['assets:precompile:primary'].reenable
52-
Rake::Task['assets:precompile:nondigest'].reenable
53-
end
54-
5547
Rake::Task['assets:precompile'].invoke
5648
end
5749
end

test/test_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
SimpleCov.start
44
end
55

6-
DUMMY_LOCATION = 'dummy_shakapacker'
6+
DUMMY_LOCATION = 'dummy'
77

88
support_path = File.expand_path('../support/*.rb', __FILE__)
99
Dir.glob(support_path).each do |f|

0 commit comments

Comments
 (0)