Merge branch 'master' into remove-module-paths

Author: ricardo-devis-agullo

package-lock.json

@@ -48,7 +48,7 @@
   ],
   "devDependencies": {
     "@types/accept-language-parser": "1.5.2",
-    "@types/async": "3.2.8",
+    "@types/async": "3.2.9",
     "@types/colors": "1.2.1",
     "@types/cross-spawn": "6.0.2",
     "@types/errorhandler": "1.5.0",
@@ -58,24 +58,24 @@
     "@types/lodash": "4.14.176",
     "@types/morgan": "1.9.3",
     "@types/multer": "1.4.7",
-    "@types/node": "16.11.3",
+    "@types/node": "16.11.6",
     "@types/parse-author": "2.0.1",
     "@types/read": "0.0.29",
     "@types/response-time": "2.3.5",
     "@types/semver": "7.3.9",
     "@types/targz": "1.0.1",
     "@types/yargs": "17.0.4",
-    "@typescript-eslint/eslint-plugin": "5.1.0",
-    "@typescript-eslint/parser": "5.1.0",
+    "@typescript-eslint/eslint-plugin": "5.2.0",
+    "@typescript-eslint/parser": "5.2.0",
     "chai": "4.3.4",
     "chalk": "4.1.2",
-    "eslint": "8.0.1",
+    "eslint": "8.1.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-prettier": "4.0.0",
     "glob": "7.2.0",
     "husky": "7.0.4",
     "injectr": "0.5.1",
-    "lint-staged": "11.2.3",
+    "lint-staged": "11.2.6",
     "minimist": "1.2.5",
     "mocha": "9.1.3",
     "node-emoji": "1.11.0",
@@ -84,7 +84,7 @@
     "semver-sort": "0.0.4",
     "simple-git": "2.47.0",
     "sinon": "11.1.2",
-    "ts-node": "10.3.1",
+    "ts-node": "10.4.0",
     "type-fest": "2.5.1",
     "typescript": "4.4.4"
   },
@@ -109,18 +109,18 @@
     "multer": "1.4.3",
     "nice-cache": "0.0.5",
     "oc-client": "4.0.1",
-    "oc-client-browser": "1.5.4",
+    "oc-client-browser": "1.5.5",
     "oc-empty-response-handler": "1.0.2",
-    "oc-get-unix-utc-timestamp": "1.0.5",
-    "oc-s3-storage-adapter": "1.1.6",
-    "oc-storage-adapters-utils": "1.0.4",
-    "oc-template-es6": "1.0.6",
-    "oc-template-es6-compiler": "1.1.13",
-    "oc-template-handlebars": "6.0.24",
-    "oc-template-handlebars-compiler": "6.2.18",
-    "oc-template-jade": "7.0.5",
-    "oc-template-jade-compiler": "7.0.6",
-    "open": "8.3.0",
+    "oc-get-unix-utc-timestamp": "1.0.6",
+    "oc-s3-storage-adapter": "1.2.0",
+    "oc-storage-adapters-utils": "1.1.0",
+    "oc-template-es6": "1.0.7",
+    "oc-template-es6-compiler": "1.2.1",
+    "oc-template-handlebars": "6.0.25",
+    "oc-template-handlebars-compiler": "6.3.1",
+    "oc-template-jade": "7.0.6",
+    "oc-template-jade-compiler": "7.1.1",
+    "open": "8.4.0",
     "parse-author": "2.0.0",
     "read": "1.0.7",
     "require-package-name": "2.0.1",

package.json

@@ -5,19 +5,27 @@ import path from 'path';
 
 const getComponentsByDir = makeGetComponentsByDir();
 
