Skip to content

Commit

Permalink
Merge pull request #92 from mizunashi-mana/update-v2
Browse files Browse the repository at this point in the history
Update v2
  • Loading branch information
Mizunashi Mana committed May 10, 2016
2 parents 649830f + f34531f commit 084ad9a
Show file tree
Hide file tree
Showing 81 changed files with 1,953 additions and 1,865 deletions.
14 changes: 10 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
root = true

[**.ts]
[*]
charset = utf-8
end_of_line = lf

[**.{ts,js}]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[**.coffee]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[**.json]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true

[**.{yaml, cson}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true

[**.md]
Expand Down
52 changes: 0 additions & 52 deletions .eslintrc

This file was deleted.

12 changes: 1 addition & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
/dist/
/typings/
/lib/
/test-build/
/docs/reference/

# for NPM
node_modules/
npm-debug.log

# for Mac
.DS_Store*

# for Editor
*.swp
*~
.vscode/
npm-*.log
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v5.3
5.11.0
6 changes: 0 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# no publish
dist
docs
src
node_modules
test
test-build

# documents
CHANGELOG.md
Expand All @@ -15,7 +13,3 @@ CHANGELOG.md
tsconfig.json
dtsm.json
gulp*

# garbages
*.log
.DS_Store
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
language: node_js
node_js:
- "5.3"
- "4.2"
- "6.1"
- "5.11"
- "4.4"
- "0.12"
env:
- MOCHA_REPORTER="spec"
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Safe parser of JSON and CSON for config parsing like ConfigParser of python.
[![Build status][travis-image]][travis-url]
[![License][license-image]][license-url]
[![Downloads][downloads-image]][downloads-url]
[![Dependency status][gemnasium-image]][gemnasium-url]

For more information, view the [documentation][main-document].

Expand Down Expand Up @@ -124,3 +125,5 @@ result = ExampleTsConfParser.parse({
[main-document]: docs/man/README.md
[fantasy-land-logo]: https://github.com/fantasyland/fantasy-land/raw/master/logo.png
[fantasy-land-url]: https://github.com/fantasyland/fantasy-land
[gemnasium-image]: https://gemnasium.com/badges/github.com/mizunashi-mana/node-sonparser.svg
[gemnasium-url]: https://gemnasium.com/github.com/mizunashi-mana/node-sonparser
2 changes: 1 addition & 1 deletion coffeelint.json → config/coffeelint.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@
"spacing_after_comma": {
"level": "warn"
}
}
}
109 changes: 109 additions & 0 deletions config/eslint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
env:
node: true

extends:
"eslint:recommended"

rules:
array-callback-return: "error"
indent: ["error", 2, {SwitchCase: 1}]
block-spacing: "error"
brace-style: ["error", "1tbs"]
camelcase: ["error", { properties: "never" }]
callback-return: ["error", ["cb", "callback", "next"]]
comma-dangle: ["error", "only-multiline"]
comma-spacing: "error"
comma-style: ["error", "last"]
consistent-return: "error"
curly: ["error", "all"]
default-case: "error"
dot-notation: ["error", { allowKeywords: true }]
eol-last: "error"
eqeqeq: "error"
func-style: ["error", "declaration"]
guard-for-in: "error"
key-spacing: ["error", { beforeColon: false, afterColon: true }]
keyword-spacing: "error"
lines-around-comment: ["error", {
beforeBlockComment: true,
afterBlockComment: false,
beforeLineComment: true,
afterLineComment: false
}]
new-cap: "error"
newline-after-var: "error"
new-parens: "error"
no-alert: "error"
no-array-constructor: "error"
no-caller: "error"
no-console: ["error", {
allow: ["log", "error"]
}]
no-delete-var: "error"
no-eval: "error"
no-extend-native: "error"
no-extra-bind: "error"
no-fallthrough: "error"
no-floating-decimal: "error"
no-implied-eval: "error"
no-invalid-this: "error"
no-iterator: "error"
no-label-var: "error"
no-labels: "error"
no-lone-blocks: "error"
no-loop-func: "error"
no-mixed-spaces-and-tabs: ["error", false]
no-multi-spaces: "error"
no-multi-str: "error"
no-native-reassign: "error"
no-nested-ternary: "error"
no-new: "error"
no-new-func: "error"
no-new-object: "error"
no-new-wrappers: "error"
no-octal: "error"
no-octal-escape: "error"
no-process-exit: "error"
no-proto: "error"
no-redeclare: "error"
no-return-assign: "error"
no-script-url: "error"
no-self-assign: "error"
no-sequences: "error"
no-shadow: "error"
no-shadow-restricted-names: "error"
no-spaced-func: "error"
no-trailing-spaces: "error"
no-undef: "error"
no-undef-init: "error"
no-undefined: "error"
no-underscore-dangle: ["error", {allowAfterThis: true}]
no-unmodified-loop-condition: "error"
no-unused-expressions: "error"
no-unused-vars: ["error", {vars: "all", args: "after-used"}]
no-use-before-define: "error"
no-useless-concat: "error"
no-with: "error"
one-var-declaration-per-line: "error"
quotes: ["error", "single", "avoid-escape"]
quote-props: ["error", "as-needed"]
radix: "error"
require-jsdoc: "warn"
semi-spacing: ["error", {before: false, after: true}]
space-before-blocks: "error"
space-before-function-paren: ["error", "never"]
space-in-parens: "error"
space-infix-ops: "error"
space-unary-ops: ["error", {words: true, nonwords: false}]
spaced-comment: ["error", "always", { exceptions: ["-"]}]
strict: ["error", "global"]
valid-jsdoc: ["error", { prefer: { "return": "returns"}}]
wrap-iife: "error"
yoda: ["error", "never"]

# Previously on by default in node environment
no-catch-shadow: "off"
no-mixed-requires: "error"
no-new-require: "error"
no-path-concat: "error"
handle-callback-err: ["error", "err"]
72 changes: 72 additions & 0 deletions config/tslint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"rules": {
"class-name": true,
"comment-format": [true, "check-space"],
"curly": true,
"eofline": true,
"forin": true,
"indent": [true, "spaces"],
"label-position": true,
"label-undefined": true,
"max-line-length": [true, 120],
"member-access": true,
"member-ordering": [false],
"no-arg": true,
"no-bitwise": true,
"no-console": [true,
"debug",
"info",
"time",
"timeEnd",
"trace"
],
"no-construct": true,
"no-debugger": true,
"no-duplicate-key": true,
"no-duplicate-variable": true,
"no-empty": true,
"no-eval": true,
"no-require-imports": true,
"no-inferrable-types": true,
"no-shadowed-variable": true,
"no-string-literal": false,
"no-switch-case-fall-through": true,
"no-trailing-whitespace": true,
"no-unused-expression": true,
"no-unused-variable": true,
"no-unreachable": true,
"no-use-before-declare": true,
"no-var-keyword": true,
"object-literal-sort-keys": false,
"one-line": [true,
"check-open-brace",
"check-catch",
"check-else",
"check-finally",
"check-whitespace"
],
"quotemark": [true, "single", "avoid-escape"],
"radix": true,
"semicolon": [true, "always"],
"trailing-comma": [true, {
"singleline": "never",
"multiline": "always"
}],
"triple-equals": [true, "allow-null-check"],
"typedef-whitespace": [true, {
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
}],
"variable-name": false,
"whitespace": [true,
"check-branch",
"check-decl",
"check-operator",
"check-separator",
"check-type"
]
}
}
Loading

0 comments on commit 084ad9a

Please sign in to comment.