Skip to content

Commit ff1a893

Browse files
committed
fully updated to react-router-dom@4.2.2 and tested
1 parent 64a0286 commit ff1a893

33 files changed

+611
-324
lines changed

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ Install dependencies by running the following in the root of the project:
4040

4141
To contribute to the repository, please create a feature branch off of the dev branch. Once you're finished working on the feature, make a pull request to merge it into dev. Please make sure that every pull request has passed the build checks, which appear just before the "Merge pull request" button in github.
4242

43+
### Updating npm-shrinkwrap.json
44+
45+
Use **npm v5+** for this.
46+
General workflow to update `npm-shrinkwrap.json` would be:
47+
48+
- `npm install --no-optional` - with old npm-shrinkwrap (--no-optional to skip fsevents)
49+
- update `package.json` if you need to remove/update/add any packages
50+
- remove `npm-shrinkwrap.json`
51+
- `npm install --no-optional` with new `package.json`
52+
- `npm shrinkwrap` - to convert `package-lock.json` to `npm-shrinkwrap.json`
53+
- the new `npm-shrinkwrap.json` will have just the minimal diff
54+
4355
### Code Style
4456

4557
***Checkout the code and comments in `src/components/ExampleComponent` for an example React component, `.scss` file, and tests.***

config/webpack/default.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ module.exports = {
2222
output: {
2323
path : path.join(dirname, '/dist'),
2424
filename : '[name].[hash].js',
25-
chunkFilename : '[name].[hash].js'
25+
chunkFilename : '[name].[hash].js',
26+
publicPath : '/'
2627
},
2728

2829
module: {

config/webpack/development.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ const defaultConfig = require('./default')
66

77
const dirname = path.resolve(__dirname, '../..')
88

9-
module.exports = webpackMerge(defaultConfig, {
9+
module.exports = webpackMerge.strategy({
10+
entry: 'prepend' // to put 'react-hot-loader/patch' first
11+
})(defaultConfig, {
1012
entry: [
1113
'react-hot-loader/patch'
1214
],

0 commit comments

Comments
 (0)