-export function fetchList(dirPath: string, callback: Callback<string[]>): void {
+export function fetchList(
+  dirPath: string,
+  callback: (err: Error | null, data: string[]) => void
+): void {
   return getComponentsByDir(dirPath, (err, list) => {
     if (err) return (callback as any)(err);
     if (list.length === 0) return callback(null, []);
 
     const toRemove = list.map(folder => path.join(folder, 'node_modules'));
-    const folderExists = (folder: string, cb: Callback<boolean>) =>
-      fs.exists(folder, exists => cb(null, exists));
+    const folderExists = (
+      folder: string,
+      cb: (err: Error | null, data: boolean) => void
+    ) => fs.exists(folder, exists => cb(null, exists));
 
     async.filterSeries(toRemove, folderExists, callback as any);
   });
 }
 
-export function remove(list: string[], callback: Callback<string>): void {
+export function remove(
+  list: string[],
+  callback: (err: Error | null, data: string) => void
+): void {
   return async.eachSeries(list, fs.remove, callback as any);
 }

src/cli/domain/clean.ts

@@ -3,7 +3,10 @@ import path from 'path';
 import { Component } from '../../types';
 
 export default function getComponentsByDir() {
-  return (componentsDir: string, callback: Callback<string[]>): void => {
+  return (
+    componentsDir: string,
+    callback: (err: Error | null, data: string[]) => void
+  ): void => {
     const isOcComponent = function (file: string) {
       const filePath = path.resolve(componentsDir, file);
       const packagePath = path.join(filePath, 'package.json');

src/cli/domain/get-components-by-dir.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/get-mocked-plugins.ts

@@ -7,7 +7,7 @@ export default function ensureCompilerIsDeclaredAsDevDependency(
     pkg: Component;
     template: string;
   },
-  cb: Callback<string, string>
+  cb: (err: string | null, data: string) => void
 ): void {
   const { componentPath, pkg, template } = options;
   const compilerDep = `${template}-compiler`;

src/cli/domain/handle-dependencies/ensure-compiler-is-declared-as-devDependency.ts

@@ -10,9 +10,9 @@ export default function getCompiler(
     compilerDep: string;
     componentPath: string;
     logger: Logger;
-    pkg: { devDependencies: Dictionary<string> };
+    pkg: { devDependencies: Record<string, string> };
   },
-  cb: Callback<Template, string | number>
+  cb: (err: string | number | null, data: Template) => void
 ): void {
   const { compilerDep, componentPath, logger, pkg } = options;
   const compilerPath = path.join(componentPath, 'node_modules', compilerDep);

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

@@ -14,7 +14,7 @@ import { Component } from '../../../types';
 
 const getComponentPackageJson = (
   componentPath: string,
-  cb: Callback<Component>
+  cb: (err: Error | null, data: Component) => void
 ) => fs.readJson(path.join(componentPath, 'package.json'), cb);
 
 const union = (a: ReadonlyArray<string>, b: ReadonlyArray<string>) => [
@@ -27,25 +27,25 @@ export default function handleDependencies(
     logger: Logger;
     useComponentDependencies?: boolean;
   },
-  callback: Callback<
-    {
+  callback: (
+    err: string | null,
+    data: {
       modules: string[];
       templates: Array<(...args: unknown[]) => unknown>;
-    },
-    string
-  >
+    }
+  ) => void
 ): void {
   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<(...args: unknown[]) => unknown> = {};
+  const templates: Record<string, (...args: unknown[]) => unknown> = {};
   const addTemplate = (
     templateName: string,
     template: (...args: unknown[]) => unknown
@@ -59,15 +59,19 @@ export default function handleDependencies(
   ) =>
     async.waterfall(
       [
-        (cb: Callback<Component>) => getComponentPackageJson(componentPath, cb),
+        (cb: (err: Error | null, data: Component) => void) =>
+          getComponentPackageJson(componentPath, cb),
         (
           pkg: Component,
-          cb: Callback<{
-            componentPath: string;
-            logger: Logger;
-            pkg: Component;
-            template: string;
-          }>
+          cb: (
+            err: Error | null,
+            data: {
+              componentPath: string;
+              logger: Logger;
+              pkg: Component;
+              template: string;
+            }
+          ) => void
         ) => {
           addDependencies(pkg.dependencies);
 
@@ -96,7 +100,7 @@ export default function handleDependencies(
           options: {
             componentPath: string;
             logger: Logger;
-            pkg: Component & { devDependencies: Dictionary<string> };
+            pkg: Component & { devDependencies: Record<string, string> };
             template: string;
             compilerDep: string;
           },

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

@@ -12,7 +12,7 @@ export default function installCompiler(
     dependency: string;
     logger: Logger;
   },
-  cb: Callback<Template, string | number>
+  cb: (err: string | number | null, data: Template) => void
 ): void {
   const { compilerPath, componentPath, dependency, logger } = options;
 

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

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