lint and prettier

ricardo-devis-agullo · ricardo-devis-agullo · commit bde0535e3337 · 2021-10-17T13:55:59.000+02:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,18 +1,20 @@
 {
-    "env": {
-      "es6": true,
-      "node": true
-    },
-    "extends": "eslint:recommended",
-    "rules": {
-      "indent": ["error", 2],
-      "linebreak-style": ["error", "unix"],
-      "quotes": ["error", "single", {
-        "avoidEscape": true,
-        "allowTemplateLiterals": true
-      }],
-      "semi": ["error", "always"],
-      "no-var": "error",
-      "strict": ["error", "safe"]
-    }
-  }
+  "parser": "@typescript-eslint/parser",
+  "env": {
+    "es6": true,
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "sourceType": "module"
+  },
+  "rules": {
+    "@typescript-eslint/no-var-requires": "off",
+    "no-var": "error"
+  }
+}
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no-install lint-staged
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,8 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "useTabs": false,
+  "arrowParens": "avoid"
+}
diff --git a/package.json b/package.json
@@ -7,13 +7,13 @@
     "updated": "lerna updated",
     "test": "jest",
     "publish": "lerna publish --exact",
-    "precommit": "lint-staged"
+    "precommit": "lint-staged",
+    "prepare": "husky install"
   },
   "lint-staged": {
     "*.js": [
-      "prettier-eslint --write",
-      "jest --findRelatedTests",
-      "git add"
+      "prettier --single-quote --write",
+      "jest --findRelatedTests"
     ]
   },
   "jest": {
@@ -22,11 +22,17 @@
     "collectCoverage": true
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "5.0.0",
+    "@typescript-eslint/parser": "5.0.0",
     "codecov": "3.7.1",
-    "husky": "3.0.9",
+    "eslint": "8.0.1",
+    "eslint-config-prettier": "8.3.0",
+    "eslint-plugin-prettier": "4.0.0",
+    "husky": "7.0.2",
     "jest": "24.9.0",
-    "lerna": "^2.3.1",
-    "lint-staged": "9.4.2",
-    "prettier-eslint-cli": "5.0.0"
+    "lerna": "2.3.1",
+    "lint-staged": "11.2.3",
+    "prettier": "2.4.1",
+    "typescript": "4.4.4"
   }
 }
diff --git a/packages/oc-azure-storage-adapter/README.md b/packages/oc-azure-storage-adapter/README.md
@@ -1,19 +1,21 @@
 # Description
