[Issue-94] Use webpack to build vanilla JS bundle

myhelix · Sep 15, 2016 · 89b3fe2 · 89b3fe2
1 parent fd32bc7
commit 89b3fe2
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 67 deletions.
diff --git a/gulp-tasks/build.js b/gulp-tasks/build.js
@@ -49,20 +49,6 @@ gulp.task('min-no-mangle', function () {
         .pipe(gulp.dest(path.join(paths.dist)));
 });
 
-gulp.task('js', function () {
-    return gulp.src([
-            path.join(paths.src, paths.build, 'prefix.js'),
-            path.join(paths.src, 'Cleave.js'),
-            path.join(paths.src, paths.utils, '**/*.js'),
-            path.join(paths.src, paths.common, '**/*.js'),
-            path.join(paths.src, paths.shortcuts, '**/*.js'),
-            path.join(paths.src, paths.build, 'expose.js'),
-            path.join(paths.src, paths.build, 'suffix.js')
-        ])
-        .pipe(concat('cleave.js'))
-        .pipe(gulp.dest(paths.dist));
-});
-
 gulp.task('js:angular', function () {
     return gulp.src([
             path.join(paths.dist, 'cleave.js'),
@@ -74,7 +60,7 @@ gulp.task('js:angular', function () {
 
 gulp.task('build', gulpsync.sync([
     // sync
-    'js',
+    'js:vanilla',
     'js:react',
     'js:angular',
     [

diff --git a/gulp-tasks/webpack.js b/gulp-tasks/webpack.js
@@ -8,12 +8,21 @@ var paths = {
     src:  './src/'
 };
 
-var entry = 'react.js';
+gulp.task('js:vanilla', function () {
+    return gulp.src(path.join(paths.src + 'Cleave.js'))
+        .pipe(webpack({
+            output: {
+                library:       'Cleave',
+                libraryTarget: 'umd',
+                filename:      'cleave.js'
+            }
+        }))
+        .pipe(gulp.dest(paths.dist));
+});
 
 gulp.task('js:react', function () {
-    return gulp.src(path.join(paths.root, entry))
+    return gulp.src(path.join(paths.root, 'react.js'))
         .pipe(webpack({
-            entry:     './src/Cleave.react.js',
             output:    {
                 library:       'Cleave',
                 libraryTarget: 'umd',

diff --git a/src/Cleave.js b/src/Cleave.js
@@ -320,14 +320,12 @@ Cleave.prototype = {
     }
 };
 
-if (typeof module === 'object' && typeof module.exports === 'object') {
-    Cleave.NumeralFormatter = require('./shortcuts/NumeralFormatter');
-    Cleave.DateFormatter = require('./shortcuts/DateFormatter');
-    Cleave.PhoneFormatter = require('./shortcuts/PhoneFormatter');
-    Cleave.CreditCardDetector = require('./shortcuts/CreditCardDetector');
-    Cleave.Util = require('./utils/Util');
-    Cleave.DefaultProperties = require('./common/DefaultProperties');
-
-    // CommonJS
-    module.exports = exports = Cleave;
-}
+Cleave.NumeralFormatter = require('./shortcuts/NumeralFormatter');
+Cleave.DateFormatter = require('./shortcuts/DateFormatter');
+Cleave.PhoneFormatter = require('./shortcuts/PhoneFormatter');
+Cleave.CreditCardDetector = require('./shortcuts/CreditCardDetector');
+Cleave.Util = require('./utils/Util');
+Cleave.DefaultProperties = require('./common/DefaultProperties');
+
+// CommonJS
+module.exports = Cleave;
diff --git a/src/build/expose.js b/src/build/expose.js
diff --git a/src/build/prefix.js b/src/build/prefix.js
diff --git a/src/build/suffix.js b/src/build/suffix.js
diff --git a/src/common/DefaultProperties.js b/src/common/DefaultProperties.js
@@ -69,6 +69,5 @@ var DefaultProperties = {
     }
 };
 
-if (typeof module === 'object' && typeof module.exports === 'object') {
-    module.exports = exports = DefaultProperties;
-}
+module.exports = DefaultProperties;
+
diff --git a/src/shortcuts/CreditCardDetector.js b/src/shortcuts/CreditCardDetector.js
@@ -122,6 +122,5 @@ var CreditCardDetector = {
     }
 };
 
-if (typeof module === 'object' && typeof module.exports === 'object') {
-    module.exports = exports = CreditCardDetector;
-}
+module.exports = CreditCardDetector;
+
diff --git a/src/shortcuts/DateFormatter.js b/src/shortcuts/DateFormatter.js
@@ -70,6 +70,5 @@ DateFormatter.prototype = {
     }
 };
 
-if (typeof module === 'object' && typeof module.exports === 'object') {
-    module.exports = exports = DateFormatter;
-}
+module.exports = DateFormatter;
+
diff --git a/src/shortcuts/NumeralFormatter.js b/src/shortcuts/NumeralFormatter.js
@@ -78,6 +78,4 @@ NumeralFormatter.prototype = {
     }
 };
 
-if (typeof module === 'object' && typeof module.exports === 'object') {
-    module.exports = exports = NumeralFormatter;
-}
+module.exports = NumeralFormatter;
diff --git a/src/shortcuts/PhoneFormatter.js b/src/shortcuts/PhoneFormatter.js
@@ -54,6 +54,5 @@ PhoneFormatter.prototype = {
     }
 };
 
-if (typeof module === 'object' && typeof module.exports === 'object') {
-    module.exports = exports = PhoneFormatter;
-}
+module.exports = PhoneFormatter;
+