Merge branch 'master' into remove-lodash-typeof-checks

Author: ricardo-devis-agullo

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

@@ -1,4 +1,5 @@
 import path from 'path';
+import { Template } from '../../../types';
 
 import cleanRequire from '../../../utils/clean-require';
 import { Logger } from '../../logger';
@@ -11,11 +12,11 @@ export default function getCompiler(
     logger: Logger;
     pkg: { devDependencies: Dictionary<string> };
   },
-  cb: Callback<string, string | number>
+  cb: Callback<Template, string | number>
 ): void {
   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 cb(null, compiler);

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

@@ -3,6 +3,7 @@ import isTemplateValid from '../../../utils/is-template-valid';
 import * as npm from '../../../utils/npm-utils';
 import strings from '../../../resources/index';
 import { Logger } from '../../logger';
+import { Template } from '../../../types';
 
 export default function installCompiler(
   options: {
@@ -11,7 +12,7 @@ export default function installCompiler(
     dependency: string;
     logger: Logger;
   },
-  cb: Callback<string, string | number>
+  cb: Callback<Template, string | number>
 ): void {
   const { compilerPath, componentPath, dependency, logger } = options;
 
@@ -27,9 +28,9 @@ export default function installCompiler(
 
   npm.installDependency(npmOptions, err => {
     err ? logger.err('FAIL') : logger.ok('OK');
-    const compiler = cleanRequire(compilerPath, { justTry: true });
+    const compiler = cleanRequire<Template>(compilerPath, { justTry: true });
     const isOk = isTemplateValid(compiler);
     const errorMsg = 'There was a problem while installing the compiler';
-    cb(!err && isOk ? null : errorMsg, compiler);
+    cb(!err && isOk ? null : errorMsg, compiler as Template);
   });
 }

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]) {