1
0
mirror of https://github.com/kremalicious/blog.git synced 2024-11-26 20:01:24 +01:00

Merge pull request #116 from kremalicious/fix/web3

fix web3, package updates
This commit is contained in:
Matthias Kretschmann 2019-01-08 23:14:44 +01:00 committed by GitHub
commit 01747c1098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions

View File

@ -1,3 +1,4 @@
const webpack = require('webpack')
const { createMarkdownFields } = require('./gatsby/createMarkdownFields')
const { createExifFields } = require('./gatsby/createExifFields')
const {
@ -57,3 +58,20 @@ exports.createPages = async ({ graphql, actions }) => {
// create manual redirects
generateRedirectPages(createRedirect)
}
// Fix web3
// https://github.com/ethereum/web3.js/issues/1105#issuecomment-446039296
exports.onCreateWebpackConfig = ({ actions }) => {
actions.setWebpackConfig({
resolve: {
alias: {
// replace native `scrypt` module with pure js `js-scrypt`
scrypt: 'js-scrypt'
}
},
plugins: [
// ignore these plugins completely
new webpack.IgnorePlugin(/^(?:electron|ws)$/)
]
})
}

View File

@ -8,7 +8,7 @@
"main": "index.js",
"scripts": {
"start": "gatsby develop",
"build": "npm run rename:scrypt && gatsby build && npm run copy",
"build": "gatsby build && npm run copy",
"ssr": "npm run build && serve -s public/",
"rename:scrypt": "sed -i -e 's|./build/Release/scrypt|scrypt|g' node_modules/scrypt/index.js",
"copy": "cp -R content/media/ public",
@ -33,7 +33,7 @@
"dms2dec": "^1.1.0",
"fast-exif": "^1.0.1",
"fraction.js": "^4.0.12",
"gatsby": "^2.0.85",
"gatsby": "^2.0.89",
"gatsby-image": "^2.0.25",
"gatsby-plugin-catch-links": "^2.0.9",
"gatsby-plugin-favicon": "^3.1.5",
@ -41,7 +41,7 @@
"gatsby-plugin-lunr": "^1.3.0",
"gatsby-plugin-matomo": "^0.6.0",
"gatsby-plugin-meta-redirect": "^1.1.1",
"gatsby-plugin-offline": "^2.0.20",
"gatsby-plugin-offline": "^2.0.21",
"gatsby-plugin-react-helmet": "^3.0.5",
"gatsby-plugin-sass": "^2.0.7",
"gatsby-plugin-sharp": "^2.0.17",
@ -54,12 +54,13 @@
"gatsby-remark-highlights": "^1.3.4",
"gatsby-remark-images": "^3.0.1",
"gatsby-remark-smartypants": "^2.0.7",
"gatsby-source-filesystem": "^2.0.12",
"gatsby-source-filesystem": "^2.0.13",
"gatsby-source-graphql": "^2.0.8",
"gatsby-transformer-remark": "^2.1.19",
"gatsby-transformer-remark": "^2.2.0",
"gatsby-transformer-sharp": "^2.1.10",
"graphql": "^0.13.2",
"intersection-observer": "^0.5.1",
"js-scrypt": "^0.2.0",
"load-script": "^1.0.0",
"node-sass": "^4.11.0",
"nord": "^0.2.1",
@ -71,7 +72,7 @@
"react-dom": "^16.7.0",
"react-helmet": "^5.2.0",
"react-modal": "^3.8.1",
"react-pose": "^4.0.4",
"react-pose": "^4.0.5",
"react-qr-svg": "^2.1.0",
"react-time": "^4.3.0",
"react-transition-group": "^2.5.2",
@ -85,13 +86,13 @@
"@babel/preset-env": "^7.2.3",
"@svgr/webpack": "^4.1.0",
"babel-eslint": "^10.0.1",
"eslint": "^5.11.1",
"eslint": "^5.12.0",
"eslint-config-prettier": "^3.3.0",
"eslint-loader": "^2.1.1",
"eslint-plugin-graphql": "^3.0.1",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-react": "^7.12.2",
"eslint-plugin-react": "^7.12.3",
"fs-extra": "^7.0.1",
"markdownlint-cli": "^0.13.0",
"npm-run-all": "^4.1.5",