Merge pull request #873 from miketownsend/fix-unsafe-eval

alubbe · web-flow · commit dbcece75c7ef · 2019-10-07T11:00:21.000+02:00
Uprev fast-csv to latest version which does not use unsafe eval
diff --git a/gruntfile.js b/gruntfile.js
@@ -3,7 +3,7 @@
 module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-babel');
   grunt.loadNpmTasks('grunt-browserify');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-uglify-es');
   grunt.loadNpmTasks('grunt-contrib-jasmine');
   grunt.loadNpmTasks('grunt-contrib-copy');
 
diff --git a/lib/csv/csv.js b/lib/csv/csv.js
@@ -74,7 +74,7 @@ CSV.prototype = {
         return datum;
       };
 
-    const csvStream = fastCsv(options)
+    const csvStream = fastCsv.parse(options)
       .on('data', data => {
         worksheet.addRow(data.map(map));
       })
@@ -93,7 +93,7 @@ CSV.prototype = {
 
       const worksheet = this.workbook.getWorksheet(options.sheetName || options.sheetId);
 
-      const csvStream = fastCsv.createWriteStream(options);
+      const csvStream = fastCsv.format(options);
       stream.on('finish', () => {
         resolve();
       });
diff --git a/package.json b/package.json
@@ -89,9 +89,9 @@
   ],
   "dependencies": {
     "archiver": "^3.0.0",
-    "fast-csv": "^2.4.1",
-    "jszip": "^3.1.5",
     "dayjs": "^1.8.15",
+    "fast-csv": "^3.4.0",
+    "jszip": "^3.1.5",
     "sax": "^1.2.4",
     "tmp": "^0.1.0",
     "unzipper": "^0.9.12"
@@ -120,7 +120,7 @@
     "grunt-browserify": "^5.3.0",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-jasmine": "^2.0.3",
-    "grunt-contrib-uglify": "^4.0.0",
+    "grunt-contrib-uglify-es": "^3.3.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-lib-phantomjs": "^1.1.0",
     "husky": "^2.2.0",
