merge

ricardo-devis-agullo · ricardo-devis-agullo · commit 73f1abcdad43 · 2022-12-09T08:36:28.000+01:00
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -5,26 +5,25 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-    - run: npm install
-    - run: npm test
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+      - run: npm install
+      - run: npm test
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx --no-install lint-staged
+npx pretty-quick --staged
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8
+14
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oc",
-  "version": "0.49.13",
+  "version": "0.49.20",
   "description": "A framework for developing and distributing html components",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,13 +23,8 @@
     "version-patch": "node tasks/version.js --type=\"patch\"",
     "prepare": "husky install"
   },
-  "lint-staged": {
-    "*.js": [
-      "prettier --single-quote --write"
-    ]
-  },
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "repository": {
     "type": "git",
@@ -48,92 +43,91 @@
   ],
   "devDependencies": {
     "@types/accept-language-parser": "1.5.3",
-    "@types/async": "3.2.10",
+    "@types/async": "3.2.15",
     "@types/cross-spawn": "6.0.2",
     "@types/errorhandler": "1.5.0",
-    "@types/express": "4.17.13",
+    "@types/express": "4.17.14",
     "@types/fs-extra": "9.0.13",
     "@types/got": "^9.6.12",
-    "@types/livereload": "0.9.1",
-    "@types/lodash": "4.14.177",
+    "@types/livereload": "0.9.2",
+    "@types/lodash": "4.14.186",
     "@types/morgan": "1.9.3",
     "@types/multer": "1.4.7",
-    "@types/node": "16.11.11",
+    "@types/node": "18.8.4",
     "@types/parse-author": "2.0.1",
     "@types/read": "0.0.29",
     "@types/response-time": "2.3.5",
-    "@types/semver": "7.3.9",
+    "@types/semver": "7.3.12",
     "@types/targz": "1.0.1",
-    "@types/yargs": "17.0.7",
-    "@typescript-eslint/eslint-plugin": "5.5.0",
-    "@typescript-eslint/parser": "5.5.0",
-    "chai": "4.3.4",
+    "@types/yargs": "17.0.13",
+    "@typescript-eslint/eslint-plugin": "5.40.0",
+    "@typescript-eslint/parser": "5.40.0",
+    "chai": "4.3.6",
     "chalk": "4.1.2",
-    "eslint": "8.3.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-prettier": "4.0.0",
+    "eslint": "8.25.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-prettier": "4.2.1",
     "glob": "7.2.0",
     "husky": "7.0.4",
     "injectr": "0.5.1",
-    "lint-staged": "11.2.6",
-    "minimist": "1.2.6",
+    "minimist": "1.2.7",
     "mocha": "9.1.3",
     "node-emoji": "1.11.0",
     "p-limit": "^3.1.0",
-    "prettier": "2.5.0",
+    "prettier": "2.7.1",
     "rimraf": "3.0.2",
-    "semver-sort": "0.0.4",
+    "semver-sort": "1.0.0",
     "simple-git": "2.48.0",
     "sinon": "12.0.1",
-    "ts-node": "10.4.0",
+    "ts-node": "10.9.1",
     "type-fest": "2.8.0",
-    "typescript": "4.5.2"
+    "typescript": "4.8.4"
   },
   "dependencies": {
     "accept-language-parser": "1.5.0",
-    "async": "3.2.2",
+    "async": "3.2.4",
     "basic-auth-connect": "1.0.0",
-    "builtin-modules": "3.2.0",
-    "chokidar": "3.5.2",
+    "builtin-modules": "3.3.0",
+    "chokidar": "3.5.3",
     "colors": "1.4.0",
     "cross-spawn": "7.0.3",
     "dependency-graph": "0.11.0",
     "dotenv": "16.0.1",
     "errorhandler": "1.5.1",
-    "express": "4.17.1",
+    "express": "4.18.2",
     "form-data": "4.0.0",
-    "fs-extra": "10.0.0",
+    "fs-extra": "10.1.0",
     "getport": "0.1.0",
-    "got": "^11.8.5",
+    "got": "11.8.5",
     "livereload": "0.9.3",
     "lodash": "4.17.21",
     "minimal-request": "3.0.0",
     "morgan": "1.10.0",
     "multer": "1.4.3",
     "nice-cache": "0.0.5",
     "oc-client": "4.0.1",
-    "oc-client-browser": "1.5.8",
+    "oc-client-browser": "1.5.9",
     "oc-empty-response-handler": "1.0.2",
     "oc-get-unix-utc-timestamp": "1.0.6",
-    "oc-s3-storage-adapter": "1.2.0",
-    "oc-storage-adapters-utils": "1.1.0",
+    "oc-s3-storage-adapter": "2.1.1",
+    "oc-storage-adapters-utils": "2.0.2",
     "oc-template-es6": "1.0.7",
-    "oc-template-es6-compiler": "2.0.0",
+    "oc-template-es6-compiler": "2.1.0",
     "oc-template-handlebars": "6.0.25",
-    "oc-template-handlebars-compiler": "6.4.0",
+    "oc-template-handlebars-compiler": "6.5.0",
     "oc-template-jade": "7.0.6",
-    "oc-template-jade-compiler": "7.2.0",
+    "oc-template-jade-compiler": "7.3.0",
     "open": "8.4.0",
     "parse-author": "2.0.0",
     "read": "1.0.7",
     "require-package-name": "2.0.1",
     "response-time": "2.3.2",
-    "semver": "7.3.5",
+    "semver": "7.3.8",
     "semver-extra": "3.0.0",
     "serialize-error": "8.1.0",
     "targz": "1.0.1",
     "try-require": "1.2.1",
     "universalify": "^2.0.0",
-    "yargs": "17.3.0"
+    "yargs": "17.6.0"
   }
