Addressing PR comments

duckduckgo · Sep 23, 2021 · effee12 · effee12
1 parent d32a339
commit effee12
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 34 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,11 @@
+{
+    "extends": "standard",
+    "rules": {
+        "indent": ["error", 4]
+    },
+    "env": {
+        "commonjs": true,
+        "browser": true,
+        "jasmine": true
+    }
+}
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/index.js b/index.js
@@ -7,13 +7,7 @@ const LISTS_DIR = 'exception-lists'
 const defaultConfig = JSON.parse(fs.readFileSync('default-config.json'))
 defaultConfig.version = Date.now()
 
-const platforms = [
-    'extension',
-    'ios',
-    'android',
-    'macos',
-    'windows'
-]
+const platforms = require('./platforms')
 
 const nonDefaultLists = []
 

diff --git a/platforms.js b/platforms.js
@@ -0,0 +1,7 @@
+module.exports = [
+    'extension',
+    'ios',
+    'android',
+    'macos',
+    'windows'
+]
diff --git a/tests/config-tests.js b/tests/config-tests.js
@@ -1,16 +1,9 @@
 const expect = require('chai').expect
-const schema = require('./schema.js')
 const Ajv = require('ajv').default
 const ajv = new Ajv()
 const fs = require('fs')
-
-const platforms = [
-    'extension',
-    'ios',
-    'android',
-    'macos',
-    'windows'
-]
+const platforms = require('./../platforms')
+const schema = JSON.parse(fs.readFileSync('./tests/schema.json'))
 
 const configs = platforms.map((plat) => {
     return JSON.parse(fs.readFileSync(`./generated/${plat}-config.json`))

diff --git a/tests/schema.js → tests/schema.json b/tests/schema.js → tests/schema.json
@@ -1,4 +1,4 @@
-module.exports = {
+{
     "root": {
         "type": "object",
         "properties": {