+
 `⚠️ THIS ADAPTER IS EXPERIMENTAL, USE CAREFULLY`
 
 Allows oc registry to store its components within [Azure Blob Storage](https://azure.microsoft.com/en-gb/services/storage/blobs/).
 
 # Configuration
+
 ```javascript
 var azureStorageAdapter = require('oc-azure-storage-adapter');
 ...
 storage: {
   adapter: azureStorageAdapter,
   options: {
-    // Container that will store publicly available files. 
+    // Container that will store publicly available files.
     // It's ACL should be set to 'blob' ({ "publicAccess": "blob" })
     publicContainerName: 'oc-public',
-    // Container that will store private files. 
+    // Container that will store private files.
     // It's ACL should be set to 'Private' ({ "publicAccess": "off" })
     privateContainerName: 'oc-private',
     accountName: '<your_azure_account_name>',
diff --git a/packages/oc-azure-storage-adapter/index.js b/packages/oc-azure-storage-adapter/index.js
@@ -11,7 +11,7 @@ const stream = require('stream');
 
 const { getFileInfo, strings } = require('oc-storage-adapters-utils');
 
-module.exports = function(conf) {
+module.exports = function (conf) {
   const isValid = () => {
     if (
       !conf.publicContainerName ||
diff --git a/packages/oc-gs-storage-adapter/README.md b/packages/oc-gs-storage-adapter/README.md
@@ -1 +1 @@
-# oc-gs-storage-adapter
+# oc-gs-storage-adapter
diff --git a/packages/oc-gs-storage-adapter/__mocks__/@google-cloud/storage.js b/packages/oc-gs-storage-adapter/__mocks__/@google-cloud/storage.js
@@ -32,21 +32,21 @@ const _Storage = class {
           bucket === 'my-empty-bucket'
             ? []
             : [
-              [
-                {
-                  name: 'components/image/1.0.0/app.js'
-                },
-                {
-                  name: 'components/image/1.0.0/server.js'
-                },
-                {
-                  name: 'components/image/1.0.1/new-server.js'
-                },
-                {
-                  name: 'components/image/1.0.1/new-app.js'
-                }
-              ]
-            ];
+                [
+                  {
+                    name: 'components/image/1.0.0/app.js'
+                  },
+                  {
+                    name: 'components/image/1.0.0/server.js'
+                  },
+                  {
+                    name: 'components/image/1.0.1/new-server.js'
+                  },
+                  {
+                    name: 'components/image/1.0.1/new-app.js'
+                  }
+                ]
+              ];
         return Promise.resolve(files);
       },
       upload: (filePath, { destination }) => {
diff --git a/packages/oc-gs-storage-adapter/__test__/gs.test.js b/packages/oc-gs-storage-adapter/__test__/gs.test.js
@@ -169,9 +169,7 @@ test('test getJson force mode', done => {
   { path: 'components/image', expected: ['1.0.0', '1.0.1'] },
   { path: 'components/image/', expected: ['1.0.0', '1.0.1'] }
 ].forEach(scenario => {
-  test(`test listSubDirectories when bucket is not empty for folder ${
-    scenario.path
-  }`, done => {
+  test(`test listSubDirectories when bucket is not empty for folder ${scenario.path}`, done => {
     const client = new gs({ bucket: 'my-bucket' });
 
     client.listSubDirectories(scenario.path, (err, data) => {
diff --git a/packages/oc-gs-storage-adapter/index.js b/packages/oc-gs-storage-adapter/index.js
@@ -14,7 +14,7 @@ const {
   strings
 } = require('oc-storage-adapters-utils');
 
-module.exports = function(conf) {
+module.exports = function (conf) {
   const isValid = () => {
     if (!conf.bucket || !conf.projectId || !conf.path) {
       return false;
@@ -57,9 +57,9 @@ module.exports = function(conf) {
           callback(
             err.code === 404
               ? {
-                code: strings.errors.STORAGE.FILE_NOT_FOUND_CODE,
-                msg: format(strings.errors.STORAGE.FILE_NOT_FOUND, filePath)
-              }
+                  code: strings.errors.STORAGE.FILE_NOT_FOUND_CODE,
+                  msg: format(strings.errors.STORAGE.FILE_NOT_FOUND, filePath)
+                }
               : err
           )
         );
diff --git a/packages/oc-riak-storage-adapter/README.md b/packages/oc-riak-storage-adapter/README.md
@@ -20,7 +20,7 @@ This will expose RiakCS on http://localhost:8080/. To be able to interact with t
 docker ps
 ```
 
-After RiakCS has started, which may take a minute or two, the keys will show up top of the log. 
+After RiakCS has started, which may take a minute or two, the keys will show up top of the log.
 
 ```
 docker logs <containerid>
@@ -59,12 +59,12 @@ let configuration = {
       componentsDir: 'components',
       signatureVersion: 'v2',       // Use v2 for RiakCS
       sslEnabled: false,
-      path: 'http://localhost:8080/foo/', 
+      path: 'http://localhost:8080/foo/',
       s3ForcePathStyle: true,       // Necessary to get the path right
-      debug: true,                  // Log what AWS is up to to stdout 
-      // Override endpoint, this is passed straight to AWS.Endpoint constructor - https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Endpoint.html 
+      debug: true,                  // Log what AWS is up to to stdout
+      // Override endpoint, this is passed straight to AWS.Endpoint constructor - https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Endpoint.html
       endpoint: 'http://localhost:8080'
-    }    
+    }
   },
   env: { name: 'production' }
 };
@@ -87,14 +87,13 @@ node index.js
 
 The registry should be now be exposed on http://localhost:3333/.
 
-
 ## Publish a component
 
-Go to the directory that contains the component you want to publish. First you have to add the registry by doing: 
+Go to the directory that contains the component you want to publish. First you have to add the registry by doing:
 
 ```
 oc registry add http://localhost:3333/
-``` 
+```
 
 Finally, to publish the component to the registry run
 
diff --git a/packages/oc-riak-storage-adapter/__test__/s3.test.js b/packages/oc-riak-storage-adapter/__test__/s3.test.js
@@ -201,9 +201,7 @@ test('test getJson force mode', done => {
   { path: 'components/image', expected: ['1.0.0', '1.0.1'] },
   { path: 'components/image/', expected: ['1.0.0', '1.0.1'] }
 ].forEach(scenario => {
-  test(`test listObjects when bucket is not empty for folder ${
-    scenario.path
-  }`, done => {
+  test(`test listObjects when bucket is not empty for folder ${scenario.path}`, done => {
     const client = new s3({ bucket: 'my-bucket' });
 
     client.listSubDirectories(scenario.path, (err, data) => {
diff --git a/packages/oc-s3-storage-adapter/__mocks__/aws-sdk.js b/packages/oc-s3-storage-adapter/__mocks__/aws-sdk.js
@@ -53,13 +53,13 @@ const _S3 = class {
         val.Bucket === 'my-empty-bucket'
           ? []
           : [
-            {
-              Prefix: 'components/image/1.0.0/'
-            },
-            {
-              Prefix: 'components/image/1.0.1/'
-            }
-          ];
+              {
+                Prefix: 'components/image/1.0.0/'
+              },
+              {
+                Prefix: 'components/image/1.0.1/'
+              }
+            ];
 
       cb(null, { CommonPrefixes });
     });
diff --git a/packages/oc-s3-storage-adapter/__test__/s3.test.js b/packages/oc-s3-storage-adapter/__test__/s3.test.js
@@ -201,9 +201,7 @@ test('test getJson force mode', done => {
   { path: 'components/image', expected: ['1.0.0', '1.0.1'] },
   { path: 'components/image/', expected: ['1.0.0', '1.0.1'] }
 ].forEach(scenario => {
-  test(`test listObjects when bucket is not empty for folder ${
-    scenario.path
-  }`, done => {
+  test(`test listObjects when bucket is not empty for folder ${scenario.path}`, done => {
     const client = new s3({ bucket: 'my-bucket' });
 
     client.listSubDirectories(scenario.path, (err, data) => {
diff --git a/packages/oc-s3-storage-adapter/index.js b/packages/oc-s3-storage-adapter/index.js
@@ -14,7 +14,7 @@ const {
   strings
 } = require('oc-storage-adapters-utils');
 
-module.exports = function(conf) {
+module.exports = function (conf) {
   const isValid = () => {
     if (
       !conf.bucket ||
@@ -94,9 +94,9 @@ module.exports = function(conf) {
             return callback(
               err.code === 'NoSuchKey'
                 ? {
-                  code: strings.errors.STORAGE.FILE_NOT_FOUND_CODE,
-                  msg: format(strings.errors.STORAGE.FILE_NOT_FOUND, filePath)
-                }
+                    code: strings.errors.STORAGE.FILE_NOT_FOUND_CODE,
+                    msg: format(strings.errors.STORAGE.FILE_NOT_FOUND, filePath)
+                  }
                 : err
             );
           }
diff --git a/packages/oc-storage-adapters-utils/lib/get-file-info.js b/packages/oc-storage-adapters-utils/lib/get-file-info.js
@@ -4,7 +4,7 @@ const path = require('path');
 
 const getMimeType = require('./get-mime-type');
 
-module.exports = function(filePath) {
+module.exports = function (filePath) {
   let ext = path.extname(filePath).toLowerCase(),
     isGzipped = false;
 
diff --git a/packages/oc-storage-adapters-utils/lib/get-mime-type.js b/packages/oc-storage-adapters-utils/lib/get-mime-type.js
@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = function(extension) {
+module.exports = function (extension) {
   return {
     '.js': 'application/javascript',
     '.css': 'text/css',
diff --git a/packages/oc-storage-adapters-utils/lib/get-next-year.js b/packages/oc-storage-adapters-utils/lib/get-next-year.js
@@ -1,5 +1,5 @@
 'use strict';
 
-module.exports = function() {
+module.exports = function () {
   return new Date(new Date().setYear(new Date().getFullYear() + 1));
 };

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# oc-gs-storage-adapter`
	`1`	`+# oc-gs-storage-adapter`