Merge branch 'master' into typescript

This commit is contained in:
yushijinhun 2018-08-23 09:32:07 +08:00
commit 64d3406932
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
2 changed files with 520 additions and 1716 deletions

2210
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "skinview3d",
"version": "1.1.0-alpha.4",
"version": "1.1.0",
"description": "Three.js powered Minecraft skin viewer",
"module": "dist/skinview3d.module.js",
"main": "dist/skinview3d.js",
@ -32,34 +32,34 @@
"dist"
],
"dependencies": {
"three": "^0.94.0"
"three": "^0.95.0"
},
"devDependencies": {
"@types/chai": "^4.1.4",
"@types/mocha": "^5.2.5",
"@types/three": "^0.92.12",
"@types/three": "^0.92.17",
"chai": "^4.1.2",
"eslint": "^5.0.1",
"eslint": "^5.4.0",
"karma": "^3.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
"karma-webpack": "^3.0.0",
"local-web-server": "^2.5.4",
"local-web-server": "^2.6.0",
"mocha": "^5.2.0",
"npm-run-all": "^4.1.2",
"puppeteer": "^1.5.0",
"npm-run-all": "^4.1.3",
"puppeteer": "^1.7.0",
"rimraf": "^2.6.2",
"rollup": "^0.62.0",
"rollup": "^0.64.1",
"rollup-plugin-license": "^0.7.0",
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-typescript2": "^0.16.1",
"rollup-plugin-uglify": "^4.0.0",
"ts-loader": "^4.4.2",
"tslint": "^5.10.0",
"ts-loader": "^4.5.0",
"tslint": "^5.11.0",
"tslint-formatter-beauty": "^3.0.0-beta.2",
"typescript": "^2.8.3",
"typescript": "^3.0.1",
"uglify-es": "^3.3.10",
"url-loader": "^1.0.1",
"webpack": "^4.15.1"
"url-loader": "^1.1.1",
"webpack": "^4.17.1"
}
}