merge master

Author: ricardo-devis-agullo

src/cli/domain/handle-dependencies/get-compiler.ts

@@ -13,7 +13,7 @@ export default function getCompiler(options: {
 }): Promise<Template> {
   const { compilerDep, componentPath, logger, pkg } = options;
   const compilerPath = path.join(componentPath, 'node_modules', compilerDep);
-  const compiler = cleanRequire(compilerPath, { justTry: true });
+  const compiler = cleanRequire<Template>(compilerPath, { justTry: true });
 
   if (compiler) {
     return Promise.resolve(compiler);

src/cli/domain/handle-dependencies/install-compiler.ts

@@ -28,7 +28,7 @@ export default async function installCompiler(options: {
     await npm.installDependency(npmOptions);
     logger.ok('OK');
 
-    const compiler = cleanRequire(compilerPath, { justTry: true });
+    const compiler = cleanRequire<Template>(compilerPath, { justTry: true });
 
     if (!isTemplateValid(compiler)) {
       throw errorMsg;

src/utils/clean-require.ts

@@ -1,9 +1,25 @@
 import tryRequire from 'try-require';
 
+export default function cleanRequire(
+  path: string,
+  opts: { justTry: true; resolve: true }
+): string | undefined;
+export default function cleanRequire(
+  path: string,
+  opts: { justTry?: false; resolve: true }
+): string;
+export default function cleanRequire<T = unknown>(
+  path: string,
+  opts: { justTry: true; resolve?: false }
+): T | undefined;
+export default function cleanRequire<T = unknown>(
+  path: string,
+  opts: { justTry?: false; resolve?: false }
+): T;
 export default function cleanRequire(
   path: string,
   { justTry = false, resolve = false }: { justTry?: boolean; resolve?: boolean }
-): any {
+) {
   const shouldThrow = !justTry;
 
   if (require.cache && !!require.cache[path]) {