Update gems and yarn packages.

Remove *.scss.erb loader because it's now supported natively by
webpacker.
This commit is contained in:
evazion
2019-11-26 01:48:19 -06:00
parent 980a4b82b9
commit f8e109f6dc
3 changed files with 1632 additions and 1409 deletions

View File

@@ -149,8 +149,8 @@ GEM
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
ffaker (2.13.0)
ffi (1.11.2)
ffi (1.11.2-x64-mingw32)
ffi (1.11.3)
ffi (1.11.3-x64-mingw32)
flamegraph (0.9.5)
get_process_mem (0.2.5)
ffi (~> 1.0)
@@ -183,7 +183,7 @@ GEM
listen (3.2.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.3.1)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@@ -241,7 +241,7 @@ GEM
mini_portile2 (~> 2.4.0)
nokogiri (1.10.5-x64-mingw32)
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.1)
nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4)
ntlm-http (0.1.1)
oauth2 (1.4.2)
@@ -397,7 +397,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webpacker (4.0.7)
webpacker (4.2.0)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)

View File

@@ -2,18 +2,6 @@ const { environment } = require('@rails/webpacker')
const erb = require('./loaders/erb')
const webpack = require('webpack');
environment.loaders.append('scss.erb', {
test: /\.scss\.erb$/,
enforce: 'pre',
exclude: /node_modules/,
use: [
'style-loader',
'postcss-loader',
'sass-loader',
'rails-erb-loader'
]
});
environment.loaders.append('erb', erb);
environment.config.output.library = ["Danbooru"];

3019
yarn.lock

File diff suppressed because it is too large Load Diff