+
{detailDIV}
{editDIV}
{deleteDIV}
diff --git a/package.json b/package.json
index e541d4bf..2318792d 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,10 @@
},
"license": "Apache-2.0",
"dependencies": {
- "animate.css": "^3.7.0",
+ "animate.css": "^4.1.1",
"async": "^3.1.0",
"body-parser": "^1.18.3",
- "camelcase": "^5.0.0",
+ "camelcase": "^6.0.0",
"chroma-js": "^2.0.2",
"classnames": "^2.2.6",
"codemirror": "^5.40.2",
@@ -47,7 +47,7 @@
"express": "^4.16.3",
"express-fileupload": "^1.1.6",
"express-state": "^2.0.0",
- "fast-csv": "^3.4.0",
+ "fast-csv": "^4.3.2",
"flashtext.js": "^1.0.5",
"fluxible": "^1.4.0",
"fluxible-addons-react": "^0.2.15",
@@ -56,7 +56,7 @@
"hogan-express": "^0.5.2",
"jqcloud2": "^2.0.3",
"jquery": "^3.4.1",
- "json2csv": "^4.2.1",
+ "json2csv": "^5.0.1",
"json3": "^3.3.2",
"leaflet": "^1.3.4",
"log4js": "^6.1.0",
@@ -72,7 +72,7 @@
"rc-calendar": "^9.7.9",
"react": "^16.5.2",
"react-dom": "^16.5.2",
- "react-dropzone": "^10.1.0",
+ "react-dropzone": "^11.1.0",
"react-leaflet": "^2.0.1",
"react-loadable": "^5.5.0",
"react-markdown": "^4.0.4",
@@ -85,7 +85,7 @@
"serialize-javascript": "^4.0.0",
"serve-favicon": "^2.5.0",
"simplify-js": "^1.2.3",
- "superagent": "^5.0.2",
+ "superagent": "^6.1.0",
"valid-url": "^1.0.9",
"wicket": "^1.3.3",
"yasgui-yasqe": "^2.11.22"
@@ -108,23 +108,25 @@
"bundle-loader": "^0.5.6",
"clean-webpack-plugin": "^3.0.0",
"coveralls": "^3.0.9",
- "css-loader": "^3.2.1",
+ "css-loader": "^4.3.0",
"es6-promise": "^4.2.8",
- "eslint": "^6.7.2",
+ "eslint": "^7.8.1",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-react": "^7.17.0",
- "extract-text-webpack-plugin": "^4.0.0-beta.0",
- "husky": "^3.1.0",
+ "extract-css-chunks-webpack-plugin": "^4.7.5",
+ "extract-loader": "^5.1.0",
+ "file-loader": "^6.1.0",
+ "husky": "^4.3.0",
"json-loader": "^0.5.7",
"nodemon": "^2.0.1",
- "postcss-loader": "^3.0.0",
- "react-hot-loader": "^4.12.18",
+ "postcss-loader": "^4.0.1",
+ "react-hot-loader": "^4.12.21",
"shelljs": "^0.8.3",
"sloc": "^0.2.1",
- "style-loader": "^1.0.1",
- "webpack": "^4.41.2",
- "webpack-cli": "^3.3.10",
- "webpack-dev-server": "^3.9.0",
+ "style-loader": "^1.2.1",
+ "webpack": "^4.44.1",
+ "webpack-cli": "^3.3.12",
+ "webpack-dev-server": "^3.11.0",
"webpack-stats-plugin": "^0.3.0",
"webpack-vendor-chunk-plugin": "^1.0.0",
"webpack-visualizer-plugin": "^0.1.11"
diff --git a/services/import.js b/services/import.js
index 8bd11e14..08c43264 100644
--- a/services/import.js
+++ b/services/import.js
@@ -7,7 +7,7 @@ import ImportQuery from './sparql/ImportQuery';
import ImportUtil from './utils/ImportUtil';
import rp from 'request-promise';
//CSV parsing
-import csv from 'fast-csv';
+import * as csv from 'fast-csv';
import fs from 'fs';
import path from 'path';
import camelCase from 'camelcase';
@@ -76,6 +76,7 @@ export default {
let rows = [];
let csvStream = csv.parse(options)
.on('data', function(data){
+ //console.log(data);
counter++;
//to limi the number of rows returned
if(counter > 10){
diff --git a/webpack/prod.config.js b/webpack/prod.config.js
index 39d9c3f4..ce89a74a 100644
--- a/webpack/prod.config.js
+++ b/webpack/prod.config.js
@@ -1,7 +1,7 @@
let webpack = require('webpack');
let path = require('path');
//plugins
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const ExtractCssChunks = require('extract-css-chunks-webpack-plugin');
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
const Visualizer = require('webpack-visualizer-plugin');
@@ -51,11 +51,15 @@ let webpackConfig = {
},
{
test: /\.css$/,
- loader: ExtractTextPlugin.extract({
- fallback: 'style-loader',
- use: 'css-loader',
- publicPath: '/public/css/'
- })
+ use: [
+ {
+ loader: ExtractCssChunks.loader,
+ options: {
+ publicPath: '/public/css/'
+ },
+ },
+ 'css-loader',
+ ],
}
]
},
@@ -64,10 +68,9 @@ let webpackConfig = {
},
plugins: [
// css files from the extract-text-plugin loader
- new ExtractTextPlugin({
- filename: '../css/vendor.bundle.css',
- disable: false,
- allChunks: true
+ new ExtractCssChunks({
+ filename: '../css/[name].css',
+ chunkFilename: '../css/vendor.bundle.css',
}),
new webpack.DefinePlugin({
'process.env': {