Skip to content

Commit 9a387d6

Browse files
Bump dependencies for both Node and Ruby (#3134)
1 parent d429f02 commit 9a387d6

File tree

7 files changed

+815
-1821
lines changed

7 files changed

+815
-1821
lines changed

Gemfile.lock

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -10,60 +10,60 @@ PATH
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (6.1.3.1)
14-
actionpack (= 6.1.3.1)
15-
activesupport (= 6.1.3.1)
13+
actioncable (6.1.4.1)
14+
actionpack (= 6.1.4.1)
15+
activesupport (= 6.1.4.1)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
18-
actionmailbox (6.1.3.1)
19-
actionpack (= 6.1.3.1)
20-
activejob (= 6.1.3.1)
21-
activerecord (= 6.1.3.1)
22-
activestorage (= 6.1.3.1)
23-
activesupport (= 6.1.3.1)
18+
actionmailbox (6.1.4.1)
19+
actionpack (= 6.1.4.1)
20+
activejob (= 6.1.4.1)
21+
activerecord (= 6.1.4.1)
22+
activestorage (= 6.1.4.1)
23+
activesupport (= 6.1.4.1)
2424
mail (>= 2.7.1)
25-
actionmailer (6.1.3.1)
26-
actionpack (= 6.1.3.1)
27-
actionview (= 6.1.3.1)
28-
activejob (= 6.1.3.1)
29-
activesupport (= 6.1.3.1)
25+
actionmailer (6.1.4.1)
26+
actionpack (= 6.1.4.1)
27+
actionview (= 6.1.4.1)
28+
activejob (= 6.1.4.1)
29+
activesupport (= 6.1.4.1)
3030
mail (~> 2.5, >= 2.5.4)
3131
rails-dom-testing (~> 2.0)
32-
actionpack (6.1.3.1)
33-
actionview (= 6.1.3.1)
34-
activesupport (= 6.1.3.1)
32+
actionpack (6.1.4.1)
33+
actionview (= 6.1.4.1)
34+
activesupport (= 6.1.4.1)
3535
rack (~> 2.0, >= 2.0.9)
3636
rack-test (>= 0.6.3)
3737
rails-dom-testing (~> 2.0)
3838
rails-html-sanitizer (~> 1.0, >= 1.2.0)
39-
actiontext (6.1.3.1)
40-
actionpack (= 6.1.3.1)
41-
activerecord (= 6.1.3.1)
42-
activestorage (= 6.1.3.1)
43-
activesupport (= 6.1.3.1)
39+
actiontext (6.1.4.1)
40+
actionpack (= 6.1.4.1)
41+
activerecord (= 6.1.4.1)
42+
activestorage (= 6.1.4.1)
43+
activesupport (= 6.1.4.1)
4444
nokogiri (>= 1.8.5)
45-
actionview (6.1.3.1)
46-
activesupport (= 6.1.3.1)
45+
actionview (6.1.4.1)
46+
activesupport (= 6.1.4.1)
4747
builder (~> 3.1)
4848
erubi (~> 1.4)
4949
rails-dom-testing (~> 2.0)
5050
rails-html-sanitizer (~> 1.1, >= 1.2.0)
51-
activejob (6.1.3.1)
52-
activesupport (= 6.1.3.1)
51+
activejob (6.1.4.1)
52+
activesupport (= 6.1.4.1)
5353
globalid (>= 0.3.6)
54-
activemodel (6.1.3.1)
55-
activesupport (= 6.1.3.1)
56-
activerecord (6.1.3.1)
57-
activemodel (= 6.1.3.1)
58-
activesupport (= 6.1.3.1)
59-
activestorage (6.1.3.1)
60-
actionpack (= 6.1.3.1)
61-
activejob (= 6.1.3.1)
62-
activerecord (= 6.1.3.1)
63-
activesupport (= 6.1.3.1)
54+
activemodel (6.1.4.1)
55+
activesupport (= 6.1.4.1)
56+
activerecord (6.1.4.1)
57+
activemodel (= 6.1.4.1)
58+
activesupport (= 6.1.4.1)
59+
activestorage (6.1.4.1)
60+
actionpack (= 6.1.4.1)
61+
activejob (= 6.1.4.1)
62+
activerecord (= 6.1.4.1)
63+
activesupport (= 6.1.4.1)
6464
marcel (~> 1.0.0)
65-
mini_mime (~> 1.0.2)
66-
activesupport (6.1.3.1)
65+
mini_mime (>= 1.1.0)
66+
activesupport (6.1.4.1)
6767
concurrent-ruby (~> 1.0, >= 1.0.2)
6868
i18n (>= 1.6, < 2)
6969
minitest (>= 5.1)
@@ -72,79 +72,79 @@ GEM
7272
ast (2.4.2)
7373
builder (3.2.4)
7474
byebug (11.1.3)
75-
concurrent-ruby (1.1.8)
75+
concurrent-ruby (1.1.9)
7676
crass (1.0.6)
7777
erubi (1.10.0)
78-
globalid (0.4.2)
79-
activesupport (>= 4.2.0)
78+
globalid (0.5.2)
79+
activesupport (>= 5.0)
8080
i18n (1.8.10)
8181
concurrent-ruby (~> 1.0)
82-
loofah (2.9.1)
82+
loofah (2.12.0)
8383
crass (~> 1.0.2)
8484
nokogiri (>= 1.5.9)
8585
mail (2.7.1)
8686
mini_mime (>= 0.1.1)
8787
marcel (1.0.1)
8888
method_source (1.0.0)
89-
mini_mime (1.0.3)
90-
mini_portile2 (2.5.0)
89+
mini_mime (1.1.1)
90+
mini_portile2 (2.6.1)
9191
minitest (5.14.4)
92-
nio4r (2.5.7)
93-
nokogiri (1.11.3)
94-
mini_portile2 (~> 2.5.0)
92+
nio4r (2.5.8)
93+
nokogiri (1.12.3)
94+
mini_portile2 (~> 2.6.1)
9595
racc (~> 1.4)
96-
parallel (1.20.1)
97-
parser (3.0.1.0)
96+
parallel (1.20.2)
97+
parser (3.0.2.0)
9898
ast (~> 2.4.1)
9999
racc (1.5.2)
100100
rack (2.2.3)
101-
rack-proxy (0.6.5)
101+
rack-proxy (0.7.0)
102102
rack
103103
rack-test (1.1.0)
104104
rack (>= 1.0, < 3)
105-
rails (6.1.3.1)
106-
actioncable (= 6.1.3.1)
107-
actionmailbox (= 6.1.3.1)
108-
actionmailer (= 6.1.3.1)
109-
actionpack (= 6.1.3.1)
110-
actiontext (= 6.1.3.1)
111-
actionview (= 6.1.3.1)
112-
activejob (= 6.1.3.1)
113-
activemodel (= 6.1.3.1)
114-
activerecord (= 6.1.3.1)
115-
activestorage (= 6.1.3.1)
116-
activesupport (= 6.1.3.1)
105+
rails (6.1.4.1)
106+
actioncable (= 6.1.4.1)
107+
actionmailbox (= 6.1.4.1)
108+
actionmailer (= 6.1.4.1)
109+
actionpack (= 6.1.4.1)
110+
actiontext (= 6.1.4.1)
111+
actionview (= 6.1.4.1)
112+
activejob (= 6.1.4.1)
113+
activemodel (= 6.1.4.1)
114+
activerecord (= 6.1.4.1)
115+
activestorage (= 6.1.4.1)
116+
activesupport (= 6.1.4.1)
117117
bundler (>= 1.15.0)
118-
railties (= 6.1.3.1)
118+
railties (= 6.1.4.1)
119119
sprockets-rails (>= 2.0.0)
120120
rails-dom-testing (2.0.3)
121121
activesupport (>= 4.2.0)
122122
nokogiri (>= 1.6)
123-
rails-html-sanitizer (1.3.0)
123+
rails-html-sanitizer (1.4.2)
124124
loofah (~> 2.3)
125-
railties (6.1.3.1)
126-
actionpack (= 6.1.3.1)
127-
activesupport (= 6.1.3.1)
125+
railties (6.1.4.1)
126+
actionpack (= 6.1.4.1)
127+
activesupport (= 6.1.4.1)
128128
method_source
129-
rake (>= 0.8.7)
129+
rake (>= 0.13)
130130
thor (~> 1.0)
131131
rainbow (3.0.0)
132-
rake (13.0.3)
132+
rake (13.0.6)
133133
regexp_parser (2.1.1)
134134
rexml (3.2.5)
135-
rubocop (0.93.1)
135+
rubocop (1.19.1)
136136
parallel (~> 1.10)
137-
parser (>= 2.7.1.5)
137+
parser (>= 3.0.0.0)
138138
rainbow (>= 2.2.2, < 4.0)
139-
regexp_parser (>= 1.8)
139+
regexp_parser (>= 1.8, < 3.0)
140140
rexml
141-
rubocop-ast (>= 0.6.0)
141+
rubocop-ast (>= 1.9.1, < 2.0)
142142
ruby-progressbar (~> 1.7)
143-
unicode-display_width (>= 1.4.0, < 2.0)
144-
rubocop-ast (1.4.1)
145-
parser (>= 2.7.1.5)
146-
rubocop-performance (1.10.2)
147-
rubocop (>= 0.90.0, < 2.0)
143+
unicode-display_width (>= 1.4.0, < 3.0)
144+
rubocop-ast (1.11.0)
145+
parser (>= 3.0.1.1)
146+
rubocop-performance (1.11.5)
147+
rubocop (>= 1.7.0, < 2.0)
148148
rubocop-ast (>= 0.4.0)
149149
ruby-progressbar (1.11.0)
150150
semantic_range (3.0.0)
@@ -158,8 +158,8 @@ GEM
158158
thor (1.1.0)
159159
tzinfo (2.0.4)
160160
concurrent-ruby (~> 1.0)
161-
unicode-display_width (1.7.0)
162-
websocket-driver (0.7.3)
161+
unicode-display_width (2.0.0)
162+
websocket-driver (0.7.5)
163163
websocket-extensions (>= 0.1.0)
164164
websocket-extensions (0.1.5)
165165
zeitwerk (2.4.2)
@@ -174,7 +174,7 @@ DEPENDENCIES
174174
rack-proxy
175175
rails
176176
rake (>= 11.1)
177-
rubocop (= 0.93.1)
177+
rubocop
178178
rubocop-performance
179179
semantic_range
180180
webpacker!

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ leaving Webpack responsible solely for app-like JavaScript, or it can be used ex
5454

5555
- Ruby 2.4+
5656
- Rails 5.2+
57-
- Node.js 12+ || 14+
58-
- Yarn 1.x+ || 2.x+
57+
- Node.js 12.13.0+ || 14+
58+
- Yarn
5959

6060
## Features
6161

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"lib/install/config/webpacker.yml"
99
],
1010
"engines": {
11-
"node": "^12 || >=14",
11+
"node": ">= 12.13.0 || >=14",
1212
"yarn": ">=1 <4"
1313
},
1414
"dependencies": {
@@ -18,13 +18,13 @@
1818
"@babel/preset-env": "^7.15.0",
1919
"@babel/runtime": "^7.15.3",
2020
"babel-loader": "^8.2.2",
21-
"compression-webpack-plugin": "^7.1.2",
21+
"compression-webpack-plugin": "^8.0.1",
2222
"glob": "^7.1.7",
23-
"js-yaml": "^3.14.1",
23+
"js-yaml": "^4.1.0",
2424
"path-complete-extname": "^1.0.0",
2525
"pnp-webpack-plugin": "^1.7.0",
2626
"terser-webpack-plugin": "^5.1.4",
27-
"webpack": "^5.50.0",
27+
"webpack": "^5.51.1",
2828
"webpack-assets-manifest": "^5.0.6",
2929
"webpack-cli": "^4.8.0",
3030
"webpack-merge": "^5.8.0",
@@ -33,11 +33,11 @@
3333
"devDependencies": {
3434
"eslint": "^7.32.0",
3535
"eslint-config-airbnb": "^18.2.1",
36-
"eslint-config-prettier": "^7.2.0",
37-
"eslint-plugin-import": "^2.24.0",
36+
"eslint-config-prettier": "^8.3.0",
37+
"eslint-plugin-import": "^2.24.1",
3838
"eslint-plugin-jsx-a11y": "^6.4.1",
3939
"eslint-plugin-react": "^7.24.0",
40-
"jest": "^26.6.3"
40+
"jest": "^27.0.6"
4141
},
4242
"jest": {
4343
"testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",

package/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { resolve } = require('path')
2-
const { safeLoad } = require('js-yaml')
2+
const { load } = require('js-yaml')
33
const { readFileSync } = require('fs')
44
const { merge } = require('webpack-merge')
55
const { ensureTrailingSlash } = require('./utils/helpers')
@@ -9,12 +9,12 @@ const configPath = require('./configPath')
99
const defaultConfigPath = require.resolve('../lib/install/config/webpacker.yml')
1010

1111
const getDefaultConfig = () => {
12-
const defaultConfig = safeLoad(readFileSync(defaultConfigPath), 'utf8')
12+
const defaultConfig = load(readFileSync(defaultConfigPath), 'utf8')
1313
return defaultConfig[railsEnv] || defaultConfig.production
1414
}
1515

1616
const defaults = getDefaultConfig()
17-
const app = safeLoad(readFileSync(configPath), 'utf8')[railsEnv]
17+
const app = load(readFileSync(configPath), 'utf8')[railsEnv]
1818

1919
const config = merge(defaults, app)
2020
config.outputPath = resolve(config.public_root_path, config.public_output_path)

package/env.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { safeLoad } = require('js-yaml')
1+
const { load } = require('js-yaml')
22
const { readFileSync } = require('fs')
33

44
const NODE_ENVIRONMENTS = ['development', 'production', 'test']
@@ -12,7 +12,7 @@ const nodeEnv
1212
const isProduction = nodeEnv === 'production'
1313
const isDevelopment = nodeEnv === 'development'
1414

15-
const config = safeLoad(readFileSync(configPath), 'utf8')
15+
const config = load(readFileSync(configPath), 'utf8')
1616
const availableEnvironments = Object.keys(config).join('|')
1717
const regex = new RegExp(`^(${availableEnvironments})$`, 'g')
1818

webpacker.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
2323
s.add_dependency "semantic_range", ">= 2.3.0"
2424

2525
s.add_development_dependency "bundler", ">= 1.3.0"
26-
s.add_development_dependency "rubocop", "0.93.1"
26+
s.add_development_dependency "rubocop"
2727
s.add_development_dependency "rubocop-performance"
2828

2929
s.files = `git ls-files`.split("\n")

0 commit comments

Comments
 (0)