Skip to content

Commit bfe8491

Browse files
committed
add IDEA Module Library (*.iml) and node-debug.log file to .gitignore, upgrade some (dev)dependencies
1 parent aa21e0c commit bfe8491

File tree

2 files changed

+49
-4
lines changed

2 files changed

+49
-4
lines changed

.gitignore

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,47 @@ node_modules/
66
public/assets/
77
tmp/
88
coverage
9-
*.marko.js
9+
*.marko.js
10+
11+
# IntelliJ project files
12+
*.iml
13+
out
14+
gen
15+
16+
# Node template
17+
# Logs
18+
logs
19+
*.log
20+
npm-debug.log*
21+
22+
# Runtime data
23+
pids
24+
*.pid
25+
*.seed
26+
27+
# Directory for instrumented libs generated by jscoverage/JSCover
28+
lib-cov
29+
30+
# Coverage directory used by tools like istanbul
31+
32+
# nyc test coverage
33+
.nyc_output
34+
35+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
36+
.grunt
37+
38+
# node-waf configuration
39+
.lock-wscript
40+
41+
# Compiled binary addons (http://nodejs.org/api/addons.html)
42+
build/Release
43+
44+
# Dependency directories
45+
node_modules
46+
jspm_packages
47+
48+
# Optional npm cache directory
49+
.npm
50+
51+
# Optional REPL history
52+
.node_repl_history

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"devDependencies": {
55
"babel-plugin-rewire": "^1.0.0-rc-4",
66
"chai": "^3.5.0",
7+
"chokidar": "^1.6.0",
78
"chokidar-cli": "^1.2.0",
89
"enzyme": "^2.4.0",
910
"eslint-watch": "^2.1.13",
@@ -18,6 +19,7 @@
1819
"react-transform-catch-errors": "^1.0.2",
1920
"react-transform-hmr": "^1.0.4",
2021
"redbox-react": "^1.2.10",
22+
"regenerator-runtime": "^0.9.5",
2123
"rewire": "^2.5.2",
2224
"sinon": "^1.17.4",
2325
"supertest": "^1.2.0"
@@ -118,8 +120,8 @@
118120
"shelljs": "^0.7.0",
119121
"style-loader": "^0.13.1",
120122
"url-loader": "^0.5.7",
121-
"webpack": "^2.1.0-beta.7",
122-
"webpack-dev-server": "^2.0.0-beta",
123+
"webpack": "^2.1.0-beta.17",
124+
"webpack-dev-server": "^2.1.0-beta.0",
123125
"webpack-isomorphic-tools": "^2.3.2",
124126
"why-did-you-update": "0.0.8"
125127
},
@@ -158,4 +160,4 @@
158160
"node": ">= 4.1.0",
159161
"npm": ">=3.0.0"
160162
}
161-
}
163+
}

0 commit comments

Comments
 (0)