From d6332d2bc723f9aa60f2c886564bef49a6b91b84 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 14 Feb 2021 20:25:41 -0500
Subject: Test html script ordering (#1396)

* Simplify getAllFiles

* Add test to validate script order

* Update script include order

* Update content script order

* Update sw.js and corresponding lint

* Update manifest
---
 dev/util.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dev/util.js')

diff --git a/dev/util.js b/dev/util.js
index 85a478ac..a31cd9ac 100644
--- a/dev/util.js
+++ b/dev/util.js
@@ -76,7 +76,7 @@ function getArgs(args, argMap) {
     return argMap;
 }
 
-function getAllFiles(baseDirectory, relativeTo=null, predicate=null) {
+function getAllFiles(baseDirectory, predicate=null) {
     const results = [];
     const directories = [baseDirectory];
     while (directories.length > 0) {
@@ -84,10 +84,10 @@ function getAllFiles(baseDirectory, relativeTo=null, predicate=null) {
         const fileNames = fs.readdirSync(directory);
         for (const fileName of fileNames) {
             const fullFileName = path.join(directory, fileName);
-            const relativeFileName = (relativeTo !== null ? path.relative(relativeTo, fullFileName) : fullFileName);
+            const relativeFileName = path.relative(baseDirectory, fullFileName);
             const stats = fs.lstatSync(fullFileName);
             if (stats.isFile()) {
-                if (typeof predicate !== 'function' || predicate(fullFileName, directory, baseDirectory)) {
+                if (typeof predicate !== 'function' || predicate(relativeFileName)) {
                     results.push(relativeFileName);
                 }
             } else if (stats.isDirectory()) {
-- 
cgit v1.2.3