Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
RoCky Wu committed Jun 6, 2016
2 parents f94eae8 + b105fe2 commit 806c74e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-ripples",
"version": "0.2.0",
"version": "0.2.1",
"description": "The ripple effect everything",
"main": "dist/react-ripples.js",
"scripts": {
Expand Down Expand Up @@ -46,6 +46,7 @@
"babel-preset-stage-0": "^6.5.0",
"chalk": "^1.1.3",
"coveralls": "^2.11.9",
"del": "^2.2.0",
"enzyme": "^2.3.0",
"eslint": "^2.11.1",
"gulp": "^3.9.1",
Expand Down
3 changes: 2 additions & 1 deletion scripts/build.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import webpack from 'webpack'
import webConf from '../webpack.config'

import del from 'del'
import gu from 'gulp'
import rename from 'gulp-rename'
import uglify from 'gulp-uglify'

del.sync('dist')
webpack(webConf, (er, stats)=> {
console.log(stats.toString({
colors: true
Expand Down
6 changes: 6 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const webpack = require('webpack')
const pkg = require('./package.json')

const webpackEnv = process.env.WEBPACK
const isDemo = webpackEnv === 'demo'
Expand Down Expand Up @@ -35,6 +36,11 @@ module.exports = {
} : {}
},
externals: isProd ? {
...Object.keys(pkg.dependencies).reduce((o, dep)=> {
o[dep] = true
return o
}, {}),

react: {
root: 'React',
commonjs: 'React',
Expand Down

0 comments on commit 806c74e

Please sign in to comment.