Merge pull request #73 from jobready/NEP-8149

NEP-8149 Update dependencies
rdytech · Jul 12, 2019 · c5a661f · c5a661f
2 parents c459a1a + 7c5e280
commit c5a661f
Show file tree

Hide file tree

Showing 9 changed files with 38,873 additions and 21,300 deletions.
diff --git a/dist/react-filterbar.js b/dist/react-filterbar.js
diff --git a/dist/react-filterbar.min.js b/dist/react-filterbar.min.js
diff --git a/example/Gemfile.lock b/example/Gemfile.lock
@@ -12,15 +12,15 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
-    rack-protection (1.5.3)
+    rack (1.6.11)
+    rack-protection (1.5.5)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
     shotgun (0.9.1)
       rack (>= 1.0)
-    sinatra (1.4.6)
-      rack (~> 1.4)
+    sinatra (1.4.8)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     sinatra-contrib (1.4.6)
@@ -31,7 +31,7 @@ GEM
       sinatra (~> 1.4.0)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
-    tilt (2.0.1)
+    tilt (2.0.9)
 
 PLATFORMS
   ruby
@@ -45,4 +45,4 @@ DEPENDENCIES
   sinatra-contrib
 
 BUNDLED WITH
-   1.10.5
+   1.17.2
diff --git a/example/public/js/react-filterbar.js b/example/public/js/react-filterbar.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -31,7 +31,12 @@ gulp.task('dev', function() {
     extensions: ['.js'],
     debug: true
   })
-  .transform(babelify)
+  .transform(babelify.configure({
+    presets: [
+      "@babel/preset-env",
+      "@babel/preset-react",
+    ]
+  }))
   .bundle()
   .pipe(source(appDistFile))
   .pipe(gulp.dest('example/public/js'));
@@ -67,69 +72,54 @@ gulp.task('testWatch', function() {
   gulp.watch([scriptsPath + '/**/*.*', './__tests__/**/*.*'], ['jest']);
 })
 
-gulp.task('wneptune', function() {
-  gulp.watch([scriptsPath + '/**/*.*', './__tests__/**/*.*'], ['neptune']);
-});
-
-gulp.task('example', function () {
-  browserify({
+gulp.task('example', () => {
+  return browserify({
     entries: './src/' + appFile,
     extensions: ['.js'],
     debug: true
   })
-  .transform(babelify)
+  .transform(babelify.configure({
+    presets: [
+      "@babel/preset-env",
+      "@babel/preset-react",
+    ]
+  }))
   .bundle()
   .pipe(source(appDistFile))
-  .pipe(gulp.dest('example/public/js'));
+  .pipe(gulp.dest('example/public/js'))
 });
 
-gulp.task('neptune', function() {
-  browserify({
-    entries: './src/' + appFile,
-    extensions: ['.js'],
-    debug: true
-  })
-  .transform(babelify)
-  .bundle()
-  .pipe(source(appDistFile))
-  .pipe(gulp.dest('/app/vendor/assets/bower_components/react-filterbar/dist'));
-});
+gulp.task('delete', () =>
+  new Promise((resolve, reject) =>
+    del('dist/*.js', (err, deletedFiles) => {
+      console.log("Files deleted:",deletedFiles.join(', '));
+      resolve();
+    })
+  )
+);
 
-gulp.task('marcus', function() {
+gulp.task('build', gulp.series('delete', () =>
   browserify({
     entries: './src/' + appFile,
     extensions: ['.js'],
-    debug: true
   })
-  .transform(babelify)
+  .transform(babelify.configure({
+    presets: [
+      "@babel/preset-env",
+      "@babel/preset-react",
+    ]
+  }))
   .bundle()
   .pipe(source(appDistFile))
-  .pipe(gulp.dest('/Users/marcusm/Projects/neptune/vendor/assets/bower_components/react-filterbar/dist'));
-});
+  .pipe(gulp.dest('dist'))
+));
 
-gulp.task('build', ['delete'], function () {
-  return browserify({
-    entries: './src/' + appFile,
-    extensions: ['.js'],
-  })
-  .transform(babelify)
-  .bundle()
-  .pipe(source(appDistFile))
-  .pipe(gulp.dest('dist'));
-});
-
-gulp.task('compress', ['build'], function() {
-  return gulp.src('dist/' + appDistFile)
+gulp.task('compress', gulp.series('build', () =>
+  gulp.src('dist/' + appDistFile)
   .pipe(uglify())
   .pipe(rename(appMinDistFile))
-  .pipe(gulp.dest('dist'));
-});
-
-gulp.task('delete', function() {
-  return del('dist/*.js', function(err, deletedFiles) {
-    console.log("Files deleted:",deletedFiles.join(', '));
-  });
-});
+  .pipe(gulp.dest('dist'))
+));
 
-gulp.task('default',['example','neptune','watch']);
-gulp.task('dist', ['compress']);
+gulp.task('default', gulp.series('example'));
+gulp.task('dist', gulp.series('compress'));