Commit 5c935cfd authored by Dan Notestein's avatar Dan Notestein
Browse files

Merge branch 'upgradeWebpack' into 'develop'

Fix faq page, certain image assets. Set esModule to false to urloader and raw loader

See merge request !153
parents c9f03227 7c49db70
......@@ -73,7 +73,17 @@ module.exports = {
},
module: {
rules: [
{test: /\.(jpe?g|png)/, use: 'url-loader?limit=4096'},
{
test: /\.(jpe?g|png)/, use: [
{
loader: 'url-loader',
options: {
limit: 4096,
esModule: false,
},
},
],
},
{test: /\.js$|\.jsx$/, exclude: [/node_modules/, /\*\/app\/assets\/static\/\*\.js/], use: 'babel-loader'},
{test: /\.svg$/, use: 'svg-inline-loader'},
{
......@@ -90,7 +100,14 @@ module.exports = {
},
{
test: /\.md/,
use: 'raw-loader'
use: [
{
loader: 'raw-loader',
options: {
esModule: false,
},
},
],
}
]
},
......
......@@ -1244,30 +1244,6 @@
dependencies:
"@steemit/libcrypto" "^1.0.1"
 
"@steemit/steem-js@0.7.9":
version "0.7.9"
resolved "https://registry.yarnpkg.com/@steemit/steem-js/-/steem-js-0.7.9.tgz#eab4e9b2b7b73205c99620c65608d525f35f72bd"
integrity sha512-7k/2JV+FdNDHZvzJ8l+dgll+6tuhuWNfpt6tEvb/nbRKl6duInAcqtF0QzxW43pMv78uQ4nMCIbvtq9KZkPGWA==
dependencies:
"@steemit/rpc-auth" "^1.1.1"
bigi "^1.4.2"
bluebird "^3.4.6"
browserify-aes "^1.0.6"
bs58 "^4.0.0"
buffer "^5.0.6"
bytebuffer "^5.0.1"
create-hash "^1.1.2"
create-hmac "^1.1.4"
cross-env "^5.0.0"
cross-fetch "^1.1.1"
debug "^2.6.8"
detect-node "^2.0.3"
ecurve "^1.0.5"
lodash "^4.16.4"
retry "^0.12.0"
secure-random "^1.1.2"
ws "^3.3.2"
"@storybook/addon-actions@^3.2.19":
version "3.3.12"
resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.3.12.tgz#1bd2668918a62f32c0907af14946cdd0c6be66f5"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment