Skip to content

Commit

Permalink
Merge pull request #97 from technote-space/release/next-v0.0.14
Browse files Browse the repository at this point in the history
release: v0.0.15
  • Loading branch information
technote-space authored May 15, 2020
2 parents f6ed8f0 + 1598846 commit 802599f
Show file tree
Hide file tree
Showing 7 changed files with 1,008 additions and 901 deletions.
4 changes: 0 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = tab
indent_size = 4

[{*.json,*.yml}]
indent_style = space
indent_size = 2

Expand Down
295 changes: 147 additions & 148 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,150 +1,149 @@
{
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended"
],
"plugins": [
"@typescript-eslint"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2018
},
"env": {
"node": true,
"jest": true,
"es6": true,
"browser": true
},
"settings": {
"react": {
"version": "latest"
}
},
"rules": {
"camelcase": [
"error",
{
"properties": "always"
}
],
"require-jsdoc": [
"error",
{
"require": {
"FunctionDeclaration": true,
"MethodDefinition": true,
"ClassDeclaration": true
}
}
],
"valid-jsdoc": [
"error",
{
"requireReturn": false,
"preferType": {
"String": "string",
"Object": "object",
"Number": "number",
"Function": "function",
"Void": "void"
}
}
],
"quotes": [
"error",
"single",
"avoid-escape"
],
"key-spacing": [
"error",
{
"singleLine": {
"beforeColon": false,
"afterColon": true
},
"multiLine": {
"beforeColon": false,
"afterColon": true
}
}
],
"no-magic-numbers": [
"error",
{
"ignoreArrayIndexes": true
}
],
"eqeqeq": "error",
"block-scoped-var": "error",
"complexity": [
"error",
{
"maximum": 20
}
],
"curly": "error",
"default-case": "error",
"dot-location": [
"error",
"property"
],
"guard-for-in": "error",
"no-eval": "error",
"block-spacing": "error",
"brace-style": "error",
"comma-spacing": [
"error",
{
"before": false,
"after": true
}
],
"id-length": [
"error",
{
"min": 2,
"properties": "never",
"exceptions": [
"$"
]
}
],
"indent": [
"error",
"tab",
{
"MemberExpression": "off",
"SwitchCase": 1
}
],
"space-before-function-paren": [
"error",
"never"
],
"space-before-blocks": "error",
"prefer-const": "error",
"no-var": "error",
"arrow-body-style": "off",
"arrow-spacing": "error",
"strict": [
"error"
],
"no-warning-comments": [
"warn",
{
"terms": [
"todo",
"fixme",
"hack"
],
"location": "anywhere"
}
],
"semi": [
"error"
]
}
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended"
],
"plugins": [
"@typescript-eslint"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2018
},
"env": {
"node": true,
"jest": true,
"es6": true,
"browser": true
},
"settings": {
"react": {
"version": "latest"
}
},
"rules": {
"camelcase": [
"error",
{
"properties": "always"
}
],
"require-jsdoc": [
"error",
{
"require": {
"FunctionDeclaration": true,
"MethodDefinition": true,
"ClassDeclaration": true
}
}
],
"valid-jsdoc": [
"error",
{
"requireReturn": false,
"preferType": {
"String": "string",
"Object": "object",
"Number": "number",
"Function": "function",
"Void": "void"
}
}
],
"quotes": [
"error",
"single",
"avoid-escape"
],
"key-spacing": [
"error",
{
"singleLine": {
"beforeColon": false,
"afterColon": true
},
"multiLine": {
"beforeColon": false,
"afterColon": true
}
}
],
"no-magic-numbers": [
"error",
{
"ignoreArrayIndexes": true
}
],
"eqeqeq": "error",
"block-scoped-var": "error",
"complexity": [
"error",
{
"maximum": 20
}
],
"curly": "error",
"default-case": "error",
"dot-location": [
"error",
"property"
],
"guard-for-in": "error",
"no-eval": "error",
"block-spacing": "error",
"brace-style": "error",
"comma-spacing": [
"error",
{
"before": false,
"after": true
}
],
"id-length": [
"error",
{
"min": 2,
"properties": "never",
"exceptions": [
"$"
]
}
],
"indent": [
"error",
2,
{
"SwitchCase": 1
}
],
"space-before-function-paren": [
"error",
"never"
],
"space-before-blocks": "error",
"prefer-const": "error",
"no-var": "error",
"arrow-body-style": "off",
"arrow-spacing": "error",
"strict": [
"error"
],
"no-warning-comments": [
"warn",
{
"terms": [
"todo",
"fixme",
"hack"
],
"location": "anywhere"
}
],
"semi": [
"error"
]
}
}
8 changes: 4 additions & 4 deletions __tests__/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable no-magic-numbers */
import { add } from '../src';
import {add} from '../src';

describe('add', () => {
it('should add number', () => {
expect(add(1, 2)).toBe(3);
});
it('should add number', () => {
expect(add(1, 2)).toBe(3);
});
});
22 changes: 11 additions & 11 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module.exports = {
clearMocks: true,
moduleFileExtensions: ['js', 'ts'],
setupFiles: ['<rootDir>/jest.setup.ts'],
testEnvironment: 'node',
testMatch: ['**/*.test.ts'],
testRunner: 'jest-circus/runner',
transform: {
'^.+\\.ts$': 'ts-jest',
},
verbose: true,
coverageDirectory: '<rootDir>/coverage',
clearMocks: true,
moduleFileExtensions: ['js', 'ts'],
setupFiles: ['<rootDir>/jest.setup.ts'],
testEnvironment: 'node',
testMatch: ['**/*.test.ts'],
testRunner: 'jest-circus/runner',
transform: {
'^.+\\.ts$': 'ts-jest',
},
verbose: true,
coverageDirectory: '<rootDir>/coverage',
};
2 changes: 1 addition & 1 deletion jest.setup.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { setupGlobal } from '@technote-space/github-action-test-helper';
import {setupGlobal} from '@technote-space/github-action-test-helper';

setupGlobal();
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@technote-space/ts-package-template",
"version": "0.0.14",
"version": "0.0.15",
"description": "Template for npm package.",
"author": {
"name": "Technote",
Expand Down Expand Up @@ -30,17 +30,17 @@
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
"@technote-space/github-action-test-helper": "^0.3.7",
"@types/jest": "^25.2.1",
"@types/node": "^13.13.4",
"@typescript-eslint/eslint-plugin": "^2.30.0",
"@typescript-eslint/parser": "^2.30.0",
"eslint": "^6.8.0",
"@types/jest": "^25.2.2",
"@types/node": "^14.0.1",
"@typescript-eslint/eslint-plugin": "^2.33.0",
"@typescript-eslint/parser": "^2.33.0",
"eslint": "^7.0.0",
"husky": "^4.2.5",
"jest": "^25.5.4",
"jest-circus": "^25.5.4",
"jest": "^26.0.1",
"jest-circus": "^26.0.1",
"lint-staged": "^10.2.2",
"ts-jest": "^25.4.0",
"typescript": "^3.8.3"
"ts-jest": "^25.5.1",
"typescript": "^3.9.2"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit 802599f

Please sign in to comment.