Merge branch 'master' into develop

Author: 7insummer

build/build-prod.js

@@ -4,7 +4,7 @@ const cssmin = require('gulp-clean-css');
 const rename = require('gulp-rename');
 const componentData = require('./build-tool');
 const result = `{common,behaviors,${componentData()}}`;
-const isCustom = (result !== `{common,behaviors,}`);
+const isCustom = (result != `{common,behaviors,}`);
 
 // js => js
 gulp.task('dispose-js', () => {