mirror of
https://github.com/status-im/cn.status.im.git
synced 2025-01-19 04:51:58 +00:00
Squashed commit of the following:
commit 16cce1f9cc5445a365d135ce3e803766fcd574af
Author: Jakub <i+github@always.fail>
Date: Wed Aug 15 13:06:48 2018 -0400
Fix/builds (#14)
* upgrade packages
* remove dist files
* remove old .babelrc config
* ginore contents of dist folder
* fix gulp build
* fix name of project
* this page is not hostted on github pages
* move all files to src, remove duplicates
* add an html gulp task for copying html
* move html files to src/html
* minify html, add steps for fonts, upgrade packages
* use modern function formatting
* add some basic scripts to package.json
* use babel-preset-env
* use babel-preset-env features like import in gulpfile
* downgrade to gulp@3.9.0
* remove useless pdf files
* more npm updates
* upgrade core dependencies
* remove unused files
This commit is contained in:
parent
729b383e85
commit
a4c409f68c
69
package-lock.json
generated
69
package-lock.json
generated
@ -4457,6 +4457,7 @@
|
||||
"graceful-fs": "4.1.11",
|
||||
"jsonfile": "3.0.1",
|
||||
"universalify": "0.1.2"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"fs-mkdirp-stream": {
|
||||
@ -4469,6 +4470,20 @@
|
||||
"through2": "2.0.3"
|
||||
}
|
||||
},
|
||||
=======
|
||||
}
|
||||
},
|
||||
"fs-mkdirp-stream": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
|
||||
"integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"graceful-fs": "4.1.11",
|
||||
"through2": "2.0.3"
|
||||
}
|
||||
},
|
||||
>>>>>>> master
|
||||
"fs.realpath": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
|
||||
@ -5987,9 +6002,12 @@
|
||||
"dev": true
|
||||
},
|
||||
"iconv-lite": {
|
||||
"version": "0.4.19",
|
||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
|
||||
"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
|
||||
"version": "0.4.23",
|
||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
|
||||
"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
|
||||
"requires": {
|
||||
"safer-buffer": "2.1.2"
|
||||
}
|
||||
},
|
||||
"ieee754": {
|
||||
"version": "1.1.12",
|
||||
@ -8498,6 +8516,45 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"plugin-error": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
|
||||
"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"ansi-colors": "1.1.0",
|
||||
"arr-diff": "4.0.0",
|
||||
"arr-union": "3.1.0",
|
||||
"extend-shallow": "3.0.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"arr-diff": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
|
||||
"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
|
||||
"dev": true
|
||||
},
|
||||
"extend-shallow": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
|
||||
"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"assign-symbols": "1.0.0",
|
||||
"is-extendable": "1.0.1"
|
||||
}
|
||||
},
|
||||
"is-extendable": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
|
||||
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-plain-object": "2.0.4"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"plur": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
|
||||
@ -9198,8 +9255,12 @@
|
||||
"safer-buffer": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
|
||||
<<<<<<< HEAD
|
||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
|
||||
"dev": true
|
||||
=======
|
||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
|
||||
>>>>>>> master
|
||||
},
|
||||
"sass-graph": {
|
||||
"version": "2.2.4",
|
||||
@ -10759,7 +10820,7 @@
|
||||
"resolved": "https://registry.npmjs.org/urlencode/-/urlencode-1.1.0.tgz",
|
||||
"integrity": "sha1-HyuibwE8hfATP3o61v8nMK33y7c=",
|
||||
"requires": {
|
||||
"iconv-lite": "0.4.19"
|
||||
"iconv-lite": "0.4.23"
|
||||
}
|
||||
},
|
||||
"use": {
|
||||
|
||||
14
package.json
14
package.json
@ -40,16 +40,20 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"build-url": "^1.1.2",
|
||||
<<<<<<< HEAD
|
||||
"d3-ease": "^1.0.2",
|
||||
=======
|
||||
"d3-ease": "^1.0.3",
|
||||
>>>>>>> master
|
||||
"d3-interpolate": "^1.2.0",
|
||||
"d3-scale": "^1.0.7",
|
||||
"ip": "^1.1.5",
|
||||
"js-cookie": "^2.1.4",
|
||||
"js-cookie": "^2.2.0",
|
||||
"lodash.assign": "^4.2.0",
|
||||
"lodash.clone": "^4.0.1",
|
||||
"lodash.foreach": "^4.0.0",
|
||||
"lodash.isempty": "^4.0.0",
|
||||
"lodash.isequal": "^4.0.0",
|
||||
"lodash.clone": "^4.5.0",
|
||||
"lodash.foreach": "^4.5.0",
|
||||
"lodash.isempty": "^4.4.0",
|
||||
"lodash.isequal": "^4.5.0",
|
||||
"urlencode": "^1.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user