Skip to content

Commit f2cd4dc

Browse files
committed
update dependencies (node-sass v6 is needed on Node v16)
1 parent 2bb2238 commit f2cd4dc

File tree

7 files changed

+6052
-10403
lines changed

7 files changed

+6052
-10403
lines changed

Gemfile.lock

+21-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/middleman/middleman.git
3-
revision: 00ae2d963e4b9bd3b93e16544c62fe17ab5ae36d
3+
revision: d180ca337202873f2601310c74ba2b6b4cf063ec
44
branch: 4.x
55
specs:
66
middleman (4.3.11)
@@ -12,7 +12,7 @@ GIT
1212
middleman-cli (4.3.11)
1313
thor (>= 0.17.0, < 2.0)
1414
middleman-core (4.3.11)
15-
activesupport (>= 4.2, < 6.0)
15+
activesupport (>= 4.2, < 6.1)
1616
addressable (~> 2.3)
1717
backports (~> 3.6)
1818
bundler (~> 2.0)
@@ -29,7 +29,7 @@ GIT
2929
memoist (~> 0.14)
3030
padrino-helpers (~> 0.13.0)
3131
parallel
32-
rack (>= 1.4.5, < 2.1)
32+
rack (>= 1.4.5, < 3)
3333
sassc (~> 2.0)
3434
servolux
3535
tilt (~> 2.0.9)
@@ -40,16 +40,17 @@ GIT
4040
GEM
4141
remote: https://rubygems.org/
4242
specs:
43-
activesupport (5.2.5)
43+
activesupport (6.0.3.7)
4444
concurrent-ruby (~> 1.0, >= 1.0.2)
4545
i18n (>= 0.7, < 2)
4646
minitest (~> 5.1)
4747
tzinfo (~> 1.1)
48+
zeitwerk (~> 2.2, >= 2.2.2)
4849
addressable (2.7.0)
4950
public_suffix (>= 2.0.2, < 5.0)
50-
autoprefixer-rails (10.2.4.0)
51-
execjs
52-
backports (3.20.2)
51+
autoprefixer-rails (10.2.5.0)
52+
execjs (< 2.8.0)
53+
backports (3.21.0)
5354
coffee-script (2.4.1)
5455
coffee-script-source
5556
execjs
@@ -60,11 +61,15 @@ GEM
6061
dotenv (2.7.6)
6162
erubis (2.7.0)
6263
execjs (2.7.0)
63-
faraday (1.3.0)
64+
faraday (1.4.1)
65+
faraday-excon (~> 1.1)
6466
faraday-net_http (~> 1.0)
67+
faraday-net_http_persistent (~> 1.1)
6568
multipart-post (>= 1.2, < 3)
66-
ruby2_keywords
69+
ruby2_keywords (>= 0.0.4)
70+
faraday-excon (1.1.0)
6771
faraday-net_http (1.0.1)
72+
faraday-net_http_persistent (1.1.0)
6873
fast_blank (1.0.0)
6974
fastimage (2.2.3)
7075
ffi (1.15.0)
@@ -85,13 +90,13 @@ GEM
8590
middleman-autoprefixer (2.10.0)
8691
autoprefixer-rails (>= 9.1.4)
8792
middleman-core (>= 3.3.3)
88-
mini_portile2 (2.5.0)
93+
mini_portile2 (2.5.1)
8994
minitest (5.14.4)
9095
multipart-post (2.1.1)
91-
nokogiri (1.11.2)
96+
nokogiri (1.11.4)
9297
mini_portile2 (~> 2.5.0)
9398
racc (~> 1.4)
94-
octokit (4.20.0)
99+
octokit (4.21.0)
95100
faraday (>= 0.9)
96101
sawyer (~> 0.8.0, >= 0.5.3)
97102
padrino-helpers (0.13.3.4)
@@ -104,11 +109,11 @@ GEM
104109
parslet (1.8.2)
105110
public_suffix (4.0.6)
106111
racc (1.5.2)
107-
rack (2.0.9)
108-
rb-fsevent (0.10.4)
112+
rack (2.2.3)
113+
rb-fsevent (0.11.0)
109114
rb-inotify (0.10.1)
110115
ffi (~> 1.0)
111-
rexml (3.2.4)
116+
rexml (3.2.5)
112117
ruby2_keywords (0.0.4)
113118
sassc (2.4.0)
114119
ffi (~> 1.9)
@@ -130,6 +135,7 @@ GEM
130135
uglifier (3.2.0)
131136
execjs (>= 0.3.0, < 3)
132137
webrick (1.7.0)
138+
zeitwerk (2.4.2)
133139

134140
PLATFORMS
135141
ruby

config.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
configure :build do
1010
activate :minify_css
11-
activate :minify_javascript
11+
activate :minify_javascript, ignore: /upload/
1212
end
1313

1414
activate :external_pipeline,
1515
name: :webpack,
1616
command: [
1717
"NODE_ENV=#{build? ? 'production' : 'development'}",
18-
'$(npm bin)/webpack --display=minimal',
18+
'$(npm bin)/webpack',
1919
server? && '--watch' || nil,
2020
].compact.join("\x20"),
2121
source: ".webpack-build",

0 commit comments

Comments
 (0)