1
0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00

Merge branch 'master' into feature/keeper-0.13

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
ssallam 2020-01-22 15:39:11 +01:00
commit c287e2c5e3
2 changed files with 31 additions and 13 deletions

42
package-lock.json generated
View File

@ -8634,9 +8634,9 @@
} }
}, },
"marked": { "marked": {
"version": "0.7.0", "version": "0.8.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-0.8.0.tgz",
"integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==", "integrity": "sha512-MyUe+T/Pw4TZufHkzAfDj6HarCBWia2y27/bhuYkTaiUnfDYFnCP3KUN+9oM7Wi6JA2rymtVYbQu3spE0GCmxQ==",
"dev": true "dev": true
}, },
"md5.js": { "md5.js": {
@ -12878,21 +12878,21 @@
} }
}, },
"typedoc": { "typedoc": {
"version": "0.15.5", "version": "0.16.6",
"resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.15.5.tgz", "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.16.6.tgz",
"integrity": "sha512-AKXLtOUCLRlSTyfXQHYp3LFPy6RiFLnxnKS5z1jwQsYXmCPbHWuhmfgS264Es2hPMZjzvHqk/ZQDzCBpb49u6w==", "integrity": "sha512-1k4HXW5o6/rk5U3NEXEM+UVMPWaM0xW1/WJo1wlptb0gzsqtahymLDFSBX8Nqi7cToKOuiJPUr8j8UU368UNoA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/minimatch": "3.0.3", "@types/minimatch": "3.0.3",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"handlebars": "^4.5.3", "handlebars": "^4.7.2",
"highlight.js": "^9.17.1", "highlight.js": "^9.17.1",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"marked": "^0.7.0", "marked": "^0.8.0",
"minimatch": "^3.0.0", "minimatch": "^3.0.0",
"progress": "^2.0.3", "progress": "^2.0.3",
"shelljs": "^0.8.3", "shelljs": "^0.8.3",
"typedoc-default-themes": "^0.6.2", "typedoc-default-themes": "^0.7.1",
"typescript": "3.7.x" "typescript": "3.7.x"
}, },
"dependencies": { "dependencies": {
@ -12906,13 +12906,31 @@
"jsonfile": "^4.0.0", "jsonfile": "^4.0.0",
"universalify": "^0.1.0" "universalify": "^0.1.0"
} }
},
"handlebars": {
"version": "4.7.2",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.2.tgz",
"integrity": "sha512-4PwqDL2laXtTWZghzzCtunQUTLbo31pcCJrd/B/9JP8XbhVzpS5ZXuKqlOzsd1rtcaLo4KqAn8nl8mkknS4MHw==",
"dev": true,
"requires": {
"neo-async": "^2.6.0",
"optimist": "^0.6.1",
"source-map": "^0.6.1",
"uglify-js": "^3.1.4"
}
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
} }
} }
}, },
"typedoc-default-themes": { "typedoc-default-themes": {
"version": "0.6.2", "version": "0.7.1",
"resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.6.2.tgz", "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.7.1.tgz",
"integrity": "sha512-+O+1aHjVIpDLsbkIDkZSNu+kutqmg7WdzahT+4KwBC/95mUgAb0xkbwdPpEJEpRX0ov1UJoCmvEPb1/VHxnTuw==", "integrity": "sha512-s3jeUHc4EY8snIta6lNkUu9+36WMDUnkKm0UQ59w5iPo/4Y2d4+M9CDIKoenYKT5hkg/UnTc3oX48VZZytv8Xw==",
"dev": true, "dev": true,
"requires": { "requires": {
"backbone": "^1.4.0", "backbone": "^1.4.0",

View File

@ -88,7 +88,7 @@
"prettier": "^1.19.1", "prettier": "^1.19.1",
"source-map-support": "^0.5.16", "source-map-support": "^0.5.16",
"ts-node": "^8.5.4", "ts-node": "^8.5.4",
"typedoc": "^0.15.5", "typedoc": "^0.16.5",
"typescript": "^3.7.3", "typescript": "^3.7.3",
"uglifyjs-webpack-plugin": "^2.2.0", "uglifyjs-webpack-plugin": "^2.2.0",
"webpack": "^4.41.3", "webpack": "^4.41.3",