Skip to content
Merged
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
17 changes: 10 additions & 7 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"presets": [
["es2015", {
"loose": true,
}],
"react",
[
"@babel/preset-env",
{
"loose": true
}
],
"@babel/preset-react"
],
"plugins": [
"transform-class-properties",
"transform-object-assign",
],
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-object-assign"
]
}
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: node_js
node_js:
- '4'
- '6'
- '8'
- '10'
Expand Down
15 changes: 9 additions & 6 deletions __tests__/.babelrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"presets": [
["es2015", {
"loose": true,
}],
"react",
[
"@babel/preset-env",
{
"loose": true
}
],
"@babel/preset-react"
],
"plugins": [
"transform-async-to-generator",
],
"@babel/plugin-transform-async-to-generator"
]
}
24 changes: 13 additions & 11 deletions example/.babelrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{
"presets": [
"es2015",
"react",
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"dynamic-import-node",
"transform-class-properties",
"@babel/plugin-proposal-class-properties",
"../babel",
["module-resolver", {
"alias": {
"react-loadable": "./src/index.js",
"react-loadable/server": "./src/server.js",
"react-loadable/webpack": "./src/webpack.js",
},
}]
],
[
"module-resolver",
{
"alias": {
"react-loadable": "./src/index.js",
"react-loadable-webpack": "./src/webpack.js"
}
}
]
]
}
2 changes: 1 addition & 1 deletion example/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import path from 'path';
import React from 'react';
import ReactDOMServer from 'react-dom/server';
import Loadable from 'react-loadable';
import { getBundles } from 'react-loadable/webpack'
import { getBundles } from 'react-loadable-webpack'
import App from './components/App';

const stats = require('./dist/react-loadable.json');
Expand Down
38 changes: 21 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,29 @@
"prepublish": "yarn build"
},
"dependencies": {
"prop-types": "^15.5.0"
"prop-types": "^15.6.2"
},
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-loader": "^7.1.2",
"babel-plugin-dynamic-import-node": "^1.1.0",
"babel-plugin-module-resolver": "^2.7.1",
"babel-plugin-transform-async-to-generator": "^6.24.1",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-assign": "^6.22.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"express": "^4.16.1",
"flow-bin": "^0.41.0",
"jest": "^21.2.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0",
"webpack": "^3.6.0"
"@babel/cli": "^7.1.2",
"@babel/core": "^7.1.2",
"@babel/node": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-transform-async-to-generator": "^7.1.0",
"@babel/plugin-transform-object-assign": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.4",
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-plugin-module-resolver": "^3.1.1",
"express": "^4.16.4",
"flow-bin": "^0.83.0",
"jest": "^23.6.0",
"react": "^16.5.2",
"react-dom": "^16.5.2",
"react-test-renderer": "^16.5.2",
"webpack": "^4.20.2"
},
"peerDependencies": {
"react": "*"
Expand Down
8 changes: 4 additions & 4 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ module.exports = {
options: {
babelrc: false,
presets: [
['es2015', { modules: false }],
'react',
['@babel/preset-env', { modules: false }],
'@babel/preset-react',
],
plugins: [
'syntax-dynamic-import',
'transform-class-properties',
'transform-object-assign',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-transform-object-assign',
require.resolve('./babel'),
],
}
Expand Down
Loading