1
0
mirror of https://github.com/chinchang/web-maker.git synced 2025-08-31 16:51:43 +02:00

merge master and resolve conflicts

This commit is contained in:
Kushagra Gour
2018-11-17 01:19:32 +05:30
29 changed files with 61684 additions and 1790 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "web-maker",
"version": "3.5.1",
"version": "3.6.0",
"description": "A blazing fast & offline web playground",
"scripts": {
"start": "if-env NODE_ENV=production && npm run -s serve || npm run -s dev",
@@ -64,13 +64,13 @@
"codemirror": "^5.37.0",
"copy-webpack-plugin": "^4.5.1",
"esprima": "^4.0.0",
"firebase": "^5.0.4",
"firebase": "^5.5.8",
"jszip": "^3.1.5",
"preact": "^8.2.6",
"preact-compat": "^3.17.0",
"preact-portal": "^1.1.3",
"preact-router": "^2.5.7",
"prettier": "^1.10.2",
"prettier": "^1.15.2",
"react-inspector": "^2.3.0",
"split.js": "1.3.4"
},