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.

Sign up for GitHub

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

Migrate from react-loadable to loadable-component #228

Merged
merged 10 commits into from
May 25, 2019
Merged

Migrate from react-loadable to loadable-component #228

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
752bd73
Migrate from react-loadable to loadable-component
xD3CODER May 22, 2019
2a7a326
Added error boundaries to catch loading errors, updated tests
Rid May 22, 2019
5fd2df2
Use better source maps
Rid May 22, 2019
42b58fe
Remove unneeded source map resolution
Rid May 22, 2019
579654c
Merge pull request #1 from Rid/master
xD3CODER May 22, 2019
f328041
Convert module.exports to export default
Rid May 23, 2019
eb43b44
Fix location of loadable-stats.json, currently fails on yarn build
Rid May 23, 2019
6309728
Merge pull request #2 from Rid/master
xD3CODER May 23, 2019
e0c415a
Fix error: Warning: Functions are not valid as a React child.
Rid May 23, 2019
e772a7c
Merge pull request #3 from Rid/master
xD3CODER May 23, 2019
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
4 changes: 3 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/* @flow */

// Allows you to precompile ES6 syntax
require('@babel/register');
require('@babel/register')({
plugins: ['dynamic-import-node']
});

// Setup global variables for server-side
global.__CLIENT__ = false;
Expand Down
11 changes: 5 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@
],
"plugins": [
"react-hot-loader/babel",
"react-loadable/babel",
"dynamic-import-node",
"@loadable/babel-plugin",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-syntax-dynamic-import"
],
Expand Down Expand Up @@ -291,6 +290,8 @@
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/register": "^7.4.4",
"@loadable/component": "^5.10.1",
"@loadable/server": "^5.9.0",
"asset-require-hook": "^1.2.0",
"autoprefixer": "^9.5.1",
"axios": "^0.18.0",
Expand All @@ -316,7 +317,6 @@
"react-dom": "npm:@hot-loader/react-dom",
"react-helmet": "^5.2.1",
"react-hot-loader": "^4.8.4",
"react-loadable": "^5.5.0",
"react-redux": "^7.0.3",
"react-router": "^5.0.0",
"react-router-config": "^5.0.0",
Expand All @@ -328,6 +328,8 @@
},
"devDependencies": {
"@babel/core": "^7.4.4",
"@loadable/babel-plugin": "^5.10.0",
"@loadable/webpack-plugin": "^5.7.1",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.7.1",
"babel-loader": "^8.0.5",
Expand Down Expand Up @@ -381,8 +383,5 @@
"webpack-dev-middleware": "^3.6.2",
"webpack-hot-middleware": "^2.24.4",
"webpack-manifest-plugin": "^2.0.4"
},
"resolutions": {
"webpack-sources": "^1.2.0"
}
}
Loading