-}
+}
diff --git a/src/cli/domain/registry.ts b/src/cli/domain/registry.ts
@@ -123,7 +123,7 @@ export default function registry(opts: RegistryOptions = {}) {
         ) {
           errMsg = parsedError.error;
         } else {
-          errMsg = parsedError as any;
+          errMsg = parsedError;
         }
 
         throw errMsg;
diff --git a/src/cli/facade/dev.ts b/src/cli/facade/dev.ts
@@ -202,13 +202,11 @@ const dev = ({ local, logger }: { logger: Logger; local: Local }) =>
 
         return registry;
       } catch (err: any) {
-        if (err.code === 'EADDRINUSE') {
-          // eslint-disable-next-line no-ex-assign
-          err = cliErrors.PORT_IS_BUSY(port) as any;
-        }
+        const error =
+          err.code === 'EADDRINUSE' ? cliErrors.PORT_IS_BUSY(port) : err;
 
-        logger.err(String(err));
-        throw err;
+        logger.err(String(error));
+        throw error;
       }
     }
   );
diff --git a/src/cli/index.ts b/src/cli/index.ts
@@ -137,6 +137,6 @@ const argv = cli
   .version()
   .wrap(cli.terminalWidth()).argv;
 
-if ((argv as any)._.length === 0) {
+if ((argv as Awaited<typeof argv>)._.length === 0) {
   cli.showHelp();
 }
diff --git a/src/components/oc-client/package.json b/src/components/oc-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "oc-client",
   "description": "The OpenComponents client-side javascript client",
-  "version": "0.49.13",
+  "version": "0.49.20",
   "repository": "https://github.com/opencomponents/oc/tree/master/components/oc-client",
   "author": "Matteo Figus <matteofigus@gmail.com>",
   "oc": {
diff --git a/src/registry/app-start.ts b/src/registry/app-start.ts
@@ -61,7 +61,7 @@ export default async function appStart(
         logger.log(colors.green('Component published.'));
       } catch (err) {
         logger.log(
-          colors.red(`Component not published: ${(err as any).message}`)
+          colors.red(`Component not published: ${(err as Error).message}`)
         );
         throw err;
       }
diff --git a/src/registry/domain/components-cache/components-list.ts b/src/registry/domain/components-cache/components-list.ts
@@ -46,9 +46,9 @@ export default function componentsList(conf: Config, cdn: StorageAdapter) {
         };
       } catch (err: any) {
         if (err.code === 'dir_not_found') {
-          throw {
+          return {
             lastEdit: getUnixUTCTimestamp(),
-            components: [] as any
+            components: {}
           };
         }
         throw err;
diff --git a/src/registry/domain/events-handler.ts b/src/registry/domain/events-handler.ts
@@ -5,13 +5,13 @@ type Subscription<T = any> = (data: T) => void;
 let subscriptions: Record<string, Array<Subscription>> = {};
 
 export interface RequestData {
-  body: any;
+  body: unknown;
   duration: number;
   headers: IncomingHttpHeaders;
   method: string;
   path: string;
   relativeUrl: string;
-  query: Record<string, any>;
+  query: Record<string, unknown>;
   url: string;
   statusCode: number;
   errorDetails?: string;
diff --git a/src/registry/domain/extract-package.ts b/src/registry/domain/extract-package.ts
@@ -1,9 +1,9 @@
 import path from 'path';
 import targz from 'targz';
 import { promisify } from 'util';
-import { PackageJson } from 'type-fest';
 
 import getPackageJsonFromTempDir from './get-package-json-from-temp-dir';
+import { Component } from '../../types';
 
 export default async function extractPackage(
   files:
@@ -14,9 +14,9 @@ export default async function extractPackage(
   tarExtractMode: number
 ): Promise<{
   outputFolder: string;
-  packageJson: PackageJson;
+  packageJson: Component;
 }> {
-  const packageFile: Express.Multer.File = (files as any)[0];
+  const packageFile = (files as Express.Multer.File[])[0];
   const packagePath = path.resolve(packageFile.path);
   const packageUntarOutput = path.resolve(
     packageFile.path,
@@ -40,6 +40,6 @@ export default async function extractPackage(
 
   return {
     outputFolder: packageOutput,
-    packageJson: packageJson
+    packageJson
   };
 }
diff --git a/src/registry/domain/get-package-json-from-temp-dir.ts b/src/registry/domain/get-package-json-from-temp-dir.ts
@@ -1,9 +1,9 @@
 import fs from 'fs-extra';
 import path from 'path';
-import { PackageJson } from 'type-fest';
+import { Component } from '../../types';
 
 export default function getPackageJsonFromTempDir(
   tempDirPath: string
-): Promise<PackageJson> {
+): Promise<Component> {
   return fs.readJson(path.join(tempDirPath, 'package.json'));
 }
diff --git a/src/registry/domain/repository.ts b/src/registry/domain/repository.ts
@@ -296,18 +296,18 @@ export default function repository(conf: Config) {
 
     getTemplatesInfo: (): TemplateInfo[] => templatesInfo,
     getTemplate: (type: string) => templatesHash[type],
-    async init(): Promise<ComponentsDetails> {
+    async init(): Promise<ComponentsDetails | undefined> {
       if (conf.local) {
         // when in local this won't get called
-        return 'ok' as any;
+        return;
       }
 
       const componentsList = await componentsCache.load();
 
       return componentsDetails.refresh(componentsList);
     },
     async publishComponent(
-      pkgDetails: any,
+      pkgDetails: { outputFolder: string; packageJson: Component },
       componentName: string,
       componentVersion: string
     ): Promise<ComponentsDetails> {
diff --git a/src/registry/domain/storage-adapter.ts b/src/registry/domain/storage-adapter.ts
@@ -49,16 +49,16 @@ function isLegacyAdapter(
 
 function convertLegacyAdapter(adapter: LegacyStorageAdapter): StorageAdapter {
   return {
-    getFile: fromCallback(adapter.getFile),
-    getJson: fromCallback(adapter.getJson),
-    listSubDirectories: fromCallback(adapter.listSubDirectories),
-    putDir: fromCallback(adapter.putDir),
-    putFile: fromCallback(adapter.putFile),
-    putFileContent: fromCallback(adapter.putFileContent),
+    getFile: fromCallback(adapter.getFile as any),
+    getJson: fromCallback(adapter.getJson as any),
+    listSubDirectories: fromCallback(adapter.listSubDirectories as any),
+    putDir: fromCallback(adapter.putDir as any),
+    putFile: fromCallback(adapter.putFile as any),
+    putFileContent: fromCallback(adapter.putFileContent as any),
     getUrl: adapter.getUrl,
     maxConcurrentRequests: adapter.maxConcurrentRequests,
     adapterType: adapter.adapterType
-  };
+  } as any;
 }
 
 export default function getPromiseBasedAdapter(
diff --git a/src/registry/domain/validators/package-json-validator.ts b/src/registry/domain/validators/package-json-validator.ts
@@ -7,7 +7,7 @@ interface ValidationResult {
 
 interface PkgDetails {
   componentName: string;
-  packageJson: { name: string };
+  packageJson: { name?: string };
   customValidator: (data: unknown) => ValidationResult | boolean;
 }
 
diff --git a/src/registry/domain/validators/uploaded-package.ts b/src/registry/domain/validators/uploaded-package.ts
@@ -34,12 +34,12 @@ export default function uploadedPackage(
     return returnError('not_valid');
   }
 
-  const file: Express.Multer.File = (input as any)[0];
+  const file: Express.Multer.File = (input as Express.Multer.File[])[0];
   const validTypes = ['application/gzip', 'application/octet-stream'];
 
   if (
     !validTypes.includes(file.mimetype) ||
-    (file as any).truncated ||
+    (file as { truncated?: boolean }).truncated ||
     file.filename.indexOf('.tar.gz') < 0
   ) {
     return returnError('not_valid');
diff --git a/src/registry/index.ts b/src/registry/index.ts
diff --git a/src/registry/routes/component.ts b/src/registry/routes/component.ts
diff --git a/src/registry/routes/helpers/get-component.ts b/src/registry/routes/helpers/get-component.ts
diff --git a/src/registry/routes/static-redirector.ts b/src/registry/routes/static-redirector.ts
diff --git a/src/types.ts b/src/types.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ export default function registry(opts: RegistryOptions = {}) {`
`123`	`123`	`) {`
`124`	`124`	`errMsg = parsedError.error;`
`125`	`125`	`} else {`
`126`		`- errMsg = parsedError as any;`
	`126`	`+ errMsg = parsedError;`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`throw errMsg;`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,6 @@ const argv = cli`
`137`	`137`	`.version()`
`138`	`138`	`.wrap(cli.terminalWidth()).argv;`
`139`	`139`
`140`		`-if ((argv as any)._.length === 0) {`
	`140`	`+if ((argv as Awaited<typeof argv>)._.length === 0) {`
`141`	`141`	`cli.showHelp();`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "oc-client",`
`3`	`3`	`"description": "The OpenComponents client-side javascript client",`
`4`		`- "version": "0.49.13",`
	`4`	`+ "version": "0.49.20",`
`5`	`5`	`"repository": "https://github.com/opencomponents/oc/tree/master/components/oc-client",`
`6`	`6`	`"author": "Matteo Figus <[email protected]>",`
`7`	`7`	`"oc": {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export default async function appStart(`
`61`	`61`	`logger.log(colors.green('Component published.'));`
`62`	`62`	`} catch (err) {`
`63`	`63`	`logger.log(`
`64`		- colors.red(`Component not published: ${(err as any).message}`)
	`64`	+ colors.red(`Component not published: ${(err as Error).message}`)
`65`	`65`	`);`
`66`	`66`	`throw err;`
`67`	`67`	`}`