Skip to content
Open
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
6 changes: 4 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"presets": [
"es2015",
"react"
]
"react",
"stage-0"
],
"plugins": ["transform-decorators-legacy"]
}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules/*
.idea/
node_modules/
npm-debug.log
4,329 changes: 3,533 additions & 796 deletions dist/main.js

Large diffs are not rendered by default.

3,573 changes: 3,572 additions & 1 deletion dist/main.min.js

Large diffs are not rendered by default.

18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,20 @@
"author": "Cheesu@Tencent",
"license": "MIT",
"dependencies": {
"react": "^15.0.2"
"core-decorators": "0.19.0",
"prop-types": "15.5.10",
"react": "^15.6.1"
},
"devDependencies": {
"babel-core": "^6.7.2",
"babel-loader": "^6.2.4",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
"babel-core": "^6.23.1",
"babel-loader": "^7.1.1",
"babel-plugin-react-transform": "^2.0.2",
"babel-plugin-transform-decorators-legacy": "1.3.4",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.23.0",
"babel-preset-stage-0": "^6.24.1",
"es5-shim": "^4.1.10",
"jsx-loader": "^0.13.2",
"webpack": "^1.12.14"
"webpack": "^3.5.2"
},
"bugs": {
"url": "https://github.com/SoAanyip/React-FileUpload/issues"
Expand Down
674 changes: 350 additions & 324 deletions src/FileUpload.js

Large diffs are not rendered by default.

41 changes: 17 additions & 24 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,48 +9,41 @@ var sharedConfig = {
library: 'react-fileupload',
libraryTarget: 'umd'
},
module:{
loaders: [{
test: /\.jsx?$/,
loader: "babel",
query: {
presets: ['react','es2015']
}
module: {
rules: [{
test: /\.js$/,
exclude: /(node_modules|tmp)/,
loader: 'babel-loader'
}]
},
externals: [{
'react': {
root: 'React',
commonjs2: 'react',
commonjs: 'react',
amd: 'react'
}
'react': {
root: 'React',
commonjs2: 'react',
commonjs: 'react',
amd: 'react'
}
],
resolve: {
extensions: ['', '.js']
}
}]
};

var devBundleConfig = Object.assign({}, sharedConfig, {
entry: {
'main': entry
}
});
});

var prodBundleConfig = Object.assign({}, sharedConfig, {
entry: {
'main.min': entry
},
'main.min': entry
}/*,
plugins: [
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.optimize.UglifyJsPlugin({
compressor: {
screw_ie8: true,
warnings: false
screw_ie8: true,
warnings: false
}
})
]
]*/
});

module.exports = [
Expand Down
Loading