merge branch

Author: ricardo-devis-agullo

src/cli/domain/get-mocked-plugins.ts

@@ -45,7 +45,7 @@ const defaultRegister = (
 };
 
 const registerStaticMocks = (
-  mocks: Dictionary<string>,
+  mocks: Record<string, string>,
   logger: Logger
 ): PluginMock[] =>
   _.map(mocks, (mockedValue, pluginName) => {
@@ -62,7 +62,7 @@ const registerStaticMocks = (
 
 const registerDynamicMocks = (
   ocJsonLocation: string,
-  mocks: Dictionary<string>,
+  mocks: Record<string, string>,
   logger: Logger
 ) =>
   _.map(mocks, (source, pluginName) => {

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

@@ -9,7 +9,7 @@ export default function getCompiler(options: {
   compilerDep: string;
   componentPath: string;
   logger: Logger;
-  pkg: { devDependencies: Dictionary<string> };
+  pkg: { devDependencies: Record<string, string> };
 }): Promise<Template> {
   const { compilerDep, componentPath, logger, pkg } = options;
   const compilerPath = path.join(componentPath, 'node_modules', compilerDep);

src/cli/domain/handle-dependencies/index.ts

@@ -28,15 +28,15 @@ export default async function handleDependencies(options: {
 }> {
   const { components, logger, useComponentDependencies } = options;
 
-  const dependencies: Dictionary<string> = {};
-  const addDependencies = (componentDependencies?: Dictionary<string>) =>
+  const dependencies: Record<string, string> = {};
+  const addDependencies = (componentDependencies?: Record<string, string>) =>
     Object.entries(componentDependencies || {}).forEach(
       ([dependency, version]) => {
         dependencies[dependency] = version;
       }
     );
 
-  const templates: Dictionary<Template> = {};
+  const templates: Record<string, Template> = {};
   const addTemplate = (templateName: string, template: Template) => {
     templates[templateName] = template;
   };
@@ -63,7 +63,7 @@ export default async function handleDependencies(options: {
       compilerDep,
       componentPath,
       logger,
-      pkg: pkg as { devDependencies: Dictionary<string> }
+      pkg: pkg as { devDependencies: Record<string, string> }
     });
     Object.assign(options, { compiler });
     addTemplate(template, compiler);

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

@@ -6,7 +6,7 @@ import strings from '../../../resources/index';
 import { Logger } from '../../logger';
 
 export default async function installMissingDependencies(options: {
-  dependencies: Dictionary<string>;
+  dependencies: Record<string, string>;
   logger: Logger;
 }): Promise<void> {
   const { dependencies, logger } = options;

src/cli/domain/handle-dependencies/link-missing-dependencies.ts

@@ -7,7 +7,7 @@ import { Logger } from '../../logger';
 
 export default async function linkMissingDependencies(options: {
   componentPath: string;
-  dependencies: Dictionary<string>;
+  dependencies: Record<string, string>;
   logger: Logger;
 }): Promise<void> {
   const { componentPath, dependencies, logger } = options;

src/cli/domain/handle-dependencies/require-template.ts

@@ -17,7 +17,7 @@ interface Template {
       verbose: boolean;
       production: boolean | undefined;
     },
-    cb: Callback<Component>
+    cb: (err: Error | null, data: Component) => void
   ) => void;
 }
 

src/cli/index.ts

@@ -61,7 +61,7 @@ type Command = {
     cmd: string;
   };
   options?: any;
-  commands?: Dictionary<Command>;
+  commands?: Record<string, Command>;
 };
 
 function processCommand(

src/globals.d.ts

@@ -58,7 +58,10 @@ declare module 'require-package-name' {
   export = requirePackageName;
 }
 declare module 'getport' {
-  function getPort(start: number, cb: Callback): void;
+  function getPort(
+    start: number,
+    cb: (err: unknown, data: number) => void
+  ): void;
 
   export = getPort;
 }
@@ -80,15 +83,15 @@ declare module 'minimal-request' {
       method?: string;
       body?: unknown;
       url: string;
-      headers?: Dictionary<string | null | undefined | string[]>;
+      headers?: Record<string, string | null | undefined | string[]>;
       json?: boolean;
     },
     cb: (
       err: Error | number | null,
       body: T,
       details: {
         response: {
-          headers: Dictionary<string>;
+          headers: Record<string, string>;
         };
       }
     ) => void
@@ -98,10 +101,3 @@ declare module 'minimal-request' {
 
   export = request;
 }
-
-declare type Callback<T = undefined, E = Error> = (
-  err: E | null,
-  data: T
-) => void;
-
-declare type Dictionary<T> = Record<string, T>;

src/registry/domain/authentication.ts

@@ -35,7 +35,7 @@ const basicAuthentication: Authentication<{
   }
 };
 
-const builtin: Dictionary<Authentication> = {
+const builtin: Record<string, Authentication> = {
   basic: basicAuthentication
 };
 

src/registry/domain/components-cache/components-list.ts

@@ -12,7 +12,7 @@ export default function componentsList(conf: Config, cdn: StorageAdapter) {
     getFromJson: (): Promise<ComponentsList> => cdn.getJson(filePath(), true),
 
     getFromDirectories: async (): Promise<ComponentsList> => {
-      const componentsInfo: Dictionary<string[]> = {};
+      const componentsInfo: Record<string, string[]> = {};
 
       const getVersionsForComponent = async (
         componentName: string