Skip to content

Commit

Permalink
Merge 28c8fb3 into 3d9c7e4
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalexiei committed Aug 13, 2020
2 parents 3d9c7e4 + 28c8fb3 commit 36f3a24
Show file tree
Hide file tree
Showing 407 changed files with 11,289 additions and 6,315 deletions.
6 changes: 1 addition & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.js]
[*.{js,ts}]
indent_style = space
indent_size = 2

[*.md]
indent_style = space
indent_size = 4

[*.ts]
indent_style = space
indent_size = 4
30 changes: 0 additions & 30 deletions .eslintrc

This file was deleted.

122 changes: 122 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"root": true,
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:import/errors",
"plugin:import/typescript"
],
"env": {
"es6": true
},
"plugins": [
"prettier",
"import"
],
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"parser": "@typescript-eslint/parser",
"settings": {
"import/parsers": {
"@typescript-eslint/parser": [".ts"]
},
"import/resolver": {
"typescript": {
"alwaysTryTypes": true,
"directory": "./tsconfig.json"
}
}
},
"rules": {
"import/order": ["error", {
"groups": [
"builtin",
"external",
"internal",
"parent",
"sibling",
"index"
],
"pathGroups": [{
"pattern": "config/**",
"group": "internal"
}, {
"pattern": "model/**",
"group": "internal"
},{
"pattern": "parse/**",
"group": "internal"
}, {
"pattern": "shared/**",
"group": "internal"
}, {
"pattern": "types/**",
"group": "internal"
}, {
"pattern": "utils/**",
"group": "internal"
}, {
"pattern": "view/**",
"group": "internal"
}],
"newlines-between": "always",
"alphabetize": {
"order": "asc",
"caseInsensitive": true
}
}],

"prettier/prettier": ["error", {
"printWidth": 100,
"singleQuote": true,
"arrowParens": "avoid",
"trailingComma": "none"
}],

"linebreak-style": ["error", "unix"],
"no-mixed-spaces-and-tabs": ["error", "smart-tabs"],
"no-class-assign": "error",
"no-cond-assign": "off",
"no-const-assign": "error",
"no-constant-condition": ["error", {
"checkLoops": false
}],
"no-control-regex": "off",
"no-this-before-super": "error",
"no-var": "error",
"object-shorthand": ["error", "always"],
"one-var": ["error", {
"initialized": "never"
}],
"prefer-arrow-callback": "error",
"prefer-const": "error",
"no-useless-escape": 0,
"no-console": "error",
"no-dupe-class-members": "off",

"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/no-empty-function": ["error", {
"allow": ["methods"]
}],
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/explicit-function-return-type": ["warn", {
"allowExpressions": true
}]
},
"overrides": [{
// disable typescript rules for JS files
"files": ["**/*.js"],
"rules": {
"no-dupe-class-members": "error",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/camelcase": "off",
"@typescript-eslint/no-this-alias": "off",
"@typescript-eslint/no-unused-vars": "off"
}
}]
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ perf/control/*

# Log files
*.log

# Documentation
docs
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
save-dev=true
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"editorconfig.editorconfig",
"ms-vscode.vscode-typescript-tslint-plugin",
"dbaeumer.vscode-eslint"
]
}
9 changes: 7 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,10 @@
"statusBarItem.hoverBackground": "#00919b",
"statusBar.foreground": "#15202b"
},
"peacock.color": "#00c1ce"
}
"editor.rulers": [100],
"peacock.color": "#00c1ce",
"typescript.tsdk": "node_modules/typescript/lib",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}
6 changes: 3 additions & 3 deletions bin/ractive.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
/* eslint-env node */
/* eslint-disable no-console */

const path = require('path');
const fs = require('fs');
const path = require('path');

const util = require('../lib/util');
const parse = require('../lib/parse');
const component = require('../lib/component');
const parse = require('../lib/parse');
const util = require('../lib/util');

const args = process.argv.slice();

Expand Down

0 comments on commit 36f3a24

Please sign in to comment.