Skip to content

Commit 9eb5bcc

Browse files
committed
Update gems and packages (#2609)
1 parent ed303f2 commit 9eb5bcc

File tree

8 files changed

+2194
-2689
lines changed

8 files changed

+2194
-2689
lines changed

.eslintrc.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module.exports = {
2-
'extends': 'airbnb',
3-
'rules': {
2+
extends: 'airbnb',
3+
rules: {
44
'comma-dangle': ['error', 'never'],
55
'import/no-unresolved': 'off',
66
'import/no-extraneous-dependencies': 'off',
77
'import/extensions': 'off',
8-
semi: ['error', 'never'],
8+
semi: ['error', 'never']
99
},
10-
'env': {
11-
'browser': true,
12-
'node': true,
13-
},
14-
};
10+
env: {
11+
browser: true,
12+
node: true
13+
}
14+
}

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.13.0
1+
10.17.0

Gemfile.lock

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -10,123 +10,123 @@ PATH
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (6.0.1)
14-
actionpack (= 6.0.1)
13+
actioncable (6.0.3.1)
14+
actionpack (= 6.0.3.1)
1515
nio4r (~> 2.0)
1616
websocket-driver (>= 0.6.1)
17-
actionmailbox (6.0.1)
18-
actionpack (= 6.0.1)
19-
activejob (= 6.0.1)
20-
activerecord (= 6.0.1)
21-
activestorage (= 6.0.1)
22-
activesupport (= 6.0.1)
17+
actionmailbox (6.0.3.1)
18+
actionpack (= 6.0.3.1)
19+
activejob (= 6.0.3.1)
20+
activerecord (= 6.0.3.1)
21+
activestorage (= 6.0.3.1)
22+
activesupport (= 6.0.3.1)
2323
mail (>= 2.7.1)
24-
actionmailer (6.0.1)
25-
actionpack (= 6.0.1)
26-
actionview (= 6.0.1)
27-
activejob (= 6.0.1)
24+
actionmailer (6.0.3.1)
25+
actionpack (= 6.0.3.1)
26+
actionview (= 6.0.3.1)
27+
activejob (= 6.0.3.1)
2828
mail (~> 2.5, >= 2.5.4)
2929
rails-dom-testing (~> 2.0)
30-
actionpack (6.0.1)
31-
actionview (= 6.0.1)
32-
activesupport (= 6.0.1)
33-
rack (~> 2.0)
30+
actionpack (6.0.3.1)
31+
actionview (= 6.0.3.1)
32+
activesupport (= 6.0.3.1)
33+
rack (~> 2.0, >= 2.0.8)
3434
rack-test (>= 0.6.3)
3535
rails-dom-testing (~> 2.0)
3636
rails-html-sanitizer (~> 1.0, >= 1.2.0)
37-
actiontext (6.0.1)
38-
actionpack (= 6.0.1)
39-
activerecord (= 6.0.1)
40-
activestorage (= 6.0.1)
41-
activesupport (= 6.0.1)
37+
actiontext (6.0.3.1)
38+
actionpack (= 6.0.3.1)
39+
activerecord (= 6.0.3.1)
40+
activestorage (= 6.0.3.1)
41+
activesupport (= 6.0.3.1)
4242
nokogiri (>= 1.8.5)
43-
actionview (6.0.1)
44-
activesupport (= 6.0.1)
43+
actionview (6.0.3.1)
44+
activesupport (= 6.0.3.1)
4545
builder (~> 3.1)
4646
erubi (~> 1.4)
4747
rails-dom-testing (~> 2.0)
4848
rails-html-sanitizer (~> 1.1, >= 1.2.0)
49-
activejob (6.0.1)
50-
activesupport (= 6.0.1)
49+
activejob (6.0.3.1)
50+
activesupport (= 6.0.3.1)
5151
globalid (>= 0.3.6)
52-
activemodel (6.0.1)
53-
activesupport (= 6.0.1)
54-
activerecord (6.0.1)
55-
activemodel (= 6.0.1)
56-
activesupport (= 6.0.1)
57-
activestorage (6.0.1)
58-
actionpack (= 6.0.1)
59-
activejob (= 6.0.1)
60-
activerecord (= 6.0.1)
52+
activemodel (6.0.3.1)
53+
activesupport (= 6.0.3.1)
54+
activerecord (6.0.3.1)
55+
activemodel (= 6.0.3.1)
56+
activesupport (= 6.0.3.1)
57+
activestorage (6.0.3.1)
58+
actionpack (= 6.0.3.1)
59+
activejob (= 6.0.3.1)
60+
activerecord (= 6.0.3.1)
6161
marcel (~> 0.3.1)
62-
activesupport (6.0.1)
62+
activesupport (6.0.3.1)
6363
concurrent-ruby (~> 1.0, >= 1.0.2)
6464
i18n (>= 0.7, < 2)
6565
minitest (~> 5.1)
6666
tzinfo (~> 1.1)
67-
zeitwerk (~> 2.2)
67+
zeitwerk (~> 2.2, >= 2.2.2)
6868
ast (2.4.0)
69-
builder (3.2.3)
70-
byebug (11.0.1)
71-
concurrent-ruby (1.1.5)
72-
crass (1.0.5)
69+
builder (3.2.4)
70+
byebug (11.1.3)
71+
concurrent-ruby (1.1.6)
72+
crass (1.0.6)
7373
erubi (1.9.0)
7474
globalid (0.4.2)
7575
activesupport (>= 4.2.0)
76-
i18n (1.7.0)
76+
i18n (1.8.2)
7777
concurrent-ruby (~> 1.0)
7878
jaro_winkler (1.5.4)
79-
loofah (2.3.1)
79+
loofah (2.5.0)
8080
crass (~> 1.0.2)
8181
nokogiri (>= 1.5.9)
8282
mail (2.7.1)
8383
mini_mime (>= 0.1.1)
8484
marcel (0.3.3)
8585
mimemagic (~> 0.3.2)
86-
method_source (0.9.2)
87-
mimemagic (0.3.3)
86+
method_source (1.0.0)
87+
mimemagic (0.3.5)
8888
mini_mime (1.0.2)
8989
mini_portile2 (2.4.0)
90-
minitest (5.13.0)
90+
minitest (5.14.1)
9191
nio4r (2.5.2)
92-
nokogiri (1.10.8)
92+
nokogiri (1.10.9)
9393
mini_portile2 (~> 2.4.0)
94-
parallel (1.18.0)
95-
parser (2.6.5.0)
94+
parallel (1.19.1)
95+
parser (2.7.1.3)
9696
ast (~> 2.4.0)
97-
rack (2.0.8)
97+
rack (2.2.2)
9898
rack-proxy (0.6.5)
9999
rack
100100
rack-test (1.1.0)
101101
rack (>= 1.0, < 3)
102-
rails (6.0.1)
103-
actioncable (= 6.0.1)
104-
actionmailbox (= 6.0.1)
105-
actionmailer (= 6.0.1)
106-
actionpack (= 6.0.1)
107-
actiontext (= 6.0.1)
108-
actionview (= 6.0.1)
109-
activejob (= 6.0.1)
110-
activemodel (= 6.0.1)
111-
activerecord (= 6.0.1)
112-
activestorage (= 6.0.1)
113-
activesupport (= 6.0.1)
102+
rails (6.0.3.1)
103+
actioncable (= 6.0.3.1)
104+
actionmailbox (= 6.0.3.1)
105+
actionmailer (= 6.0.3.1)
106+
actionpack (= 6.0.3.1)
107+
actiontext (= 6.0.3.1)
108+
actionview (= 6.0.3.1)
109+
activejob (= 6.0.3.1)
110+
activemodel (= 6.0.3.1)
111+
activerecord (= 6.0.3.1)
112+
activestorage (= 6.0.3.1)
113+
activesupport (= 6.0.3.1)
114114
bundler (>= 1.3.0)
115-
railties (= 6.0.1)
115+
railties (= 6.0.3.1)
116116
sprockets-rails (>= 2.0.0)
117117
rails-dom-testing (2.0.3)
118118
activesupport (>= 4.2.0)
119119
nokogiri (>= 1.6)
120120
rails-html-sanitizer (1.3.0)
121121
loofah (~> 2.3)
122-
railties (6.0.1)
123-
actionpack (= 6.0.1)
124-
activesupport (= 6.0.1)
122+
railties (6.0.3.1)
123+
actionpack (= 6.0.3.1)
124+
activesupport (= 6.0.3.1)
125125
method_source
126126
rake (>= 0.8.7)
127127
thor (>= 0.20.3, < 2.0)
128128
rainbow (3.0.0)
129-
rake (13.0.0)
129+
rake (13.0.1)
130130
rubocop (0.68.1)
131131
jaro_winkler (~> 1.5.1)
132132
parallel (~> 1.10)
@@ -145,15 +145,15 @@ GEM
145145
actionpack (>= 4.0)
146146
activesupport (>= 4.0)
147147
sprockets (>= 3.0.0)
148-
thor (0.20.3)
148+
thor (1.0.1)
149149
thread_safe (0.3.6)
150-
tzinfo (1.2.5)
150+
tzinfo (1.2.7)
151151
thread_safe (~> 0.1)
152152
unicode-display_width (1.5.0)
153-
websocket-driver (0.7.1)
153+
websocket-driver (0.7.2)
154154
websocket-extensions (>= 0.1.0)
155155
websocket-extensions (0.1.4)
156-
zeitwerk (2.2.1)
156+
zeitwerk (2.3.0)
157157

158158
PLATFORMS
159159
ruby

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Webpacker
22

33
[![Build Status](https://travis-ci.org/rails/webpacker.svg?branch=master)](https://travis-ci.org/rails/webpacker)
4-
[![node.js](https://img.shields.io/badge/node-%3E%3D%2010.13.0-brightgreen.svg)](https://www.npmjs.com/package/@rails/webpacker)
4+
[![node.js](https://img.shields.io/badge/node-%3E%3D%2010.17.0-brightgreen.svg)](https://www.npmjs.com/package/@rails/webpacker)
55
[![Gem](https://img.shields.io/gem/v/webpacker.svg)](https://rubygems.org/gems/webpacker)
66

77
Webpacker makes it easy to use the JavaScript pre-processor and bundler
@@ -52,7 +52,7 @@ in which case you may not even need the asset pipeline. This is mostly relevant
5252

5353
- Ruby 2.4+
5454
- Rails 5.2+
55-
- Node.js 10.13.0+
55+
- Node.js 10.17.0+
5656
- Yarn 1.x+
5757

5858
## Features

package.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,56 @@
88
"lib/install/config/webpacker.yml"
99
],
1010
"engines": {
11-
"node": ">=10.13.0",
11+
"node": ">=10.17.0",
1212
"yarn": ">=1 <2"
1313
},
1414
"dependencies": {
15-
"@babel/core": "^7.9.0",
16-
"@babel/plugin-proposal-class-properties": "^7.8.3",
17-
"@babel/plugin-proposal-object-rest-spread": "^7.9.0",
15+
"@babel/core": "^7.10.1",
16+
"@babel/plugin-proposal-class-properties": "^7.10.1",
17+
"@babel/plugin-proposal-object-rest-spread": "^7.10.1",
1818
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
19-
"@babel/plugin-transform-destructuring": "^7.8.8",
20-
"@babel/plugin-transform-regenerator": "^7.8.7",
21-
"@babel/plugin-transform-runtime": "^7.9.0",
22-
"@babel/preset-env": "^7.9.0",
23-
"@babel/runtime": "^7.9.2",
19+
"@babel/plugin-transform-destructuring": "^7.10.1",
20+
"@babel/plugin-transform-regenerator": "^7.10.1",
21+
"@babel/plugin-transform-runtime": "^7.10.1",
22+
"@babel/preset-env": "^7.10.1",
23+
"@babel/runtime": "^7.10.1",
2424
"babel-loader": "^8.1.0",
25-
"babel-plugin-dynamic-import-node": "^2.3.0",
25+
"babel-plugin-dynamic-import-node": "^2.3.3",
2626
"babel-plugin-macros": "^2.8.0",
2727
"case-sensitive-paths-webpack-plugin": "^2.3.0",
28-
"compression-webpack-plugin": "^3.1.0",
28+
"compression-webpack-plugin": "^4.0.0",
2929
"core-js": "^3.6.5",
30-
"css-loader": "^3.4.2",
30+
"css-loader": "^3.5.3",
3131
"file-loader": "^6.0.0",
32-
"flatted": "^2.0.1",
32+
"flatted": "^3.0.2",
3333
"glob": "^7.1.6",
34-
"js-yaml": "^3.13.1",
34+
"js-yaml": "^3.14.0",
3535
"mini-css-extract-plugin": "^0.9.0",
36-
"node-sass": "^4.13.1",
36+
"node-sass": "^4.14.1",
3737
"optimize-css-assets-webpack-plugin": "^5.0.3",
3838
"path-complete-extname": "^1.0.0",
3939
"pnp-webpack-plugin": "^1.6.4",
40-
"postcss-flexbugs-fixes": "^4.2.0",
40+
"postcss-flexbugs-fixes": "^4.2.1",
4141
"postcss-import": "^12.0.1",
4242
"postcss-loader": "^3.0.0",
4343
"postcss-preset-env": "^6.7.0",
4444
"postcss-safe-parser": "^4.0.2",
4545
"regenerator-runtime": "^0.13.5",
4646
"sass-loader": "^8.0.2",
47-
"style-loader": "^1.1.3",
48-
"terser-webpack-plugin": "^2.3.6",
47+
"style-loader": "^1.2.1",
48+
"terser-webpack-plugin": "^3.0.2",
4949
"webpack": "^4.43.0",
5050
"webpack-assets-manifest": "^3.1.1",
5151
"webpack-cli": "^3.3.11",
5252
"webpack-sources": "^1.4.3"
5353
},
5454
"devDependencies": {
55-
"eslint": "^6.8.0",
55+
"eslint": "^7.1.0",
5656
"eslint-config-airbnb": "^18.1.0",
57-
"eslint-plugin-import": "^2.20.1",
57+
"eslint-plugin-import": "^2.20.2",
5858
"eslint-plugin-jsx-a11y": "^6.2.3",
59-
"eslint-plugin-react": "^7.19.0",
60-
"jest": "^25.1.0"
59+
"eslint-plugin-react": "^7.20.0",
60+
"jest": "^26.0.1"
6161
},
6262
"jest": {
6363
"testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",

package/environments/production.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ module.exports = class extends Base {
1313
new CompressionPlugin({
1414
filename: '[path].gz[query]',
1515
algorithm: 'gzip',
16-
cache: true,
1716
test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/
1817
})
1918
)
@@ -24,7 +23,6 @@ module.exports = class extends Base {
2423
new CompressionPlugin({
2524
filename: '[path].br[query]',
2625
algorithm: 'brotliCompress',
27-
cache: true,
2826
test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/
2927
})
3028
)

package/utils/helpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { stringify } = require('flatted/cjs')
1+
const { stringify } = require('flatted')
22

33
const isObject = (value) => typeof value === 'object'
44
&& value !== null

0 commit comments

Comments
 (0)