archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

solve package.json conflicted

Browse Source
This commit is contained in:
Toan Nguyen 2017-12-09 17:35:49 +07:00
parent 959c2fb4dd
commit 11e2455c70
2 changed files with 799 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1213
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

9
package.json
View File

@ -1,6 +1,6 @@
{
"name": "serverless",
"version": "1.23.0",
"version": "1.24.1",
"engines": {
"node": ">=4.0"
},
@ -78,10 +78,13 @@
"istanbul": "^0.4.4",
"jest-cli": "^18.0.0",
"jszip": "^3.1.2",
"markdown-link": "^0.1.1",
"markdown-magic": "^0.1.15",
"markdown-table": "^1.1.1",
"mocha": "^3.0.2",
"mocha-lcov-reporter": "^1.2.0",
"mock-require": "^1.3.0",
"parse-github-url": "^1.0.1",
"proxyquire": "^1.7.10",
"sinon": "^1.17.5",
"sinon-bluebird": "^3.1.0",
@ -114,14 +117,16 @@
"moment": "^2.13.0",
"node-fetch": "^1.6.0",
"node-forge": "^0.7.1",
"object-hash": "^1.2.0",
"opn": "^5.0.0",
"promise-queue": "^2.2.3",
"raven": "^1.2.1",
"rc": "^1.1.6",
"replaceall": "^0.1.6",
"semver": "^5.0.3",
"semver-regex": "^1.0.0",
"shelljs": "^0.6.0",
"tabtab": "^2.2.2",
"update-notifier": "^2.2.0",
"uuid": "^2.0.2",
"write-file-atomic": "^2.1.0",
"yaml-ast-parser": "0.0.34"