From 35785cc7aa6251694c4b95ac70f5c55e1527f169 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Tue, 2 Apr 2019 23:49:55 +0900 Subject: [PATCH] refs #850 Fix CI for typescript --- .circleci/config.yml | 2 +- .eslintrc.js | 3 +- package-lock.json | 66 ++++++++++++++++++++++++++++++++++++++++++++ package.json | 7 +++-- sideci.yml | 2 +- 5 files changed, 75 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30c3029b..a212bcb8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: node:10.13.0-slim + - image: node:10.15.3-stretch-slim working_directory: /var/opt/app steps: - checkout diff --git a/.eslintrc.js b/.eslintrc.js index 90cf05bb..62857fa7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -13,7 +13,8 @@ module.exports = { __static: true }, plugins: [ - 'html' + 'html', + '@typescript-eslint' ], 'rules': { // allow paren-less arrow functions diff --git a/package-lock.json b/package-lock.json index a04613cb..c2094289 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2053,6 +2053,51 @@ "integrity": "sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==", "dev": true }, + "@typescript-eslint/eslint-plugin": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.5.0.tgz", + "integrity": "sha512-TZ5HRDFz6CswqBUviPX8EfS+iOoGbclYroZKT3GWGYiGScX0qo6QjHc5uuM7JN920voP2zgCkHgF5SDEVlCtjQ==", + "dev": true, + "requires": { + "@typescript-eslint/parser": "1.5.0", + "@typescript-eslint/typescript-estree": "1.5.0", + "requireindex": "1.2.0", + "tsutils": "3.9.1" + } + }, + "@typescript-eslint/parser": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.5.0.tgz", + "integrity": "sha512-pRWTnJrnxuT0ragdY26hZL+bxqDd4liMlftpH2CBlMPryOIOb1J+MdZuw6R4tIu6bWVdwbHKPTs+Q34LuGvfGw==", + "dev": true, + "requires": { + "@typescript-eslint/typescript-estree": "1.5.0", + "eslint-scope": "4.0.3", + "eslint-visitor-keys": "1.0.0" + }, + "dependencies": { + "eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dev": true, + "requires": { + "esrecurse": "4.2.1", + "estraverse": "4.2.0" + } + } + } + }, + "@typescript-eslint/typescript-estree": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.5.0.tgz", + "integrity": "sha512-XqR14d4BcYgxcrpxIwcee7UEjncl9emKc/MgkeUfIk2u85KlsGYyaxC7Zxjmb17JtWERk/NaO+KnBsqgpIXzwA==", + "dev": true, + "requires": { + "lodash.unescape": "4.0.1", + "semver": "5.5.0" + } + }, "@vue/component-compiler-utils": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.3.0.tgz", @@ -13146,6 +13191,12 @@ "lodash.keysin": "3.0.8" } }, + "lodash.unescape": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", + "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=", + "dev": true + }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -16890,6 +16941,12 @@ } } }, + "requireindex": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz", + "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==", + "dev": true + }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -19786,6 +19843,15 @@ "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", "dev": true }, + "tsutils": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.9.1.tgz", + "integrity": "sha512-hrxVtLtPqQr//p8/msPT1X1UYXUjizqSit5d9AQ5k38TcV38NyecL5xODNxa73cLe/5sdiJ+w1FqzDhRBA/anA==", + "dev": true, + "requires": { + "tslib": "1.9.3" + } + }, "ttfinfo": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/ttfinfo/-/ttfinfo-0.2.0.tgz", diff --git a/package.json b/package.json index 260ac6eb..71101361 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "test": "npm run unit && npm run e2e", "unit": "karma start test/unit/karma.conf.js", "postinstall": "npm run lint:fix", - "spec": "NODE_ENV=test jest -u" + "spec": "NODE_ENV=test jest -u --maxWorkers=3" }, "build": { "productName": "Whalebird", @@ -115,7 +115,9 @@ "^.+\\.(js|jsx)$": "babel-jest", "^.+\\.(ts|tsx)$": "ts-jest" }, - "setupFiles": ["core-js"], + "setupFiles": [ + "core-js" + ], "globals": { "ts-jest": { "tsConfig": "tsconfig.json" @@ -172,6 +174,7 @@ "@types/i18next": "^12.1.0", "@types/jest": "^24.0.11", "@types/node": "^11.11.4", + "@typescript-eslint/eslint-plugin": "^1.5.0", "@vue/test-utils": "^1.0.0-beta.28", "ajv": "^6.6.1", "babel-core": "^6.26.3", diff --git a/sideci.yml b/sideci.yml index 884df5e9..6d191e7a 100644 --- a/sideci.yml +++ b/sideci.yml @@ -7,7 +7,7 @@ linter: - spec options: config: '.eslintrc.js' - ext: '.js,.vue' + ext: '.js,.vue,.ts' ignore-path: .eslintignore stylelint: