Replace require() with import

scripts/core/issueLoader.ts

@@ -15,19 +15,24 @@ export class IssueLoader {
     if (TESTING) {
       switch (labels) {
         case 'channels:add,approved':
-          issues = require('../../tests/__data__/input/issues/channels_add_approved.js')
+          issues = (await import('../../tests/__data__/input/issues/channels_add_approved.js'))
+            .default
           break
         case 'channels:edit,approved':
-          issues = require('../../tests/__data__/input/issues/channels_edit_approved.js')
+          issues = (await import('../../tests/__data__/input/issues/channels_edit_approved.js'))
+            .default
           break
         case 'channels:remove,approved':
-          issues = require('../../tests/__data__/input/issues/channels_remove_approved.js')
+          issues = (await import('../../tests/__data__/input/issues/channels_remove_approved.js'))
+            .default
           break
         case 'blocklist:add,approved':
-          issues = require('../../tests/__data__/input/issues/blocklist_add_approved.js')
+          issues = (await import('../../tests/__data__/input/issues/blocklist_add_approved.js'))
+            .default
           break
         case 'blocklist:remove,approved':
-          issues = require('../../tests/__data__/input/issues/blocklist_remove_approved.js')
+          issues = (await import('../../tests/__data__/input/issues/blocklist_remove_approved.js'))
+            .default
           break
       }
     } else {

scripts/db/validate.ts

@@ -1,5 +1,6 @@
 import { Collection, Storage, File, Dictionary, Logger } from '@freearhey/core'
 import { DATA_DIR } from '../constants'
+import schemesData from '../schemes'
 import { program } from 'commander'
 import Joi from 'joi'
 import { CSVParser, IDCreator } from '../core'
@@ -10,7 +11,7 @@ program.argument('[filepath]', 'Path to file to validate').parse(process.argv)
 const logger = new Logger()
 const buffer = new Dictionary()
 const files = new Dictionary()
-const schemes: { [key: string]: object } = require('../schemes')
+const schemes: { [key: string]: object } = schemesData
 
 async function main() {
   const dataStorage = new Storage(DATA_DIR)

scripts/schemes/blocklist.js

@@ -1,8 +0,0 @@
-const Joi = require('joi')
-
-module.exports = {
-	channel: Joi.string()
-		.regex(/^[A-Za-z0-9]+\.[a-z]{2}$/)
-		.required(),
-	ref: Joi.string().uri().required()
-}

scripts/schemes/blocklist.ts

@@ -0,0 +1,8 @@
+import Joi from 'joi'
+
+export default {
+  channel: Joi.string()
+    .regex(/^[A-Za-z0-9]+\.[a-z]{2}$/)
+    .required(),
+  ref: Joi.string().uri().required()
+}

scripts/schemes/categories.js

@@ -1,10 +0,0 @@
-const Joi = require('joi')
-
-module.exports = {
-	id: Joi.string()
-		.regex(/^[a-z]+$/)
-		.required(),
-	name: Joi.string()
-		.regex(/^[A-Z]+$/i)
-		.required()
-}

scripts/schemes/categories.ts

@@ -0,0 +1,10 @@
+import Joi from 'joi'
+
+export default {
+  id: Joi.string()
+    .regex(/^[a-z]+$/)
+    .required(),
+  name: Joi.string()
+    .regex(/^[A-Z]+$/i)
+    .required()
+}

scripts/schemes/channels.ts

@@ -1,8 +1,11 @@
-const Joi = require('joi').extend(require('@joi/date'))
+import BaseJoi from 'joi'
-const path = require('path')
+import JoiDate from '@joi/date'
-const url = require('url')
+import path from 'path'
+import url from 'url'
 
-module.exports = {
+const Joi = BaseJoi.extend(JoiDate)
+
+export default {
   id: Joi.string()
     .regex(/^[A-Za-z0-9]+\.[a-z]{2}$/)
     .required(),

scripts/schemes/countries.js

@@ -1,18 +0,0 @@
-const Joi = require('joi')
-
-module.exports = {
-	name: Joi.string()
-		.regex(/^[\sA-Z\u00C0-\u00FF().-]+$/i)
-		.required(),
-	code: Joi.string()
-		.regex(/^[A-Z]{2}$/)
-		.required(),
-	languages: Joi.array().items(
-		Joi.string()
-			.regex(/^[a-z]{3}$/)
-			.required()
-	),
-	flag: Joi.string()
-		.regex(/^[\uD83C][\uDDE6-\uDDFF][\uD83C][\uDDE6-\uDDFF]$/)
-		.required()
-}

scripts/schemes/countries.ts

@@ -0,0 +1,18 @@
+import Joi from 'joi'
+
+export default {
+  name: Joi.string()
+    .regex(/^[\sA-Z\u00C0-\u00FF().-]+$/i)
+    .required(),
+  code: Joi.string()
+    .regex(/^[A-Z]{2}$/)
+    .required(),
+  languages: Joi.array().items(
+    Joi.string()
+      .regex(/^[a-z]{3}$/)
+      .required()
+  ),
+  flag: Joi.string()
+    .regex(/^[\uD83C][\uDDE6-\uDDFF][\uD83C][\uDDE6-\uDDFF]$/)
+    .required()
+}

scripts/schemes/index.js

@@ -1,7 +0,0 @@
-exports.channels = require('./channels')
-exports.categories = require('./categories')
-exports.countries = require('./countries')
-exports.languages = require('./languages')
-exports.regions = require('./regions')
-exports.subdivisions = require('./subdivisions')
-exports.blocklist = require('./blocklist')

scripts/schemes/index.ts

@@ -0,0 +1,17 @@
+import { default as channels } from './channels'
+import { default as categories } from './categories'
+import { default as countries } from './countries'
+import { default as languages } from './languages'
+import { default as regions } from './regions'
+import { default as subdivisions } from './subdivisions'
+import { default as blocklist } from './blocklist'
+
+export default {
+  channels,
+  categories,
+  countries,
+  languages,
+  regions,
+  subdivisions,
+  blocklist
+}

scripts/schemes/languages.js

@@ -1,8 +0,0 @@
-const Joi = require('joi')
-
-module.exports = {
-	code: Joi.string()
-		.regex(/^[a-z]{3}$/)
-		.required(),
-	name: Joi.string().required()
-}

scripts/schemes/languages.ts

@@ -0,0 +1,8 @@
+import Joi from 'joi'
+
+export default {
+  code: Joi.string()
+    .regex(/^[a-z]{3}$/)
+    .required(),
+  name: Joi.string().required()
+}

scripts/schemes/regions.ts

@@ -1,6 +1,6 @@
-const Joi = require('joi')
+import Joi from 'joi'
 
-module.exports = {
+export default {
   name: Joi.string()
     .regex(/^[\sA-Z\u00C0-\u00FF().,-]+$/i)
     .required(),

scripts/schemes/subdivisions.js

@@ -1,11 +0,0 @@
-const Joi = require('joi')
-
-module.exports = {
-	country: Joi.string()
-		.regex(/^[A-Z]{2}$/)
-		.required(),
-	name: Joi.string().required(),
-	code: Joi.string()
-		.regex(/^[A-Z]{2}-[A-Z0-9]{1,3}$/)
-		.required()
-}

scripts/schemes/subdivisions.ts

@@ -0,0 +1,11 @@
+import Joi from 'joi'
+
+export default {
+  country: Joi.string()
+    .regex(/^[A-Z]{2}$/)
+    .required(),
+  name: Joi.string().required(),
+  code: Joi.string()
+    .regex(/^[A-Z]{2}-[A-Z0-9]{1,3}$/)
+    .required()
+}