Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump react-scripts to v4 #397

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
"pragma": "h",
"version": "16.0"
}
},
"rules": {
"import/no-anonymous-default-export": "off"
}
}
17 changes: 10 additions & 7 deletions config-overrides.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable react-hooks/rules-of-hooks */
const {
override,
addWebpackAlias,
useBabelRc,
useEslintRc
useBabelRc
} = require('customize-cra')

const fs = require('fs')
Expand All @@ -14,6 +14,7 @@ const SitemapPlugin = require('sitemap-webpack-plugin').default
const md = require('markdown-it')
const fm = require('front-matter')
const parser = require('fast-xml-parser')
const moduleAlias = require('module-alias')
const hero = require('./src/_data/hero')
const parseBlog = require('./src/parse-blog')
const redirectConfig = require('./redirect')
Expand Down Expand Up @@ -91,7 +92,7 @@ const addSitePlugins = () => config => {
const { id, date } = parseBlog(fileName)
return {
path: '/blog/show/' + id,
lastMod: date.toISOString().slice(0, 10)
lastmod: date.toISOString().slice(0, 10)
}
})
)
Expand All @@ -111,9 +112,9 @@ const addSitePlugins = () => config => {
)

config.plugins.push(
new SitemapPlugin(hero.url, routes, {
lastMod: true,
changeFreq: 'weekly'
new SitemapPlugin({
base: hero.url,
paths: routes
})
)

Expand Down Expand Up @@ -156,9 +157,11 @@ const addSitePlugins = () => config => {
return config
}

moduleAlias.addAlias('react', 'preact/compat')
moduleAlias.addAlias('react-dom', 'preact/compat')

module.exports = override(
useBabelRc(),
useEslintRc(),
addWebpackAlias({
react: 'preact/compat',
'react-dom': 'preact/compat'
Expand Down
13,321 changes: 6,880 additions & 6,441 deletions package-lock.json

Large diffs are not rendered by default.

51 changes: 26 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,44 @@
"module": "./src.index.js",
"jsnext:main": "./src/index.js",
"dependencies": {
"@fortawesome/fontawesome-free": "5.13.0",
"@fortawesome/fontawesome-free": "5.15.3",
"@gouch/to-title-case": "2.2.1",
"bootstrap": "4.4.1",
"bootstrap": "4.6.0",
"fastestsmallesttextencoderdecoder": "^1.0.22",
"leaflet": "^1.7.1",
"platform": "1.3.5",
"preact": "^10.4.1",
"platform": "1.3.6",
"preact": "^10.5.13",
"preact-router": "^3.2.1",
"ramda": "0.27.0",
"react-app-polyfill": "^1.0.6",
"react-leaflet": "^3.1.0",
"react-redux": "^7.2.0",
"redux": "4.0.5",
"ramda": "0.27.1",
"react-app-polyfill": "^2.0.0",
"react-leaflet": "^3.2.0",
"react-redux": "^7.2.4",
"redux": "4.1.0",
"redux-actions": "2.6.5",
"redux-persist": "6.0.0",
"reselect": "4.0.0",
"s-ago": "2.1.0",
"uuid": "8.0.0"
"s-ago": "2.2.0",
"uuid": "8.3.2"
},
"devDependencies": {
"customize-cra": "0.9.1",
"fast-xml-parser": "^3.17.4",
"front-matter": "^4.0.1",
"husky": "4.2.5",
"customize-cra": "1.0.0",
"fast-xml-parser": "^3.19.0",
"front-matter": "^4.0.2",
"husky": "6.0.0",
"lato-font": "^3.0.0",
"loader-utils": "^0.2.9",
"markdown-it": "^11.0.0",
"markdown-it-html5-media": "^0.6.0",
"node-sass": "^4.14.0",
"null-loader": "4.0.0",
"loader-utils": "^2.0.0",
"markdown-it": "^12.0.6",
"markdown-it-html5-media": "^0.7.0",
"module-alias": "^2.2.2",
"null-loader": "4.0.1",
"prerender-spa-plugin": "3.4.0",
"prettier": "2.0.5",
"pretty-quick": "2.0.1",
"react-app-rewired": "2.1.6",
"react-scripts": "^3.4.3",
"prettier": "2.3.2",
"pretty-quick": "3.1.1",
"react-app-rewired": "2.1.8",
"react-scripts": "^4.0.3",
"redux-logger": "3.0.6",
"sitemap-webpack-plugin": "0.7.1"
"sass": "^1.35.1",
"sitemap-webpack-plugin": "1.1.0"
},
"scripts": {
"fix": "eslint --fix src && prettier --write '{*,public/*,src/**,src/**/*,src/**/**/*}.{js,json,css,scss,md,html}'",
Expand Down
1 change: 0 additions & 1 deletion src/routes/account/loot-tracker.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

.rs-item-quantity-number {
display: inline-block;
background-image: url('/img/numbers.png');
height: 10px;
}

Expand Down
3 changes: 2 additions & 1 deletion src/routes/account/loot-tracker.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ const buildQuantity = num => {
style={{
width: g.w,
backgroundPositionX: -g.x,
backgroundPositionY: -g.y
backgroundPositionY: -g.y,
backgroundImage: 'url(/img/numbers.png)'
}}
/>
))}
Expand Down
1 change: 0 additions & 1 deletion src/routes/account/tags.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { h, Fragment } from 'preact'
import '@gouch/to-title-case'
import { bindActionCreators } from 'redux'
import { fetchConfig, getTags } from '../../modules/config'
import { connect } from 'react-redux'
Expand Down
1 change: 0 additions & 1 deletion src/routes/account/tiles.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { h, Fragment } from 'preact'
import '@gouch/to-title-case'
import { bindActionCreators } from 'redux'
import {
fetchConfig,
Expand Down
1 change: 0 additions & 1 deletion src/routes/account/time-tracking.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { h, Fragment } from 'preact'
import '@gouch/to-title-case'
import { bindActionCreators } from 'redux'
import { fetchConfig } from '../../modules/config'
import { connect } from 'react-redux'
Expand Down