Skip to content

Commit

Permalink
Update dependencies and add yarn
Browse files Browse the repository at this point in the history
  • Loading branch information
mafredri committed Dec 2, 2016
1 parent 939e782 commit b00f35c
Show file tree
Hide file tree
Showing 6 changed files with 2,594 additions and 15 deletions.
11 changes: 6 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
root = true

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

[*.{js,ts}]
indent_size = auto
indent_style = tab
[*.{json,yml}]
indent_style = space
indent_size = 2

[*.md]
indent_style = space
indent_size = 4
trim_trailing_whitespace = false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ I've optimized the key bindings for my common use-case, showing two windows on o
```
git clone https://github.com/mafredri/phoenix-config.git
cd phoenix-config
npm install && typings install
npm install && npm run typings
npm run build
```

Expand Down
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@
"description": "Configuration for kasper/phoenix written in TypeScript",
"main": "src/phoenix.ts",
"dependencies": {
"lodash": "^4.14.1",
"ts-loader": "^0.8.2",
"tslint": "^3.14.0-dev.1",
"typescript": "^2.1.0-dev.20160807",
"typings": "^1.3.2",
"webpack": "^1.13.1"
"eslint": "^3.11.1",
"ts-loader": "^1.2.2",
"tslint": "^4.0.0-dev.3",
"typescript": "^2.0.10",
"typings": "^2.0.0",
"webpack": "^1.13.3"
},
"devDependencies": {},
"scripts": {
"start": "npm run watch",
"watch": "webpack --watch",
"build": "webpack",
"typings": "typings install",
"lint": "tslint './src/**/*.ts' && eslint ./src/",
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
Expand Down
6 changes: 6 additions & 0 deletions tslint.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"extends": "tslint:latest",
"rules": {
"interface-name": [
true,
"never-prefix"
],
"class-name": true,
"comment-format": [
true,
Expand All @@ -13,6 +18,7 @@
"no-eval": true,
"no-internal-module": true,
"no-trailing-whitespace": true,
"no-unsafe-finally": true,
"no-var-keyword": true,
"one-line": [
true,
Expand Down
3 changes: 0 additions & 3 deletions typings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"name": "phoenix-config",
"dependencies": {
"lodash": "registry:npm/lodash#4.0.0+20160723033700"
},
"globalDependencies": {
"phoenix-typings": "github:mafredri/phoenix-typings"
}
Expand Down
Loading

0 comments on commit b00f35c

Please sign in to comment.