-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #127 from faceyspacey/webpack-4
Updates to support Webpack 4 & Universal 3
- Loading branch information
Showing
9 changed files
with
2,573 additions
and
1,512 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
[ignore] | ||
.*/node_modules/config-chain/.* | ||
.*/node_modules/npmconf/.* | ||
.*/node_modules/chalk/.* | ||
|
||
[include] | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,5 @@ dist | |
coverage | ||
node_modules | ||
*.log | ||
.idea | ||
.DS_Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,3 +19,4 @@ webpack.config.js | |
.flowconfig | ||
*.png | ||
yarn.lock | ||
.idea |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,11 +5,28 @@ | |
"main": "dist/index.js", | ||
"typings": "index.d.ts", | ||
"author": "James FaceySpacey Gillmore <[email protected]> (http://www.faceyspacey.com)", | ||
"contributors": [ | ||
"Zack Jackson <[email protected]> (https://github.com/ScriptedAlchemy)" | ||
], | ||
"license": "MIT", | ||
"bugs": { | ||
"url": "https://github.com/faceyspacey/react-universal-component/issues" | ||
}, | ||
"homepage": "https://github.com/faceyspacey/react-universal-component#readme", | ||
"keywords": [ | ||
"universal", | ||
"ruc", | ||
"unviersal react", | ||
"ssr", | ||
"code splitting", | ||
"aggressive code splitting", | ||
"lodable", | ||
"react", | ||
"async component", | ||
"universal react", | ||
"async rendering", | ||
"webpack 4" | ||
], | ||
"scripts": { | ||
"build": "babel src -d dist", | ||
"flow-copy": "flow-copy-source src dist", | ||
|
@@ -19,7 +36,7 @@ | |
"test": "jest", | ||
"lint": "eslint --fix ./", | ||
"format": "prettier --single-quote --parser=flow --semi=false --write '{src,__tests__,__fixtures__}/**/*.js' && npm run lint", | ||
"precommit": "lint-staged --verbose && npm test", | ||
"precommit": "lint-staged && npm test", | ||
"cm": "git-cz", | ||
"semantic-release": "semantic-release pre && npm publish && semantic-release post", | ||
"prepublish": "npm run clean && npm run build && npm run flow-copy" | ||
|
@@ -29,7 +46,7 @@ | |
"babel-core": "^6.24.0", | ||
"babel-eslint": "^7.2.3", | ||
"babel-plugin-transform-flow-strip-types": "^6.22.0", | ||
"babel-plugin-universal-import": "^1.0.5", | ||
"babel-plugin-universal-import": "^3.0.0", | ||
"babel-preset-es2015": "^6.24.1", | ||
"babel-preset-flow": "^6.23.0", | ||
"babel-preset-react": "^6.24.1", | ||
|
@@ -44,12 +61,12 @@ | |
"eslint-plugin-react": "^7.0.1", | ||
"flow-bin": "^0.49.1", | ||
"flow-copy-source": "^1.1.0", | ||
"husky": "^0.13.2", | ||
"husky": "^0.14.3", | ||
"jest": "^20.0.4", | ||
"lint-staged": "^3.4.0", | ||
"lint-staged": "^7.2.0", | ||
"prettier": "^1.3.1", | ||
"react": "^15.5.4", | ||
"react-test-renderer": "^15.6.1", | ||
"react": "^16.4.1", | ||
"react-test-renderer": "^16.4.1", | ||
"rimraf": "^2.5.4", | ||
"semantic-release": "^6.3.6", | ||
"slash": "^1.0.0", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.