Merge branch 'master' into const-definition

package.json

@@ -82,6 +82,7 @@
         "@types/marked": "^4.0.3",
         "@types/mocha": "^5.2.5",
         "@types/node": "^11.9.0",
+        "@types/require-relative": "^0.8.0",
         "@types/sinon": "^9.0.4",
         "@types/turndown": "^5.0.1",
         "@types/yargs": "^15.0.5",
@@ -139,6 +140,7 @@
         "moment": "^2.23.0",
         "p-settle": "^2.1.0",
         "parse-ms": "^2.1.0",
+        "require-relative": "^0.8.7",
         "roku-deploy": "^3.7.1",
         "serialize-error": "^7.0.1",
         "source-map": "^0.7.3",

src/ProgramBuilder.ts

@@ -11,6 +11,7 @@ import { Logger, LogLevel } from './Logger';
 import PluginInterface from './PluginInterface';
 import * as diagnosticUtils from './diagnosticUtils';
 import * as fsExtra from 'fs-extra';
+import * as requireRelative from 'require-relative';
 
 /**
  * A runner class that handles
@@ -160,7 +161,7 @@ export class ProgramBuilder {
      */
     protected loadRequires() {
         for (const dep of this.options.require ?? []) {
-            util.resolveRequire(this.options.cwd, dep);
+            requireRelative(dep, this.options.cwd);
         }
     }
 

src/util.ts

@@ -31,6 +31,7 @@ import { WalkMode } from './astUtils/visitors';
 import { CustomType } from './types/CustomType';
 import { SourceNode } from 'source-map';
 import type { SGAttribute } from './parser/SGTypes';
+import * as requireRelative from 'require-relative';
 
 export class Util {
     public clearConsole() {
@@ -1096,7 +1097,7 @@ export class Util {
         return pathOrModules.reduce<CompilerPlugin[]>((acc, pathOrModule) => {
             if (typeof pathOrModule === 'string') {
                 try {
-                    const loaded = this.resolveRequire(cwd, pathOrModule);
+                    const loaded = requireRelative(pathOrModule, cwd);
                     const theExport: CompilerPlugin | CompilerPluginFactory = loaded.default ? loaded.default : loaded;
 
                     let plugin: CompilerPlugin;
@@ -1127,23 +1128,6 @@ export class Util {
         }, []);
     }
 
-    public resolveRequire(cwd: string, pathOrModule: string) {
-        let target = pathOrModule;
-        if (!path.isAbsolute(pathOrModule)) {
-            const localPath = path.resolve(cwd, pathOrModule);
-            if (fs.existsSync(localPath)) {
-                target = localPath;
-            } else {
-                const modulePath = path.resolve(cwd, 'node_modules', pathOrModule);
-                if (fs.existsSync(modulePath)) {
-                    target = modulePath;
-                }
-            }
-        }
-        // eslint-disable-next-line
-        return require(target);
-    }
-
     /**
      * Gathers expressions, variables, and unique names from an expression.
      * This is mostly used for the ternary expression