Skip to content

Commit

Permalink
Merge pull request #2 from wildpeaks/eslint
Browse files Browse the repository at this point in the history
Eslint & updated dependencies
  • Loading branch information
cecilemuller authored Jan 8, 2018
2 parents e8d75c9 + 47c296f commit e83c0e1
Show file tree
Hide file tree
Showing 17 changed files with 1,197 additions and 131 deletions.
6 changes: 2 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@

* -text

.editorconfig text
.gitattributes text
.gitignore text
LICENSE text
README text
*.md text
*.txt text
*.ts text
*.js text
*.ts text
*.json text
*.yml text
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@
!/.editorconfig
!/.gitattributes
!/.gitignore
!/.npmrc
!/.travis.yml
!/.vscode
!/src
!/test
!/helper.typescript.js
!/jasmine.typescript.js
!/tsconfig.json
!/package.json
!/package-lock.json
!/tsconfig.json
!/wallaby.js
!/wallaby.js

#-----------------------------------------------------------------------------#
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loglevel=silent
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js:
- '6.10.3'
- '8.0.0'
- '8.9.4'
- '9.3.0'
sudo: false
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"recommendations": [
"EditorConfig.editorconfig",
"WallabyJs.wallaby-vscode"
"dbaeumer.vscode-eslint",
"WallabyJs.wallaby-vscode",
]
}
34 changes: 10 additions & 24 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,28 @@
{
// Typescript
"typescript.tsdk": "node_modules/typescript/lib",

// Exclude files and folders
"eslint.validate": [
"javascript",
"typescript"
],
"files.exclude": {
"LICENSE": true,
"*.lnk": true,
"*.url": true,
"*.zip": true,
"*.txt": true,
"*.log": true,
".DS_Store": true,
"LICENSE": true,
".editorconfig": true,
".gitignore": true,
".gitattributes": true,
".chrome": true,
".vscode": true,
"logs": true,
".npmrc": true,
"node_modules": true,
"package-lock.json": true,
"www": true
"package-lock.json": true
},
"search.exclude": {
"LICENSE": true,
"*.lnk": true,
"*.url": true,
"*.zip": true,
"*.txt": true,
"*.log": true,
".DS_Store": true,
"LICENSE": true,
".editorconfig": true,
".gitignore": true,
".gitattributes": true,
".chrome": true,
".vscode": true,
"logs": true,
".npmrc": true,
"node_modules": true,
"package-lock.json": true,
"www": true
"package-lock.json": true
}
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016 wildpeaks
Copyright (c) 2016-2018 wildpeaks

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions helper.typescript.js → jasmine.typescript.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Typescript compiler for Jasmine CLI in non-Wallaby mode
require('ts-node').register({
ignore: false,
compilerOptions: {
Expand Down
Loading

0 comments on commit e83c0e1

Please sign in to comment.