Skip to content

Commit c454b74

Browse files
committed
Drop Webpacker 1
1 parent 3980169 commit c454b74

File tree

111 files changed

+21
-6120
lines changed

Some content is hidden

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

111 files changed

+21
-6120
lines changed

.rubocop.yml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ AllCops:
33
DisplayCopNames: true
44
Exclude:
55
- test/dummy_sprockets/**/*
6-
- test/dummy_webpacker1/**/*
76
- test/dummy_webpacker2/**/*
87
- test/dummy_webpacker3/**/*
98
- node_modules/**/*

Appraisals

-18
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,6 @@ appraise 'rails-4.2-sprockets_4' do
4848
gem 'mini_racer'
4949
end
5050

51-
# no_sprockets is a magical name from sprockets_helper.rb in test to
52-
# load in certain tests or not.
53-
appraise 'rails-5_no_sprockets_webpacker_1_1' do
54-
gem 'rails', '~> 5.0.0'
55-
gem 'webpacker', '~> 1.1.0'
56-
# This ExecJS backend provides stateful context
57-
# which the default nodejs backend does not
58-
gem 'therubyracer'
59-
end
60-
61-
appraise 'rails-5_no_sprockets_webpacker_1_x' do
62-
gem 'rails', '~> 5.0.0'
63-
gem 'webpacker', '~> 1.2'
64-
# This ExecJS backend provides stateful context
65-
# which the default nodejs backend does not
66-
gem 'therubyracer'
67-
end
68-
6951
appraise 'rails-5_no_sprockets_webpacker_2' do
7052
gem 'rails', '~> 5.0.0'
7153
gem 'webpacker', '~> 2.0'

Rakefile

-3
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ task :test_setup do
9494
Dir.chdir('./test/dummy_sprockets') do
9595
`yarn install`
9696
end
97-
Dir.chdir('./test/dummy_webpacker1') do
98-
`yarn install`
99-
end
10097
Dir.chdir('./test/dummy_webpacker2') do
10198
`yarn install`
10299
end

gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile

-9
This file was deleted.

gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile

-9
This file was deleted.

lib/react/server_rendering/webpacker_manifest_container.rb

+21-31
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ def self.compatible?
2121
!!defined?(Webpacker)
2222
end
2323

24+
def output_path
25+
# Webpack1 /:output/:entry, Webpack3 /public/:output
26+
config.respond_to?(:output_path) ? config.output_path : 'public'
27+
end
28+
2429
if MAJOR < 3
2530
def find_asset(logical_path)
2631
# raises if not found
@@ -37,7 +42,19 @@ def find_asset(logical_path)
3742
File.read(full_path)
3843
end
3944
end
40-
else
45+
46+
def config
47+
Webpacker::Configuration
48+
end
49+
50+
def file_path path
51+
manifest.lookup_path(path)
52+
end
53+
54+
def manifest
55+
Webpacker::Manifest
56+
end
57+
else # if MAJOR == 3
4158
def find_asset(logical_path)
4259
asset_path = Webpacker.manifest.lookup(logical_path).to_s
4360
if Webpacker.dev_server.running?
@@ -49,45 +66,18 @@ def find_asset(logical_path)
4966
File.read(file_path(logical_path))
5067
end
5168
end
52-
end
53-
54-
if MAJOR < 3
55-
def manifest
56-
Webpacker::Manifest
57-
end
58-
else
59-
def manifest
60-
Webpacker.manifest
61-
end
62-
end
6369

64-
if MAJOR < 3
65-
def config
66-
Webpacker::Configuration
67-
end
68-
else
6970
def config
7071
Webpacker.config
7172
end
72-
end
7373

74-
if (MAJOR == 1 && MINOR >= 2) || MAJOR == 2
75-
def file_path path
76-
manifest.lookup_path(path)
74+
def manifest
75+
Webpacker.manifest
7776
end
78-
elsif MAJOR == 3
77+
7978
def file_path path
8079
::Rails.root.join('public', manifest.lookup(path)[1..-1])
8180
end
82-
else # 1.0 and 1.1 support
83-
def file_path path
84-
File.join(output_path, manifest.lookup(path).split('/')[2..-1])
85-
end
86-
end
87-
88-
def output_path
89-
# Webpack1 /:output/:entry, Webpack3 /public/:output
90-
config.respond_to?(:output_path) ? config.output_path : 'public'
9181
end
9282
end
9383
end

test/dummy_webpacker1/.babelrc

-16
This file was deleted.

test/dummy_webpacker1/.gitignore

Whitespace-only changes.

test/dummy_webpacker1/.postcssrc.yml

-4
This file was deleted.

test/dummy_webpacker1/README.rdoc

-28
This file was deleted.

test/dummy_webpacker1/Rakefile

-6
This file was deleted.

test/dummy_webpacker1/app/assets/config/manifest.js

-5
This file was deleted.

test/dummy_webpacker1/app/assets/images/.keep

Whitespace-only changes.

test/dummy_webpacker1/app/assets/javascripts/application.js

-21
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/components.js

-3
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/components/PlainJSTodo.js

-5
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/components/Todo.js.jsx.coffee

-7
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/components/TodoList.js.jsx

-19
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/components/TodoListWithConsoleLog.js.jsx

-23
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/components/WithSetTimeout.js.jsx

-9
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/example.js.jsx

-2
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/example2.js.jsx.coffee

-5
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/example3.js.jsx

-1
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/flow_types_example.js.jsx

-3
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/harmony_example.js.jsx

-23
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/pages.js

-21
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/require_test/jsx_preprocessor_test.jsx

-4
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/require_test/jsx_require_child_coffee.coffee

-1
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/require_test/jsx_require_child_js.js

-1
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/require_test/jsx_require_child_jsx.jsx

-1
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/server_rendering.js

-3
This file was deleted.

test/dummy_webpacker1/app/assets/javascripts/turbolinks_only.js

-1
This file was deleted.

test/dummy_webpacker1/app/assets/stylesheets/application.css

-13
This file was deleted.

0 commit comments

Comments
 (0)