Merge branch 'master' into simplify-log-parameter-names

Author: ricardo-devis-agullo

.eslintrc.json

@@ -3,7 +3,8 @@
   "env": {
     "browser": true,
     "es6": true,
-    "node": true
+    "node": true,
+    "mocha": true
   },
   "extends": [
     "eslint:recommended",
@@ -59,6 +60,7 @@
     "no-useless-constructor": "error",
     "no-useless-return": "error",
     "no-warning-comments": "error",
+    "one-var": ["error", "never"],
     "prefer-promise-reject-errors": "error",
     "require-await": "error",
     "symbol-description": "error"

package.json

@@ -9,6 +9,7 @@
   },
   "scripts": {
     "lint": "eslint src",
+    "prebuild": "rimraf dist",
     "build": "npm run lint && tsc && node tasks/build.js",
     "git-stage-and-push": "node tasks/git-stage-and-push.js",
     "npm-publish": "node tasks/npm-publish.js",
@@ -79,6 +80,7 @@
     "mocha": "9.1.2",
     "node-emoji": "1.11.0",
     "prettier": "2.4.1",
+    "rimraf": "^3.0.2",
     "semver-sort": "0.0.4",
     "simple-git": "2.46.0",
     "sinon": "11.1.2",
@@ -90,7 +92,6 @@
     "accept-language-parser": "1.5.0",
     "async": "3.2.1",
     "basic-auth-connect": "1.0.0",
-    "body-parser": "1.19.0",
     "builtin-modules": "3.2.0",
     "chokidar": "3.5.2",
     "colors": "1.4.0",

src/cli/domain/get-components-by-dir.ts

@@ -5,8 +5,8 @@ import { Component } from '../../types';
 export default function getComponentsByDir() {
   return (componentsDir: string, callback: Callback<string[]>): void => {
     const isOcComponent = function (file: string) {
-      const filePath = path.resolve(componentsDir, file),
-        packagePath = path.join(filePath, 'package.json');
+      const filePath = path.resolve(componentsDir, file);
+      const packagePath = path.join(filePath, 'package.json');
       let content: Component;
 
       try {

src/cli/domain/package-components.ts

@@ -60,7 +60,7 @@ const packageComponents =
         compiler: true,
         componentPath
       });
-      ocTemplate.compile!(compileOptions, callback);
+      ocTemplate.compile(compileOptions, callback);
     } catch (err) {
       return callback(err as any, undefined as any);
     }

src/cli/domain/registry.ts

@@ -10,8 +10,8 @@ import * as urlParser from '../domain/url-parser';
 import { RegistryCli } from '../../types';
 
 const getOcVersion = (): string => {
-  const ocPackagePath = path.join(__dirname, '../../../package.json'),
-    ocInfo = fs.readJsonSync(ocPackagePath);
+  const ocPackagePath = path.join(__dirname, '../../../package.json');
+  const ocInfo = fs.readJsonSync(ocPackagePath);
 
   return ocInfo.version;
 };

src/cli/domain/url-parser.ts

@@ -20,17 +20,19 @@ export function parse(parsed: {
   requestVersion: string;
   href: string;
 }): UrlParsed {
-  const requestedVersion = parsed.requestVersion,
-    href = url.parse(parsed.href),
-    relativePath = removeFinalSlashes(href.pathname || ''),
-    withoutVersion = removeFinalSlashes(
-      relativePath.replace(requestedVersion, '')
-    ),
-    componentName = withoutVersion.substr(withoutVersion.lastIndexOf('/') + 1),
-    withoutComponent = removeFinalSlashes(
-      withoutVersion.replace(componentName, '')
-    ),
-    registryUrl = href.protocol + '//' + href.host + withoutComponent + '/';
+  const requestedVersion = parsed.requestVersion;
+  const href = url.parse(parsed.href);
+  const relativePath = removeFinalSlashes(href.pathname || '');
+  const withoutVersion = removeFinalSlashes(
+    relativePath.replace(requestedVersion, '')
+  );
+  const componentName = withoutVersion.substr(
+    withoutVersion.lastIndexOf('/') + 1
+  );
+  const withoutComponent = removeFinalSlashes(
+    withoutVersion.replace(componentName, '')
+  );
+  const registryUrl = href.protocol + '//' + href.host + withoutComponent + '/';
 
   return {
     clientHref: registryUrl + 'oc-client/client.js',

src/cli/facade/clean.ts

@@ -73,5 +73,3 @@ const clean = ({
 };
 
 export default clean;
-
-module.exports = clean;

src/cli/facade/dev.ts

@@ -7,7 +7,7 @@ import _ from 'lodash';
 
 import getMockedPlugins from '../domain/get-mocked-plugins';
 import handleDependencies from '../domain/handle-dependencies';
-import oc from '../../index';
+import * as oc from '../../index';
 import strings from '../../resources/index';
 import watch from '../domain/watch';
 import { Logger } from '../logger';
@@ -234,5 +234,3 @@ const dev =
   };
 
 export default dev;
-
-module.exports = dev;

src/cli/facade/init.ts

@@ -50,5 +50,3 @@ const init =
   };
 
 export default init;
-
-module.exports = init;

src/cli/facade/mock.ts

@@ -17,5 +17,3 @@ const mock =
   };
 
 export default mock;
-
-module.exports = mock;