Upgrade uuid, change import, add eslint ignore config

Author: ktuite

.eslintrc.json

@@ -19,6 +19,7 @@
     "global-require": "off",
     "implicit-arrow-linebreak": "off",
     "import/newline-after-import": "off",
+    "import/no-unresolved": ["error", { "ignore": ["^uuid$"] }], // uuid v9+ uses ES modules; eslint-plugin-import has trouble resolving it but it works fine at runtime
     "import/order": "off",
     "lines-between-class-members": "off",
     "max-classes-per-file": "off",

lib/data/entity.js

@@ -14,7 +14,7 @@
 const csv = require('csv-stringify');
 const { clone, path, mergeLeft } = require('ramda');
 const { Transform } = require('stream');
-const uuid = require('uuid').v4;
+const { v4: uuid } = require('uuid');
 const hparser = require('htmlparser2');
 const { last } = require('ramda');
 const { PartialPipe } = require('../util/stream');

lib/data/odk-reporter.js

@@ -7,7 +7,7 @@
 // including this file, may be copied, modified, propagated, or distributed
 // except according to the terms contained in the LICENSE file.
 
-const uuid = require('uuid').v4;
+const { v4: uuid } = require('uuid');
 const { encodeXML } = require('entities');
 
 const metaWithUuidXml = () => {

lib/model/frame.js

@@ -9,7 +9,7 @@
 
 const { sql } = require('slonik');
 const { pick, without, remove, indexOf } = require('ramda');
-const uuid = require('uuid').v4;
+const { v4: uuid } = require('uuid');
 const { pickAll, noargs } = require('../util/util');
 const Option = require('../util/option');
 const { rejectIf } = require('../util/promise');

lib/model/frames/submission.js

@@ -7,7 +7,7 @@
 // including this file, may be copied, modified, propagated, or distributed
 // except according to the terms contained in the LICENSE file.
 
-const uuid = require('uuid').v4;
+const { v4: uuid } = require('uuid');
 const { Frame, table, readable, writable, embedded, into } = require('../frame');
 const { consumeAndBuffer } = require('../../util/stream');
 const { resolve } = require('../../util/promise');

lib/model/migrations/20171030-01-add-default-authz-records.js

@@ -8,7 +8,7 @@
 // except according to the terms contained in the LICENSE file.
 //
 
-const uuid = require('uuid').v4;
+const { v4: uuid } = require('uuid');
 
 /* eslint-disable */ // because eslint's indentation expectations here are insane.
 const up = (db) =>

lib/model/migrations/20180112-02-add-field-keys.js

@@ -8,7 +8,7 @@
 // except according to the terms contained in the LICENSE file.
 //
 
-const uuid = require('uuid').v4;
+const { v4: uuid } = require('uuid');
 
 const up = (knex) =>
   knex.schema.createTable('field_keys', (fk) => {

lib/model/migrations/20181206-01-add-projects.js

@@ -7,7 +7,7 @@
 // including this file, may be copied, modified, propagated, or distributed
 // except according to the terms contained in the LICENSE file.
 
-const uuid = require('uuid').v4;
+const { v4: uuid } = require('uuid');
 
 const up = async (db) => {
   // first create the projects table itself.

lib/model/query/actees.js

@@ -7,7 +7,7 @@
 // including this file, may be copied, modified, propagated, or distributed
 // except according to the terms contained in the LICENSE file.
 
-const uuid = require('uuid').v4;
+const { v4: uuid } = require('uuid');
 const { sql } = require('slonik');
 const { Actee } = require('../frames');
 const { construct } = require('../../util/util');