Node.js based forum software built for the modern web
switch deprecated json2csv dep for equivalent @json2csv/node dep (#14276)
crlm9677dc8efcce42
diff --git a/install/package.json b/install/package.jsonindex e7075f7e0c..170e63ea01 100644--- a/install/package.json+++ b/install/package.json@@ -34,6 +34,7 @@"@fontsource/poppins": "5.2.7","@fortawesome/fontawesome-free": "6.7.2","@isaacs/ttlcache": "2.1.4",+ "@json2csv/node": "7.0.6","@nodebb/spider-detector": "2.0.3","@popperjs/core": "2.11.8","@textcomplete/contenteditable": "0.1.13",@@ -87,7 +88,6 @@"jquery-serializeobject": "1.0.0","jquery-ui": "1.14.1","jsesc": "3.1.0",- "json2csv": "5.0.7","jsonwebtoken": "9.0.3","lodash": "4.18.1","logrotate-stream": "0.2.9",diff --git a/src/controllers/admin/errors.js b/src/controllers/admin/errors.jsindex f609ecca3d..fb5c7199af 100644--- a/src/controllers/admin/errors.js+++ b/src/controllers/admin/errors.js@@ -1,6 +1,6 @@'use strict';-const json2csvAsync = require('json2csv').parseAsync;+const { AsyncParser } = require('@json2csv/node');const meta = require('../../meta');const analytics = require('../../analytics');@@ -20,6 +20,7 @@ errorsController.export = async function (req, res) {const data = await meta.errors.get(false);const fields = data.length ? Object.keys(data[0]) : [];const opts = { fields };- const csv = await json2csvAsync(data, opts);+ const json2csvAsync = new AsyncParser(opts);+ const csv = await json2csvAsync.parse(data).promise();res.set('Content-Type', 'text/csv').set('Content-Disposition', 'attachment; filename="404.csv"').send(csv);};diff --git a/src/user/admin.js b/src/user/admin.jsindex b629e46628..26ad8b2c3f 100644--- a/src/user/admin.js+++ b/src/user/admin.js@@ -5,7 +5,7 @@ const fs = require('fs');const path = require('path');const winston = require('winston');const validator = require('validator');-const json2csvAsync = require('json2csv').parseAsync;+const { AsyncParser } = require('@json2csv/node');const { baseDir } = require('../constants').paths;const db = require('../database');@@ -85,7 +85,8 @@ module.exports = function (User) {});const opts = { fields, header: false };- const csv = await json2csvAsync(usersData, opts);+ const json2csvAsync = new AsyncParser(opts);+ const csv = await json2csvAsync.parse(usersData).promise();await fs.promises.appendFile(fd, csv);}, {batch: 5000,diff --git a/src/user/jobs/export-posts.js b/src/user/jobs/export-posts.jsindex 3f1e39b170..ed57ba53b1 100644--- a/src/user/jobs/export-posts.js+++ b/src/user/jobs/export-posts.js@@ -8,7 +8,7 @@ nconf.argv().env({const fs = require('fs');const path = require('path');-const json2csvAsync = require('json2csv').parseAsync;+const { AsyncParser } = require('@json2csv/node');process.env.NODE_ENV = process.env.NODE_ENV || 'production';@@ -47,7 +47,8 @@ process.on('message', async (msg) => {const fields = payload.length ? Object.keys(payload[0]) : [];const opts = { fields };- const csv = await json2csvAsync(payload, opts);+ const json2csvAsync = new AsyncParser(opts);+ const csv = await json2csvAsync.parse(payload).promise();await fs.promises.writeFile(filePath, csv);await db.close();