From 4a82b57cc9b2109d9664506ebda5e7160c5b7494 Mon Sep 17 00:00:00 2001
From: RunDevelopment <mitchi5000.ms@googlemail.com>
Date: Thu, 7 May 2020 00:06:59 +0200
Subject: [PATCH 1/2] Test: Always use components.json

---
 tests/aliases-test.js        | 2 +-
 tests/dependencies-test.js   | 2 +-
 tests/helper/prism-loader.js | 3 ++-
 tests/pattern-tests.js       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/aliases-test.js b/tests/aliases-test.js
index 0e35ce9fa4..2b562f7f75 100644
--- a/tests/aliases-test.js
+++ b/tests/aliases-test.js
@@ -2,7 +2,7 @@
 
 const { assert } = require("chai");
 const PrismLoader = require('./helper/prism-loader');
-const { languages } = require('./../components');
+const { languages } = require('./../components.json');
 
 
 function toArray(value) {
diff --git a/tests/dependencies-test.js b/tests/dependencies-test.js
index 375147a12a..aa0c405e10 100644
--- a/tests/dependencies-test.js
+++ b/tests/dependencies-test.js
@@ -1,6 +1,6 @@
 const { assert } = require('chai');
 const getLoader = require('../dependencies');
-const components = require('../components');
+const components = require('../components.json');
 
 
 describe('Dependency logic', function () {
diff --git a/tests/helper/prism-loader.js b/tests/helper/prism-loader.js
index 7bc07487c9..73700cbcd9 100644
--- a/tests/helper/prism-loader.js
+++ b/tests/helper/prism-loader.js
@@ -3,7 +3,7 @@
 const fs = require("fs");
 const vm = require("vm");
 const { getAllFiles } = require("./test-discovery");
-const components = require("../../components");
+const components = require("../../components.json");
 const getLoader = require("../../dependencies");
 const languagesCatalog = components.languages;
 
@@ -48,6 +48,7 @@ module.exports = {
 
 		getLoader(components, languages, [...context.loaded]).load(id => {
 			if (!languagesCatalog[id]) {
+				// Maybe `components.js` is outdated?
 				throw new Error(`Language '${id}' not found.`);
 			}
 
diff --git a/tests/pattern-tests.js b/tests/pattern-tests.js
index b35fdb9b6a..cbf1d54eca 100644
--- a/tests/pattern-tests.js
+++ b/tests/pattern-tests.js
@@ -3,7 +3,7 @@
 const { assert } = require('chai');
 const PrismLoader = require('./helper/prism-loader');
 const { BFS, parseRegex } = require('./helper/util');
-const { languages } = require('../components');
+const { languages } = require('../components.json');
 const { visitRegExpAST } = require('regexpp');
 
 

From ef0f49015d0c240435aaf11654169f87d1071c4a Mon Sep 17 00:00:00 2001
From: RunDevelopment <mitchi5000.ms@googlemail.com>
Date: Thu, 7 May 2020 00:08:44 +0200
Subject: [PATCH 2/2] Cleanup

---
 tests/helper/prism-loader.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/helper/prism-loader.js b/tests/helper/prism-loader.js
index 73700cbcd9..afde8dd33b 100644
--- a/tests/helper/prism-loader.js
+++ b/tests/helper/prism-loader.js
@@ -48,7 +48,6 @@ module.exports = {
 
 		getLoader(components, languages, [...context.loaded]).load(id => {
 			if (!languagesCatalog[id]) {
-				// Maybe `components.js` is outdated?
 				throw new Error(`Language '${id}' not found.`);
 			}