From 56b25f9dd8b2989a5419bf9cd78173f644bd42fe Mon Sep 17 00:00:00 2001 From: Wojciech Pawlik Date: Tue, 5 May 2020 15:59:50 +0200 Subject: [PATCH] Streamline CI --- .circleci/config.yml | 18 ++++++++++-------- .editorconfig | 4 ++++ .eslintrc.json | 2 ++ package.json | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 779c44f..908b2b0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/node:10.3 + - image: circleci/node:12 working_directory: ~/repo @@ -11,14 +11,16 @@ jobs: - restore_cache: keys: - - v1-dependencies-{{ checksum "package.json" }} - - v1-dependencies- + - v2-dependencies-{{ checksum "package-lock.json" }} + - v2-dependencies- - - run: npm install + - run: npm ci - save_cache: paths: - - node_modules - key: v1-dependencies-{{ checksum "package.json" }} - - - run: npm run -s lint \ No newline at end of file + - "$HOME/.npm" + key: v2-dependencies-{{ checksum "package-lock.json" }} + + - run: npm run -s typecheck + + - run: npm run -s lint diff --git a/.editorconfig b/.editorconfig index a49af34..516063d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,7 @@ trim_trailing_whitespace = true [package.json] indent_style = space indent_size = 2 + +[.circleci/config.yml] +indent_style = space +indent_size = 2 diff --git a/.eslintrc.json b/.eslintrc.json index 42229c5..eb49c74 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,7 @@ { "parserOptions": { "ecmaVersion": 2018, + "project": "tsconfig.json", "sourceType": "script" }, "env": { @@ -14,6 +15,7 @@ "plugins": ["@typescript-eslint"], "parser": "@typescript-eslint/parser", "extends": [ + "plugin:@typescript-eslint/recommended-requiring-type-checking", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", diff --git a/package.json b/package.json index bf015b5..a648ac9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "postversion": "git push --atomic --follow-tags origin develop develop:master", "start": "node index", "lint": "eslint --ext .ts --ext .js .", - "test": "echo \"Error: no test specified\" && exit 1" + "typecheck": "tsc --noEmit" }, "repository": { "type": "git",