Skip to content
This repository was archived by the owner on Jan 21, 2021. It is now read-only.

Commit f97c5e7

Browse files
authored
Merge pull request #31 from malikshahzad228/master
Webpack updated to 3.2.0
2 parents d0566be + ede4849 commit f97c5e7

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

demo/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# PRPL example with Webpack 2 and React
1+
# PRPL example with Webpack 3 and React
22

33
Note: this is a fork of https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/ which includes
44
usage of the Preload plugin and SW Precache.
@@ -9,7 +9,7 @@ You can also [see the preso](http://www.slideshare.net/grgur/prpl-pattern-with-w
99

1010
## Stack
1111

12-
- [x] [Webpack 2](https://webpack.github.io)
12+
- [x] [Webpack 3](https://webpack.github.io)
1313
- [x] [React 15.4](https://facebook.github.io/react/)
1414
- [x] [Babel 6](https://babeljs.io/)
1515

@@ -19,7 +19,7 @@ You can also [see the preso](http://www.slideshare.net/grgur/prpl-pattern-with-w
1919
* [Step 2](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/tree/steps/2-preload-and-preexecute) - Preload and parse JS with React Router's [getComponent](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/blob/steps/2-preload-and-preexecute/client/containers/App/index.js#L6)
2020
* [Step 3](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/tree/steps/3-preload-no-execute) - Preload with '<link rel=preload />' and React Helmet
2121
* [Step 4](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/tree/steps/4-automatic-preload) - [Custom Webpack plugin](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/blob/steps/4-automatic-preload/webpack.config.js#L43) that creates a JSON file with chunk names
22-
* [Step 5](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/tree/steps/5-injected-chunk-names) - Custom Webpack 2 plugin that [automatically injects chunk information into HTML](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/blob/steps/5-injected-chunk-names/webpack.config.js#L46). Still using React Helmet to preload chunks
22+
* [Step 5](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/tree/steps/5-injected-chunk-names) - Custom Webpack 3 plugin that [automatically injects chunk information into HTML](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/blob/steps/5-injected-chunk-names/webpack.config.js#L46). Still using React Helmet to preload chunks
2323
* [Step 6](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/tree/steps/6-no-helmet-scripttags) - Removed React Helmet dependency and [injecting code with raw JS](https://github.com/ModusCreateOrg/react-dynamic-route-loading-es6/blob/steps/6-no-helmet-scripttags/client/containers/App/index.js#L8) (simplicity FTW)
2424

2525
## Browser setup

demo/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "react-router-dynamic-routes-webpack2",
2+
"name": "react-router-dynamic-routes-webpack3",
33
"version": "1.0.0",
44
"private": true,
55
"description": "React Router Dynamic Chunk Loading",
@@ -17,16 +17,16 @@
1717
"babel-plugin-transform-runtime": "^6.15.0",
1818
"babel-preset-es2015": "^6.18.0",
1919
"babel-preset-react": "^6.15.0",
20-
"css-loader": "0.14.5",
21-
"extract-text-webpack-plugin": "^2.0.0-beta.4",
22-
"file-loader": "^0.8.5",
20+
"css-loader": "^0.28.4",
21+
"extract-text-webpack-plugin": "^3.0.0",
22+
"file-loader": "^0.11.2",
2323
"html-webpack-plugin": "^2.24.1",
24-
"node-sass": "^3.13.0",
25-
"sass-loader": "^3.2.3",
26-
"style-loader": "^0.13.1",
24+
"node-sass": "^4.5.3",
25+
"sass-loader": "^6.0.6",
26+
"style-loader": "^0.18.2",
2727
"sw-precache-webpack-plugin": "^0.7.2",
28-
"webpack": "^2.1.0-beta.27",
29-
"webpack-dev-server": "^2.1.0-beta.10"
28+
"webpack": "^3.2.0",
29+
"webpack-dev-server": "^2.5.1"
3030
},
3131
"dependencies": {
3232
"babel-polyfill": "^6.16.0",

demo/static/my-service-worker.js

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "preload-webpack-plugin",
3-
"version": "1.2.2",
3+
"version": "1.2.3",
44
"description": "Enhances html-webpack-plugin with link rel=preload wiring capabilities for scripts",
55
"main": "index.js",
66
"scripts": {
@@ -35,10 +35,10 @@
3535
"eslint-config-google": "^0.7.1",
3636
"html-webpack-plugin": "^2.26.0",
3737
"jasmine": "^2.5.3",
38-
"webpack": "^2.2.0"
38+
"webpack": "^3.2.0"
3939
},
4040
"peerDependencies": {
41-
"webpack": "^2.2.0"
41+
"webpack": "^3.2.0"
4242
},
4343
"dependencies": {
4444
"object-assign": "^4.1.1"

0 commit comments

Comments
 (0)