aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package-lock.json832
-rw-r--r--package.json2
-rw-r--r--src/client/views/DocumentDecorations.tsx51
3 files changed, 287 insertions, 598 deletions
diff --git a/package-lock.json b/package-lock.json
index 3ebd0a0d0..3422cd9f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,10 +9,7 @@
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.1.tgz",
"integrity": "sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==",
"requires": {
-<<<<<<< HEAD
"regenerator-runtime": "^0.12.0"
-=======
- "regenerator-runtime": "0.12.1"
},
"dependencies": {
"regenerator-runtime": {
@@ -20,7 +17,6 @@
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
"integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
}
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"@fortawesome/fontawesome-common-types": {
@@ -33,7 +29,7 @@
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.13.tgz",
"integrity": "sha512-b+krVnqkdDt52Yfev0x0ZZgtxBQsLw00Zfa3uaVWIDzpNZVtrEXuxldUSUaN/ihgGhSNi8VpvDAdNPVgCKOSxw==",
"requires": {
- "@fortawesome/fontawesome-common-types": "0.1.7"
+ "@fortawesome/fontawesome-common-types": "^0.1.7"
},
"dependencies": {
"@fortawesome/fontawesome-common-types": {
@@ -48,11 +44,7 @@
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.15.tgz",
"integrity": "sha512-M/sHyl4g2VBtKYkay1Z+XImMyTVcaBPmehYtPw4HKD9zg2E7eovB7Yx98aUfZjPbroGqa+IL4/+KhWBMOGlHIQ==",
"requires": {
-<<<<<<< HEAD
- "@fortawesome/fontawesome-common-types": "^0.2.14"
-=======
- "@fortawesome/fontawesome-common-types": "0.2.15"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
+ "@fortawesome/fontawesome-common-types": "^0.2.15"
}
},
"@fortawesome/free-solid-svg-icons": {
@@ -60,7 +52,7 @@
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.7.2.tgz",
"integrity": "sha512-iujcXMyAvIbWM8W3jkOLpvJbR+rPpdN1QyqhZeJaLRdHPH4JmuovIAYP4vx5Sa1csZVXfRD1eDWqVZ/jGM620A==",
"requires": {
- "@fortawesome/fontawesome-common-types": "0.2.15"
+ "@fortawesome/fontawesome-common-types": "^0.2.15"
}
},
"@fortawesome/react-fontawesome": {
@@ -68,8 +60,8 @@
"resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.4.tgz",
"integrity": "sha512-GwmxQ+TK7PEdfSwvxtGnMCqrfEm0/HbRHArbUudsYiy9KzVCwndxa2KMcfyTQ8El0vROrq8gOOff09RF1oQe8g==",
"requires": {
- "humps": "2.0.1",
- "prop-types": "15.6.2"
+ "humps": "^2.0.1",
+ "prop-types": "^15.5.10"
}
},
"@icons/material": {
@@ -92,7 +84,7 @@
"resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.5.tgz",
"integrity": "sha512-xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==",
"requires": {
- "@types/babel-types": "7.0.6"
+ "@types/babel-types": "*"
}
},
"@types/bcrypt-nodejs": {
@@ -110,13 +102,8 @@
"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz",
"integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==",
"requires": {
-<<<<<<< HEAD
"@types/connect": "*",
"@types/node": "*"
-=======
- "@types/connect": "3.4.32",
- "@types/node": "10.12.29"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"@types/bson": {
@@ -124,7 +111,7 @@
"resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.0.tgz",
"integrity": "sha512-pq/rqJwJWkbS10crsG5bgnrisL8pML79KlMKQMoQwLUjlPAkrUHMvHJ3oGwE7WHR61Lv/nadMwXVAD2b+fpD8Q==",
"requires": {
- "@types/node": "10.12.29"
+ "@types/node": "*"
}
},
"@types/caseless": {
@@ -143,10 +130,7 @@
"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz",
"integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==",
"requires": {
-<<<<<<< HEAD
"@types/node": "*"
-=======
- "@types/node": "10.12.29"
}
},
"@types/connect-flash": {
@@ -154,8 +138,7 @@
"resolved": "https://registry.npmjs.org/@types/connect-flash/-/connect-flash-0.0.34.tgz",
"integrity": "sha512-QC93TwnTZ0sk//bfT81o7U4GOedbOZAcgvqi0v1vJqCESC8tqIVnhzB1CHiAUBUWFjoxG5JQF0TYaNa6DMb6Ig==",
"requires": {
- "@types/express": "4.16.1"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
+ "@types/express": "*"
}
},
"@types/express": {
@@ -173,8 +156,8 @@
"resolved": "https://registry.npmjs.org/@types/express-flash/-/express-flash-0.0.0.tgz",
"integrity": "sha512-zs1xXRIZOjghUBriJPSnhPmfDpqf/EQxT21ggi/9XZ9/RHYrUi+5vK2jnQrP2pD1abbuZvm7owLICiNCLBQzEQ==",
"requires": {
- "@types/connect-flash": "0.0.34",
- "@types/express": "4.16.1"
+ "@types/connect-flash": "*",
+ "@types/express": "*"
}
},
"@types/express-serve-static-core": {
@@ -182,13 +165,8 @@
"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.1.tgz",
"integrity": "sha512-QgbIMRU1EVRry5cIu1ORCQP4flSYqLM1lS5LYyGWfKnFT3E58f0gKto7BR13clBFVrVZ0G0rbLZ1hUpSkgQQOA==",
"requires": {
-<<<<<<< HEAD
"@types/node": "*",
"@types/range-parser": "*"
-=======
- "@types/node": "10.12.29",
- "@types/range-parser": "1.2.3"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"@types/express-session": {
@@ -196,8 +174,8 @@
"resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.15.12.tgz",
"integrity": "sha512-DHZXzWy6Nu5Ng0syXUiVFRpZ6/1DOXoTCWa6RG3itGrub2ioBYvgtDbkT6VHHNo3iOdHRROyWANsMBJVaflblQ==",
"requires": {
- "@types/express": "4.16.1",
- "@types/node": "10.12.29"
+ "@types/express": "*",
+ "@types/node": "*"
}
},
"@types/express-validator": {
@@ -205,7 +183,7 @@
"resolved": "https://registry.npmjs.org/@types/express-validator/-/express-validator-3.0.0.tgz",
"integrity": "sha512-LusnB0YhTXpBT25PXyGPQlK7leE1e41Vezq1hHEUwjfkopM1Pkv2X2Ppxqh9c+w/HZ6Udzki8AJotKNjDTGdkQ==",
"requires": {
- "express-validator": "5.3.1"
+ "express-validator": "*"
}
},
"@types/form-data": {
@@ -213,7 +191,7 @@
"resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
"integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
"requires": {
- "@types/node": "10.12.29"
+ "@types/node": "*"
}
},
"@types/jquery": {
@@ -229,7 +207,7 @@
"resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.3.0.tgz",
"integrity": "sha512-YKnUTR4VxwljbPORPrRon9E3uel1aD8nUdvzqArCCdMTWPvo0gnI2UZkwIHN2QATdj6HYXV/Iq3/KcecAO42Ww==",
"requires": {
- "@types/node": "10.12.29"
+ "@types/node": "*"
}
},
"@types/lodash": {
@@ -249,11 +227,7 @@
"integrity": "sha512-j5AcZo7dbMxHoOimcHEIh0JZe5e1b8q8AqGSpZJrYc7xOgCIP79cIjTdx5jSDLtySnQDwkDTqwlC7Xw7uXw7qg==",
"dev": true,
"requires": {
-<<<<<<< HEAD
"@types/node": "*"
-=======
- "@types/node": "10.12.29"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"@types/mime": {
@@ -272,8 +246,8 @@
"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.20.tgz",
"integrity": "sha512-tl9iKbhM8d9BQjhB/9L4KuyLxfEn9Weq6cBuM8C06fIuUJyyfk+5wlfwzvltvssuxjGY1GiHvZHmSTK8kJ1zwg==",
"requires": {
- "@types/bson": "4.0.0",
- "@types/node": "10.12.29"
+ "@types/bson": "*",
+ "@types/node": "*"
}
},
"@types/mongoose": {
@@ -281,8 +255,8 @@
"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.20.tgz",
"integrity": "sha512-KXD/wRaUkxA7NwU+0yp60WEFFmkhzJ4idGawycjUxFMTANIM7ZqlZsoXhHu3p33cg450D8PuwtAorFUwuMXLwA==",
"requires": {
- "@types/mongodb": "3.1.20",
- "@types/node": "10.12.29"
+ "@types/mongodb": "*",
+ "@types/node": "*"
}
},
"@types/node": {
@@ -300,7 +274,7 @@
"resolved": "https://registry.npmjs.org/@types/passport/-/passport-1.0.0.tgz",
"integrity": "sha512-R2FXqM+AgsMIym0PuKj08Ybx+GR6d2rU3b1/8OcHolJ+4ga2pRPX105wboV6hq1AJvMo2frQzYKdqXS5+4cyMw==",
"requires": {
- "@types/express": "4.16.1"
+ "@types/express": "*"
}
},
"@types/passport-local": {
@@ -308,9 +282,9 @@
"resolved": "https://registry.npmjs.org/@types/passport-local/-/passport-local-1.0.33.tgz",
"integrity": "sha512-+rn6ZIxje0jZ2+DAiWFI8vGG7ZFKB0hXx2cUdMmudSWsigSq6ES7Emso46r4HJk0qCgrZVfI8sJiM7HIYf4SbA==",
"requires": {
- "@types/express": "4.16.1",
- "@types/passport": "1.0.0",
- "@types/passport-strategy": "0.2.35"
+ "@types/express": "*",
+ "@types/passport": "*",
+ "@types/passport-strategy": "*"
}
},
"@types/passport-strategy": {
@@ -318,8 +292,8 @@
"resolved": "https://registry.npmjs.org/@types/passport-strategy/-/passport-strategy-0.2.35.tgz",
"integrity": "sha512-o5D19Jy2XPFoX2rKApykY15et3Apgax00RRLf0RUotPDUsYrQa7x4howLYr9El2mlUApHmCMv5CZ1IXqKFQ2+g==",
"requires": {
- "@types/express": "4.16.1",
- "@types/passport": "1.0.0"
+ "@types/express": "*",
+ "@types/passport": "*"
}
},
"@types/prop-types": {
@@ -376,9 +350,9 @@
"resolved": "https://registry.npmjs.org/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz",
"integrity": "sha512-+iUYq+pj2wVHSThj0MjNDzkkGwq8aDQ6j0UJK8a0cNCL8v44Ftcx1noGPtBIEUJgitH960VnfBNoTWfQoQZfRA==",
"requires": {
- "@types/orderedmap": "1.0.0",
- "@types/prosemirror-model": "1.7.0",
- "@types/prosemirror-state": "1.2.1"
+ "@types/orderedmap": "*",
+ "@types/prosemirror-model": "*",
+ "@types/prosemirror-state": "*"
}
},
"@types/prosemirror-state": {
@@ -433,7 +407,7 @@
"resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-2.14.1.tgz",
"integrity": "sha512-mIHKhPpN0tTnfmDXBzMw68ReFkDyzQWRUcDmJD13UA8L7vfjWATIZu1oM1BKW1eJdrUDdXFI6Cu5mJrV5Z/ZPw==",
"requires": {
- "@types/react": "16.8.1"
+ "@types/react": "*"
}
},
"@types/react-dom": {
@@ -466,10 +440,10 @@
"resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz",
"integrity": "sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==",
"requires": {
- "@types/caseless": "0.12.1",
- "@types/form-data": "2.2.1",
- "@types/node": "10.12.29",
- "@types/tough-cookie": "2.3.5"
+ "@types/caseless": "*",
+ "@types/form-data": "*",
+ "@types/node": "*",
+ "@types/tough-cookie": "*"
}
},
"@types/serve-static": {
@@ -491,7 +465,7 @@
"resolved": "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.2.tgz",
"integrity": "sha512-Ind+4qMNfQ62llyB4IMs1D8znMEBsMKohZBPqfBUIXqLQ9bdtWIbNTBWwtdcBWJKnokMZGcmWOOKslatni5vtA==",
"requires": {
- "@types/node": "10.12.29"
+ "@types/node": "*"
}
},
"@types/socket.io-client": {
@@ -537,11 +511,7 @@
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
"requires": {
-<<<<<<< HEAD
"@types/node": "*"
-=======
- "@types/node": "10.12.29"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"@types/webpack": {
@@ -549,19 +519,11 @@
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.24.tgz",
"integrity": "sha512-yg99CjvB7xZ/iuHrsZ7dkGKoq/FRDzqLzAxKh2EmTem6FWjzrty4FqCqBYuX5z+MFwSaaQGDAX4Q9HQkLjGLnQ==",
"requires": {
-<<<<<<< HEAD
"@types/anymatch": "*",
"@types/node": "*",
"@types/tapable": "*",
"@types/uglify-js": "*",
"source-map": "^0.6.0"
-=======
- "@types/anymatch": "1.3.1",
- "@types/node": "10.12.29",
- "@types/tapable": "1.0.4",
- "@types/uglify-js": "3.0.4",
- "source-map": "0.6.1"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
},
"dependencies": {
"source-map": {
@@ -807,7 +769,7 @@
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
"integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
"requires": {
- "acorn": "4.0.13"
+ "acorn": "^4.0.4"
},
"dependencies": {
"acorn": {
@@ -856,9 +818,9 @@
"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
"requires": {
- "kind-of": "3.2.2",
- "longest": "1.0.1",
- "repeat-string": "1.6.1"
+ "kind-of": "^3.0.2",
+ "longest": "^1.0.1",
+ "repeat-string": "^1.5.2"
},
"dependencies": {
"kind-of": {
@@ -866,7 +828,7 @@
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -1179,8 +1141,8 @@
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"requires": {
- "core-js": "2.6.4",
- "regenerator-runtime": "0.11.1"
+ "core-js": "^2.4.0",
+ "regenerator-runtime": "^0.11.0"
},
"dependencies": {
"regenerator-runtime": {
@@ -1195,10 +1157,10 @@
"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
"requires": {
- "babel-runtime": "6.26.0",
- "esutils": "2.0.2",
- "lodash": "4.17.11",
- "to-fast-properties": "1.0.3"
+ "babel-runtime": "^6.26.0",
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.4",
+ "to-fast-properties": "^1.0.3"
}
},
"babylon": {
@@ -1711,8 +1673,8 @@
"resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
"integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
"requires": {
- "align-text": "0.1.4",
- "lazy-cache": "1.0.4"
+ "align-text": "^0.1.3",
+ "lazy-cache": "^1.0.3"
}
},
"chai": {
@@ -1746,7 +1708,7 @@
"resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
"integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=",
"requires": {
- "is-regex": "1.0.4"
+ "is-regex": "^1.0.3"
}
},
"check-error": {
@@ -1837,7 +1799,7 @@
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
"integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
"requires": {
- "source-map": "0.6.1"
+ "source-map": "~0.6.0"
},
"dependencies": {
"source-map": {
@@ -2035,7 +1997,7 @@
"resolved": "https://registry.npmjs.org/connect-mongo/-/connect-mongo-2.0.3.tgz",
"integrity": "sha512-Vs+QZ/6X6gbCrP1Ls7Oh/wlyY6pgpbPSrUKF5yRT+zd+4GZPNbjNquxquZ+Clv2+03HBXE7T4lVM0PUcaBhihg==",
"requires": {
- "mongodb": "2.2.36"
+ "mongodb": "^2.0.36"
},
"dependencies": {
"mongodb": {
@@ -2053,8 +2015,8 @@
"resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.20.tgz",
"integrity": "sha512-IN57CX5/Q1bhDq6ShAR6gIv4koFsZP7L8WOK1S0lR0pVDQaScffSMV5jxubLsmZ7J+UdqmykKw4r9hG3XQEGgQ==",
"requires": {
- "bson": "1.0.9",
- "require_optional": "1.0.1"
+ "bson": "~1.0.4",
+ "require_optional": "~1.0.0"
}
},
"process-nextick-args": {
@@ -2067,13 +2029,13 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz",
"integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=",
"requires": {
- "buffer-shims": "1.0.0",
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "1.0.7",
- "string_decoder": "1.0.3",
- "util-deprecate": "1.0.2"
+ "buffer-shims": "~1.0.0",
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~1.0.6",
+ "string_decoder": "~1.0.0",
+ "util-deprecate": "~1.0.1"
}
},
"string_decoder": {
@@ -2081,7 +2043,7 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
"requires": {
- "safe-buffer": "5.1.2"
+ "safe-buffer": "~5.1.0"
}
}
}
@@ -2105,10 +2067,10 @@
"resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz",
"integrity": "sha512-yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==",
"requires": {
- "@types/babel-types": "7.0.6",
- "@types/babylon": "6.16.5",
- "babel-types": "6.26.0",
- "babylon": "6.18.0"
+ "@types/babel-types": "^7.0.0",
+ "@types/babylon": "^6.16.2",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0"
}
},
"constants-browserify": {
@@ -2694,7 +2656,7 @@
"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
"integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
"requires": {
- "safe-buffer": "5.1.2"
+ "safe-buffer": "^5.0.1"
}
},
"ee-first": {
@@ -2746,12 +2708,12 @@
"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.3.2.tgz",
"integrity": "sha512-AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==",
"requires": {
- "accepts": "1.3.5",
+ "accepts": "~1.3.4",
"base64id": "1.0.0",
"cookie": "0.3.1",
- "debug": "3.1.0",
- "engine.io-parser": "2.1.3",
- "ws": "6.1.4"
+ "debug": "~3.1.0",
+ "engine.io-parser": "~2.1.0",
+ "ws": "~6.1.0"
},
"dependencies": {
"debug": {
@@ -2771,14 +2733,14 @@
"requires": {
"component-emitter": "1.2.1",
"component-inherit": "0.0.3",
- "debug": "3.1.0",
- "engine.io-parser": "2.1.3",
+ "debug": "~3.1.0",
+ "engine.io-parser": "~2.1.1",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
- "ws": "6.1.4",
- "xmlhttprequest-ssl": "1.5.5",
+ "ws": "~6.1.0",
+ "xmlhttprequest-ssl": "~1.5.4",
"yeast": "0.1.2"
},
"dependencies": {
@@ -2798,10 +2760,10 @@
"integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
"requires": {
"after": "0.8.2",
- "arraybuffer.slice": "0.0.7",
+ "arraybuffer.slice": "~0.0.7",
"base64-arraybuffer": "0.1.5",
"blob": "0.0.5",
- "has-binary2": "1.0.3"
+ "has-binary2": "~1.0.2"
}
},
"enhanced-resolve": {
@@ -3083,7 +3045,7 @@
"resolved": "https://registry.npmjs.org/express-flash/-/express-flash-0.0.2.tgz",
"integrity": "sha1-I9GovPP5DXB5KOSJ+Whp7K0KzaI=",
"requires": {
- "connect-flash": "0.1.1"
+ "connect-flash": "0.1.x"
}
},
"express-session": {
@@ -3095,10 +3057,10 @@
"cookie-signature": "1.0.6",
"crc": "3.4.4",
"debug": "2.6.9",
- "depd": "1.1.2",
- "on-headers": "1.0.1",
- "parseurl": "1.3.2",
- "uid-safe": "2.1.5",
+ "depd": "~1.1.1",
+ "on-headers": "~1.0.1",
+ "parseurl": "~1.3.2",
+ "uid-safe": "~2.1.5",
"utils-merge": "1.0.1"
}
},
@@ -3107,8 +3069,8 @@
"resolved": "https://registry.npmjs.org/express-validator/-/express-validator-5.3.1.tgz",
"integrity": "sha512-g8xkipBF6VxHbO1+ksC7nxUU7+pWif0+OZXjZTybKJ/V0aTVhuCoHbyhIPgSYVldwQLocGExPtB2pE0DqK4jsw==",
"requires": {
- "lodash": "4.17.11",
- "validator": "10.11.0"
+ "lodash": "^4.17.10",
+ "validator": "^10.4.0"
}
},
"expressjs": {
@@ -3234,18 +3196,11 @@
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.6.1.tgz",
"integrity": "sha1-lja3cF9bqWhNRLcveDISVK/IYPc=",
"requires": {
-<<<<<<< HEAD
"core-js": "^1.0.0",
"loose-envify": "^1.0.0",
"promise": "^7.0.3",
"ua-parser-js": "^0.7.9",
"whatwg-fetch": "^0.9.0"
-=======
- "core-js": "1.2.7",
- "loose-envify": "1.4.0",
- "promise": "7.3.1",
- "ua-parser-js": "0.7.19",
- "whatwg-fetch": "0.9.0"
},
"dependencies": {
"core-js": {
@@ -3253,7 +3208,6 @@
"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
}
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"figgy-pudding": {
@@ -3268,8 +3222,8 @@
"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
"dev": true,
"requires": {
- "loader-utils": "1.2.3",
- "schema-utils": "1.0.0"
+ "loader-utils": "^1.0.2",
+ "schema-utils": "^1.0.0"
}
},
"fill-range": {
@@ -3512,12 +3466,14 @@
"balanced-match": {
"version": "1.0.0",
"resolved": false,
- "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"resolved": false,
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3537,7 +3493,8 @@
"concat-map": {
"version": "0.0.1",
"resolved": false,
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
@@ -3685,6 +3642,7 @@
"version": "3.0.4",
"resolved": false,
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -4265,7 +4223,7 @@
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
"requires": {
- "function-bind": "1.1.1"
+ "function-bind": "^1.1.1"
}
},
"has-ansi": {
@@ -4801,8 +4759,8 @@
"resolved": "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz",
"integrity": "sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=",
"requires": {
- "acorn": "4.0.13",
- "object-assign": "4.1.1"
+ "acorn": "~4.0.2",
+ "object-assign": "^4.0.1"
},
"dependencies": {
"acorn": {
@@ -4929,7 +4887,7 @@
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
"requires": {
- "has": "1.0.3"
+ "has": "^1.0.1"
}
},
"is-retry-allowed": {
@@ -5059,15 +5017,15 @@
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz",
"integrity": "sha512-coyXjRTCy0pw5WYBpMvWOMN+Kjaik2MwTUIq9cna/W7NpO9E+iYbumZONAz3hcr+tXFJECoQVrtmIoC3Oz0gvg==",
"requires": {
- "jws": "3.2.1",
- "lodash.includes": "4.3.0",
- "lodash.isboolean": "3.0.3",
- "lodash.isinteger": "4.0.4",
- "lodash.isnumber": "3.0.3",
- "lodash.isplainobject": "4.0.6",
- "lodash.isstring": "4.0.1",
- "lodash.once": "4.1.1",
- "ms": "2.1.1"
+ "jws": "^3.1.5",
+ "lodash.includes": "^4.3.0",
+ "lodash.isboolean": "^3.0.3",
+ "lodash.isinteger": "^4.0.4",
+ "lodash.isnumber": "^3.0.3",
+ "lodash.isplainobject": "^4.0.6",
+ "lodash.isstring": "^4.0.1",
+ "lodash.once": "^4.0.0",
+ "ms": "^2.1.1"
},
"dependencies": {
"ms": {
@@ -5112,8 +5070,8 @@
"resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
"integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=",
"requires": {
- "is-promise": "2.1.0",
- "promise": "7.3.1"
+ "is-promise": "^2.0.0",
+ "promise": "^7.0.1"
}
},
"jsx-to-string": {
@@ -5144,7 +5102,7 @@
"requires": {
"buffer-equal-constant-time": "1.0.1",
"ecdsa-sig-formatter": "1.0.11",
- "safe-buffer": "5.1.2"
+ "safe-buffer": "^5.0.1"
}
},
"jws": {
@@ -5152,8 +5110,8 @@
"resolved": "https://registry.npmjs.org/jws/-/jws-3.2.1.tgz",
"integrity": "sha512-bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g==",
"requires": {
- "jwa": "1.4.0",
- "safe-buffer": "5.1.2"
+ "jwa": "^1.2.0",
+ "safe-buffer": "^5.0.1"
}
},
"kareem": {
@@ -5764,7 +5722,7 @@
"integrity": "sha512-sz2dhvBZQWf3LRNDhbd30KHVzdjZx9IKC0L+kSZ/gzYquCF5zPOgGqRz6sSCqYZtKP2ekB4nfLxhGtzGHnIKxA==",
"requires": {
"mongodb-core": "3.1.11",
- "safe-buffer": "5.1.2"
+ "safe-buffer": "^5.1.2"
},
"dependencies": {
"bson": {
@@ -5777,10 +5735,10 @@
"resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.1.11.tgz",
"integrity": "sha512-rD2US2s5qk/ckbiiGFHeu+yKYDXdJ1G87F6CG3YdaZpzdOm5zpoAZd/EKbPmFO6cQZ+XVXBXBJ660sSI0gc6qg==",
"requires": {
- "bson": "1.1.0",
- "require_optional": "1.0.1",
- "safe-buffer": "5.1.2",
- "saslprep": "1.0.2"
+ "bson": "^1.1.0",
+ "require_optional": "^1.0.1",
+ "safe-buffer": "^5.1.2",
+ "saslprep": "^1.0.0"
}
}
}
@@ -5791,7 +5749,7 @@
"integrity": "sha512-9aAg8M0YUmGHQRDYvsKJ02wx/Qaof1Jn2iDH21ZtWGAZpQt9uVLNEOdcBuzi+lPJwGbLYh2dphdKX0sZ+dXAJQ==",
"requires": {
"async": "2.6.1",
- "bson": "1.1.0",
+ "bson": "~1.1.0",
"kareem": "2.3.0",
"mongodb": "3.1.13",
"mongodb-core": "3.1.11",
@@ -5809,7 +5767,7 @@
"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
"requires": {
- "lodash": "4.17.11"
+ "lodash": "^4.17.10"
}
},
"bson": {
@@ -6161,7 +6119,6 @@
"resolved": "https://registry.npmjs.org/npm/-/npm-6.8.0.tgz",
"integrity": "sha512-xMH6V0OCSJ5ZET6yWPI3BmJSqMMCuVJSIcLx3LSH/SrratFSt6EDuCuGRFMQYty98Q1l6x/7vKmfURosoyWgrA==",
"requires": {
-<<<<<<< HEAD
"JSONStream": "^1.3.5",
"abbrev": "~1.1.1",
"ansicolors": "~0.3.2",
@@ -6231,22 +6188,22 @@
"move-concurrently": "^1.0.1",
"node-gyp": "^3.8.0",
"nopt": "~4.0.1",
- "normalize-package-data": "~2.4.0",
+ "normalize-package-data": "^2.5.0",
"npm-audit-report": "^1.3.2",
"npm-cache-filename": "~1.0.2",
"npm-install-checks": "~3.0.0",
"npm-lifecycle": "^2.1.0",
"npm-package-arg": "^6.1.0",
- "npm-packlist": "^1.2.0",
+ "npm-packlist": "^1.3.0",
"npm-pick-manifest": "^2.2.3",
"npm-profile": "*",
- "npm-registry-fetch": "^3.8.0",
+ "npm-registry-fetch": "^3.9.0",
"npm-user-validate": "~1.0.0",
"npmlog": "~4.1.2",
"once": "~1.4.0",
"opener": "^1.5.1",
"osenv": "^0.1.5",
- "pacote": "^9.4.0",
+ "pacote": "^9.4.1",
"path-is-inside": "~1.0.2",
"promise-inflight": "~1.0.1",
"qrcode-terminal": "^0.12.0",
@@ -6256,7 +6213,7 @@
"read-cmd-shim": "~1.0.1",
"read-installed": "~4.0.3",
"read-package-json": "^2.0.13",
- "read-package-tree": "^5.2.1",
+ "read-package-tree": "^5.2.2",
"readable-stream": "^3.1.1",
"readdir-scoped-modules": "*",
"request": "^2.88.0",
@@ -6273,119 +6230,6 @@
"tar": "^4.4.8",
"text-table": "~0.2.0",
"tiny-relative-date": "^1.3.0",
-=======
- "JSONStream": "1.3.5",
- "abbrev": "1.1.1",
- "ansicolors": "0.3.2",
- "ansistyles": "0.1.3",
- "aproba": "2.0.0",
- "archy": "1.0.0",
- "bin-links": "1.1.2",
- "bluebird": "3.5.3",
- "byte-size": "5.0.1",
- "cacache": "11.3.2",
- "call-limit": "1.1.0",
- "chownr": "1.1.1",
- "ci-info": "2.0.0",
- "cli-columns": "3.1.2",
- "cli-table3": "0.5.1",
- "cmd-shim": "2.0.2",
- "columnify": "1.5.4",
- "config-chain": "1.1.12",
- "debuglog": "1.0.1",
- "detect-indent": "5.0.0",
- "detect-newline": "2.1.0",
- "dezalgo": "1.0.3",
- "editor": "1.0.0",
- "figgy-pudding": "3.5.1",
- "find-npm-prefix": "1.0.2",
- "fs-vacuum": "1.2.10",
- "fs-write-stream-atomic": "1.0.10",
- "gentle-fs": "2.0.1",
- "glob": "7.1.3",
- "graceful-fs": "4.1.15",
- "has-unicode": "2.0.1",
- "hosted-git-info": "2.7.1",
- "iferr": "1.0.2",
- "imurmurhash": "0.1.4",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "ini": "1.3.5",
- "init-package-json": "1.10.3",
- "is-cidr": "3.0.0",
- "json-parse-better-errors": "1.0.2",
- "lazy-property": "1.0.0",
- "libcipm": "3.0.3",
- "libnpm": "2.0.1",
- "libnpmaccess": "3.0.1",
- "libnpmhook": "5.0.2",
- "libnpmorg": "1.0.0",
- "libnpmsearch": "2.0.0",
- "libnpmteam": "1.0.1",
- "libnpx": "10.2.0",
- "lock-verify": "2.0.2",
- "lockfile": "1.0.4",
- "lodash._baseindexof": "3.1.0",
- "lodash._baseuniq": "4.6.0",
- "lodash._bindcallback": "3.0.1",
- "lodash._cacheindexof": "3.0.2",
- "lodash._createcache": "3.1.2",
- "lodash._getnative": "3.9.1",
- "lodash.clonedeep": "4.5.0",
- "lodash.restparam": "3.6.1",
- "lodash.union": "4.6.0",
- "lodash.uniq": "4.5.0",
- "lodash.without": "4.4.0",
- "lru-cache": "4.1.5",
- "meant": "1.0.1",
- "mississippi": "3.0.0",
- "mkdirp": "0.5.1",
- "move-concurrently": "1.0.1",
- "node-gyp": "3.8.0",
- "nopt": "4.0.1",
- "normalize-package-data": "2.5.0",
- "npm-audit-report": "1.3.2",
- "npm-cache-filename": "1.0.2",
- "npm-install-checks": "3.0.0",
- "npm-lifecycle": "2.1.0",
- "npm-package-arg": "6.1.0",
- "npm-packlist": "1.3.0",
- "npm-pick-manifest": "2.2.3",
- "npm-profile": "4.0.1",
- "npm-registry-fetch": "3.9.0",
- "npm-user-validate": "1.0.0",
- "npmlog": "4.1.2",
- "once": "1.4.0",
- "opener": "1.5.1",
- "osenv": "0.1.5",
- "pacote": "9.4.1",
- "path-is-inside": "1.0.2",
- "promise-inflight": "1.0.1",
- "qrcode-terminal": "0.12.0",
- "query-string": "6.2.0",
- "qw": "1.0.1",
- "read": "1.0.7",
- "read-cmd-shim": "1.0.1",
- "read-installed": "4.0.3",
- "read-package-json": "2.0.13",
- "read-package-tree": "5.2.2",
- "readable-stream": "3.1.1",
- "readdir-scoped-modules": "1.0.2",
- "request": "2.88.0",
- "retry": "0.12.0",
- "rimraf": "2.6.3",
- "safe-buffer": "5.1.2",
- "semver": "5.6.0",
- "sha": "2.0.1",
- "slide": "1.1.6",
- "sorted-object": "2.0.1",
- "sorted-union-stream": "2.1.3",
- "ssri": "6.0.1",
- "stringify-package": "1.0.0",
- "tar": "4.4.8",
- "text-table": "0.2.0",
- "tiny-relative-date": "1.3.0",
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
"uid-number": "0.0.6",
"umask": "~1.1.0",
"unique-filename": "^1.1.1",
@@ -7652,19 +7496,8 @@
},
"ip-regex": {
"version": "2.1.0",
-<<<<<<< HEAD
- "bundled": true
- },
- "is-builtin-module": {
- "version": "1.0.0",
- "bundled": true,
- "requires": {
- "builtin-modules": "^1.0.0"
- }
-=======
"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
"integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
},
"is-ci": {
"version": "1.1.0",
@@ -7827,23 +7660,6 @@
"resolved": "https://registry.npmjs.org/libcipm/-/libcipm-3.0.3.tgz",
"integrity": "sha512-71V5CpTI+zFydTc5IjJ/tx8JHbXEJvmYF2zaSVW1V3X1rRnRjXqh44iuiyry1xgi3ProUQ1vX1uwFiWs00+2og==",
"requires": {
-<<<<<<< HEAD
- "bin-links": "^1.1.2",
- "bluebird": "^3.5.1",
- "figgy-pudding": "^3.5.1",
- "find-npm-prefix": "^1.0.2",
- "graceful-fs": "^4.1.11",
- "ini": "^1.3.5",
- "lock-verify": "^2.0.2",
- "mkdirp": "^0.5.1",
- "npm-lifecycle": "^2.0.3",
- "npm-logical-tree": "^1.2.1",
- "npm-package-arg": "^6.1.0",
- "pacote": "^9.1.0",
- "read-package-json": "^2.0.13",
- "rimraf": "^2.6.2",
- "worker-farm": "^1.6.0"
-=======
"bin-links": "1.1.2",
"bluebird": "3.5.3",
"figgy-pudding": "3.5.1",
@@ -7859,7 +7675,6 @@
"read-package-json": "2.0.13",
"rimraf": "2.6.3",
"worker-farm": "1.6.0"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"libnpm": {
@@ -7867,28 +7682,6 @@
"resolved": "https://registry.npmjs.org/libnpm/-/libnpm-2.0.1.tgz",
"integrity": "sha512-qTKoxyJvpBxHZQB6k0AhSLajyXq9ZE/lUsZzuHAplr2Bpv9G+k4YuYlExYdUCeVRRGqcJt8hvkPh4tBwKoV98w==",
"requires": {
-<<<<<<< HEAD
- "bin-links": "^1.1.2",
- "bluebird": "^3.5.3",
- "find-npm-prefix": "^1.0.2",
- "libnpmaccess": "^3.0.1",
- "libnpmconfig": "^1.2.1",
- "libnpmhook": "^5.0.2",
- "libnpmorg": "^1.0.0",
- "libnpmpublish": "^1.1.0",
- "libnpmsearch": "^2.0.0",
- "libnpmteam": "^1.0.1",
- "lock-verify": "^2.0.2",
- "npm-lifecycle": "^2.1.0",
- "npm-logical-tree": "^1.2.1",
- "npm-package-arg": "^6.1.0",
- "npm-profile": "^4.0.1",
- "npm-registry-fetch": "^3.8.0",
- "npmlog": "^4.1.2",
- "pacote": "^9.2.3",
- "read-package-json": "^2.0.13",
- "stringify-package": "^1.0.0"
-=======
"bin-links": "1.1.2",
"bluebird": "3.5.3",
"find-npm-prefix": "1.0.2",
@@ -7909,7 +7702,6 @@
"pacote": "9.4.1",
"read-package-json": "2.0.13",
"stringify-package": "1.0.0"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"libnpmaccess": {
@@ -7917,17 +7709,10 @@
"resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-3.0.1.tgz",
"integrity": "sha512-RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA==",
"requires": {
-<<<<<<< HEAD
- "aproba": "^2.0.0",
- "get-stream": "^4.0.0",
- "npm-package-arg": "^6.1.0",
- "npm-registry-fetch": "^3.8.0"
-=======
"aproba": "2.0.0",
"get-stream": "4.1.0",
"npm-package-arg": "6.1.0",
"npm-registry-fetch": "3.9.0"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
},
"dependencies": {
"aproba": {
@@ -7992,17 +7777,10 @@
"resolved": "https://registry.npmjs.org/libnpmhook/-/libnpmhook-5.0.2.tgz",
"integrity": "sha512-vLenmdFWhRfnnZiNFPNMog6CK7Ujofy2TWiM2CrpZUjBRIhHkJeDaAbJdYCT6W4lcHtyrJR8yXW8KFyq6UAp1g==",
"requires": {
-<<<<<<< HEAD
- "aproba": "^2.0.0",
- "figgy-pudding": "^3.4.1",
- "get-stream": "^4.0.0",
- "npm-registry-fetch": "^3.8.0"
-=======
"aproba": "2.0.0",
"figgy-pudding": "3.5.1",
"get-stream": "4.1.0",
"npm-registry-fetch": "3.9.0"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"libnpmorg": {
@@ -8010,17 +7788,10 @@
"resolved": "https://registry.npmjs.org/libnpmorg/-/libnpmorg-1.0.0.tgz",
"integrity": "sha512-o+4eVJBoDGMgRwh2lJY0a8pRV2c/tQM/SxlqXezjcAg26Qe9jigYVs+Xk0vvlYDWCDhP0g74J8UwWeAgsB7gGw==",
"requires": {
-<<<<<<< HEAD
- "aproba": "^2.0.0",
- "figgy-pudding": "^3.4.1",
- "get-stream": "^4.0.0",
- "npm-registry-fetch": "^3.8.0"
-=======
"aproba": "2.0.0",
"figgy-pudding": "3.5.1",
"get-stream": "4.1.0",
"npm-registry-fetch": "3.9.0"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
},
"dependencies": {
"aproba": {
@@ -8035,17 +7806,6 @@
"resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-1.1.1.tgz",
"integrity": "sha512-nefbvJd/wY38zdt+b9SHL6171vqBrMtZ56Gsgfd0duEKb/pB8rDT4/ObUQLrHz1tOfht1flt2zM+UGaemzAG5g==",
"requires": {
-<<<<<<< HEAD
- "aproba": "^2.0.0",
- "figgy-pudding": "^3.5.1",
- "get-stream": "^4.0.0",
- "lodash.clonedeep": "^4.5.0",
- "normalize-package-data": "^2.4.0",
- "npm-package-arg": "^6.1.0",
- "npm-registry-fetch": "^3.8.0",
- "semver": "^5.5.1",
- "ssri": "^6.0.1"
-=======
"aproba": "2.0.0",
"figgy-pudding": "3.5.1",
"get-stream": "4.1.0",
@@ -8055,7 +7815,6 @@
"npm-registry-fetch": "3.9.0",
"semver": "5.6.0",
"ssri": "6.0.1"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"libnpmsearch": {
@@ -8063,15 +7822,9 @@
"resolved": "https://registry.npmjs.org/libnpmsearch/-/libnpmsearch-2.0.0.tgz",
"integrity": "sha512-vd+JWbTGzOSfiOc+72MU6y7WqmBXn49egCCrIXp27iE/88bX8EpG64ST1blWQI1bSMUr9l1AKPMVsqa2tS5KWA==",
"requires": {
-<<<<<<< HEAD
- "figgy-pudding": "^3.5.1",
- "get-stream": "^4.0.0",
- "npm-registry-fetch": "^3.8.0"
-=======
"figgy-pudding": "3.5.1",
"get-stream": "4.1.0",
"npm-registry-fetch": "3.9.0"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"libnpmteam": {
@@ -8079,17 +7832,10 @@
"resolved": "https://registry.npmjs.org/libnpmteam/-/libnpmteam-1.0.1.tgz",
"integrity": "sha512-gDdrflKFCX7TNwOMX1snWojCoDE5LoRWcfOC0C/fqF7mBq8Uz9zWAX4B2RllYETNO7pBupBaSyBDkTAC15cAMg==",
"requires": {
-<<<<<<< HEAD
- "aproba": "^2.0.0",
- "figgy-pudding": "^3.4.1",
- "get-stream": "^4.0.0",
- "npm-registry-fetch": "^3.8.0"
-=======
"aproba": "2.0.0",
"figgy-pudding": "3.5.1",
"get-stream": "4.1.0",
"npm-registry-fetch": "3.9.0"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
},
"dependencies": {
"aproba": {
@@ -8443,12 +8189,6 @@
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
"requires": {
-<<<<<<< HEAD
- "hosted-git-info": "^2.1.4",
- "is-builtin-module": "^1.0.0",
- "semver": "2 || 3 || 4 || 5",
- "validate-npm-package-license": "^3.0.1"
-=======
"hosted-git-info": "2.7.1",
"resolve": "1.10.0",
"semver": "5.6.0",
@@ -8463,7 +8203,6 @@
"path-parse": "1.0.6"
}
}
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"npm-audit-report": {
@@ -8529,13 +8268,8 @@
"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz",
"integrity": "sha512-qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA==",
"requires": {
-<<<<<<< HEAD
"ignore-walk": "^3.0.1",
"npm-bundled": "^1.0.1"
-=======
- "ignore-walk": "3.0.1",
- "npm-bundled": "1.0.6"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"npm-pick-manifest": {
@@ -8553,15 +8287,9 @@
"resolved": "https://registry.npmjs.org/npm-profile/-/npm-profile-4.0.1.tgz",
"integrity": "sha512-NQ1I/1Q7YRtHZXkcuU1/IyHeLy6pd+ScKg4+DQHdfsm769TGq6HPrkbuNJVJS4zwE+0mvvmeULzQdWn2L2EsVA==",
"requires": {
-<<<<<<< HEAD
- "aproba": "^1.1.2 || 2",
- "figgy-pudding": "^3.4.1",
- "npm-registry-fetch": "^3.8.0"
-=======
"aproba": "2.0.0",
"figgy-pudding": "3.5.1",
"npm-registry-fetch": "3.9.0"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"npm-registry-fetch": {
@@ -8700,7 +8428,6 @@
"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.1.tgz",
"integrity": "sha512-YKSRsQqmeHxgra0KCdWA2FtVxDPUlBiCdmew+mSe44pzlx5t1ViRMWiQg18T+DREA+vSqYfKzynaToFR4hcKHw==",
"requires": {
-<<<<<<< HEAD
"bluebird": "^3.5.3",
"cacache": "^11.3.2",
"figgy-pudding": "^3.5.1",
@@ -8728,35 +8455,6 @@
"tar": "^4.4.8",
"unique-filename": "^1.1.1",
"which": "^1.3.1"
-=======
- "bluebird": "3.5.3",
- "cacache": "11.3.2",
- "figgy-pudding": "3.5.1",
- "get-stream": "4.1.0",
- "glob": "7.1.3",
- "lru-cache": "5.1.1",
- "make-fetch-happen": "4.0.1",
- "minimatch": "3.0.4",
- "minipass": "2.3.5",
- "mississippi": "3.0.0",
- "mkdirp": "0.5.1",
- "normalize-package-data": "2.5.0",
- "npm-package-arg": "6.1.0",
- "npm-packlist": "1.3.0",
- "npm-pick-manifest": "2.2.3",
- "npm-registry-fetch": "3.9.0",
- "osenv": "0.1.5",
- "promise-inflight": "1.0.1",
- "promise-retry": "1.1.1",
- "protoduck": "5.0.1",
- "rimraf": "2.6.3",
- "safe-buffer": "5.1.2",
- "semver": "5.6.0",
- "ssri": "6.0.1",
- "tar": "4.4.8",
- "unique-filename": "1.1.1",
- "which": "1.3.1"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
},
"dependencies": {
"lru-cache": {
@@ -9031,19 +8729,11 @@
"resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz",
"integrity": "sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==",
"requires": {
-<<<<<<< HEAD
- "glob": "^7.1.1",
- "graceful-fs": "^4.1.2",
- "json-parse-better-errors": "^1.0.1",
- "normalize-package-data": "^2.0.0",
- "slash": "^1.0.0"
-=======
"glob": "7.1.3",
"graceful-fs": "4.1.15",
"json-parse-better-errors": "1.0.2",
"normalize-package-data": "2.5.0",
"slash": "1.0.0"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
}
},
"read-package-tree": {
@@ -10172,7 +9862,7 @@
"resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
"integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
"requires": {
- "better-assert": "1.0.2"
+ "better-assert": "~1.0.0"
}
},
"parseuri": {
@@ -10180,7 +9870,7 @@
"resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
"integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
"requires": {
- "better-assert": "1.0.2"
+ "better-assert": "~1.0.0"
}
},
"parseurl": {
@@ -10198,7 +9888,7 @@
"resolved": "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz",
"integrity": "sha1-xQlWkTR71a07XhgCOMORTRbwWBE=",
"requires": {
- "passport-strategy": "1.0.0",
+ "passport-strategy": "1.x.x",
"pause": "0.0.1"
}
},
@@ -10207,7 +9897,7 @@
"resolved": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz",
"integrity": "sha1-H+YyaMkudWBmJkN+O5BmYsFbpu4=",
"requires": {
- "passport-strategy": "1.0.0"
+ "passport-strategy": "1.x.x"
}
},
"passport-strategy": {
@@ -10298,8 +9988,8 @@
"resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz",
"integrity": "sha512-Jy7o1wE3NezPxozexSbq4ltuLT0Z21ew/qrEiAEeUZzHxMHGk4DUV1D7RuCXg5vJDvHmjX1YssN+we9QfRRgXQ==",
"requires": {
- "node-ensure": "0.0.0",
- "worker-loader": "2.0.0"
+ "node-ensure": "^0.0.0",
+ "worker-loader": "^2.0.0"
}
},
"performance-now": {
@@ -10525,9 +10215,9 @@
"resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.1.1.tgz",
"integrity": "sha512-GeUyMO/tOEf8MXrP7Xb7UIMrfK86OGh0fnyBrHfhav4VjY9cw65mNoqHy87CklE5711AhCP5Qzfp8RL/hVKusg==",
"requires": {
- "prosemirror-state": "1.2.2",
- "prosemirror-transform": "1.1.3",
- "prosemirror-view": "1.7.1"
+ "prosemirror-state": "^1.0.0",
+ "prosemirror-transform": "^1.1.0",
+ "prosemirror-view": "^1.1.0"
}
},
"prosemirror-example-setup": {
@@ -10535,15 +10225,15 @@
"resolved": "https://registry.npmjs.org/prosemirror-example-setup/-/prosemirror-example-setup-1.0.1.tgz",
"integrity": "sha512-4NKWpdmm75Zzgq/dIrypRnkBNPx+ONKyoGF42a9g3VIVv0TWglf1CBNxt5kzCgli9xdfut/xE5B42F9DR6BLHw==",
"requires": {
- "prosemirror-commands": "1.0.7",
- "prosemirror-dropcursor": "1.1.1",
- "prosemirror-gapcursor": "1.0.3",
- "prosemirror-history": "1.0.3",
- "prosemirror-inputrules": "1.0.1",
- "prosemirror-keymap": "1.0.1",
- "prosemirror-menu": "1.0.5",
- "prosemirror-schema-list": "1.0.2",
- "prosemirror-state": "1.2.2"
+ "prosemirror-commands": "^1.0.0",
+ "prosemirror-dropcursor": "^1.0.0",
+ "prosemirror-gapcursor": "^1.0.0",
+ "prosemirror-history": "^1.0.0",
+ "prosemirror-inputrules": "^1.0.0",
+ "prosemirror-keymap": "^1.0.0",
+ "prosemirror-menu": "^1.0.0",
+ "prosemirror-schema-list": "^1.0.0",
+ "prosemirror-state": "^1.0.0"
}
},
"prosemirror-gapcursor": {
@@ -10551,10 +10241,10 @@
"resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.3.tgz",
"integrity": "sha512-X+hJhr42PcHWiSWL+lI5f/UeOhXCxlBFb8M6O8aG1hssmaRrW7sS2/Fjg5jFV+pTdS1REFkmm1occh01FMdDIQ==",
"requires": {
- "prosemirror-keymap": "1.0.1",
- "prosemirror-model": "1.7.0",
- "prosemirror-state": "1.2.2",
- "prosemirror-view": "1.7.1"
+ "prosemirror-keymap": "^1.0.0",
+ "prosemirror-model": "^1.0.0",
+ "prosemirror-state": "^1.0.0",
+ "prosemirror-view": "^1.0.0"
}
},
"prosemirror-history": {
@@ -10572,8 +10262,8 @@
"resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.0.1.tgz",
"integrity": "sha512-UHy22NmwxS5WIMQYkzraDttQAF8mpP82FfbJsmKFfx6jwkR/SZa+ZhbkLY0zKQ5fBdJN7euj36JG/B5iAlrpxA==",
"requires": {
- "prosemirror-state": "1.2.2",
- "prosemirror-transform": "1.1.3"
+ "prosemirror-state": "^1.0.0",
+ "prosemirror-transform": "^1.0.0"
}
},
"prosemirror-keymap": {
@@ -10590,10 +10280,10 @@
"resolved": "https://registry.npmjs.org/prosemirror-menu/-/prosemirror-menu-1.0.5.tgz",
"integrity": "sha512-9Vrn7CC191v7FA4QrAkL8W1SrR73V3CRIYCDuk94R8oFVk4VxSFdoKVLHuvGzxZ8b5LCu3DMJfh86YW9uL4RkQ==",
"requires": {
- "crel": "3.1.0",
- "prosemirror-commands": "1.0.7",
- "prosemirror-history": "1.0.3",
- "prosemirror-state": "1.2.2"
+ "crel": "^3.0.0",
+ "prosemirror-commands": "^1.0.0",
+ "prosemirror-history": "^1.0.0",
+ "prosemirror-state": "^1.0.0"
}
},
"prosemirror-model": {
@@ -10617,8 +10307,8 @@
"resolved": "https://registry.npmjs.org/prosemirror-schema-list/-/prosemirror-schema-list-1.0.2.tgz",
"integrity": "sha512-IJ4DEpUEymfO+NNA4DAgCMF39XiQqpmCoPYY3SXa1jYcVgObGpGfJlSjZYVFEpimoLI7/mLoOLDhCtpGCRhTfg==",
"requires": {
- "prosemirror-model": "1.7.0",
- "prosemirror-transform": "1.1.3"
+ "prosemirror-model": "^1.0.0",
+ "prosemirror-transform": "^1.0.0"
}
},
"prosemirror-state": {
@@ -10684,12 +10374,12 @@
"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
"dev": true,
"requires": {
- "bn.js": "4.11.8",
- "browserify-rsa": "4.0.1",
- "create-hash": "1.2.0",
- "parse-asn1": "5.1.3",
- "randombytes": "2.0.6",
- "safe-buffer": "5.1.2"
+ "bn.js": "^4.1.0",
+ "browserify-rsa": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "parse-asn1": "^5.0.0",
+ "randombytes": "^2.0.1",
+ "safe-buffer": "^5.1.2"
}
},
"pug": {
@@ -10697,14 +10387,14 @@
"resolved": "https://registry.npmjs.org/pug/-/pug-2.0.3.tgz",
"integrity": "sha1-ccuoJTfJWl6rftBGluQiH1Oqh44=",
"requires": {
- "pug-code-gen": "2.0.1",
- "pug-filters": "3.1.0",
- "pug-lexer": "4.0.0",
- "pug-linker": "3.0.5",
- "pug-load": "2.0.11",
- "pug-parser": "5.0.0",
- "pug-runtime": "2.0.4",
- "pug-strip-comments": "1.0.3"
+ "pug-code-gen": "^2.0.1",
+ "pug-filters": "^3.1.0",
+ "pug-lexer": "^4.0.0",
+ "pug-linker": "^3.0.5",
+ "pug-load": "^2.0.11",
+ "pug-parser": "^5.0.0",
+ "pug-runtime": "^2.0.4",
+ "pug-strip-comments": "^1.0.3"
}
},
"pug-attrs": {
@@ -10712,9 +10402,9 @@
"resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.3.tgz",
"integrity": "sha1-owlflw5kFR972tlX7vVftdeQXRU=",
"requires": {
- "constantinople": "3.1.2",
- "js-stringify": "1.0.2",
- "pug-runtime": "2.0.4"
+ "constantinople": "^3.0.1",
+ "js-stringify": "^1.0.1",
+ "pug-runtime": "^2.0.4"
}
},
"pug-code-gen": {
@@ -10722,14 +10412,14 @@
"resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.1.tgz",
"integrity": "sha1-CVHsgyJddNjPxHan+Zolm199BQw=",
"requires": {
- "constantinople": "3.1.2",
- "doctypes": "1.1.0",
- "js-stringify": "1.0.2",
- "pug-attrs": "2.0.3",
- "pug-error": "1.3.2",
- "pug-runtime": "2.0.4",
- "void-elements": "2.0.1",
- "with": "5.1.1"
+ "constantinople": "^3.0.1",
+ "doctypes": "^1.1.0",
+ "js-stringify": "^1.0.1",
+ "pug-attrs": "^2.0.3",
+ "pug-error": "^1.3.2",
+ "pug-runtime": "^2.0.4",
+ "void-elements": "^2.0.1",
+ "with": "^5.0.0"
}
},
"pug-error": {
@@ -10742,13 +10432,13 @@
"resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.0.tgz",
"integrity": "sha1-JxZVVbwEwjbkqisDZiRt+gIbYm4=",
"requires": {
- "clean-css": "4.2.1",
- "constantinople": "3.1.2",
+ "clean-css": "^4.1.11",
+ "constantinople": "^3.0.1",
"jstransformer": "1.0.0",
- "pug-error": "1.3.2",
- "pug-walk": "1.1.7",
- "resolve": "1.10.0",
- "uglify-js": "2.8.29"
+ "pug-error": "^1.3.2",
+ "pug-walk": "^1.1.7",
+ "resolve": "^1.1.6",
+ "uglify-js": "^2.6.1"
}
},
"pug-lexer": {
@@ -10756,9 +10446,9 @@
"resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.0.0.tgz",
"integrity": "sha1-IQwYRX7y4XYCQnQMXmR715TOwng=",
"requires": {
- "character-parser": "2.2.0",
- "is-expression": "3.0.0",
- "pug-error": "1.3.2"
+ "character-parser": "^2.1.1",
+ "is-expression": "^3.0.0",
+ "pug-error": "^1.3.2"
}
},
"pug-linker": {
@@ -10766,8 +10456,8 @@
"resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.5.tgz",
"integrity": "sha1-npp65ABWgtAn3uuWsAD4juuDoC8=",
"requires": {
- "pug-error": "1.3.2",
- "pug-walk": "1.1.7"
+ "pug-error": "^1.3.2",
+ "pug-walk": "^1.1.7"
}
},
"pug-load": {
@@ -10775,8 +10465,8 @@
"resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.11.tgz",
"integrity": "sha1-5kjlftET/iwfRdV4WOorrWvAFSc=",
"requires": {
- "object-assign": "4.1.1",
- "pug-walk": "1.1.7"
+ "object-assign": "^4.1.0",
+ "pug-walk": "^1.1.7"
}
},
"pug-parser": {
@@ -10784,7 +10474,7 @@
"resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.0.tgz",
"integrity": "sha1-45Stmz/KkxI5QK/4hcBuRKt+aOQ=",
"requires": {
- "pug-error": "1.3.2",
+ "pug-error": "^1.3.2",
"token-stream": "0.0.1"
}
},
@@ -10798,16 +10488,7 @@
"resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz",
"integrity": "sha1-8VWVkiBu3G+FMQ2s9K+0igJa9Z8=",
"requires": {
-<<<<<<< HEAD
- "bn.js": "^4.1.0",
- "browserify-rsa": "^4.0.0",
- "create-hash": "^1.1.0",
- "parse-asn1": "^5.0.0",
- "randombytes": "^2.0.1",
- "safe-buffer": "^5.1.2"
-=======
- "pug-error": "1.3.2"
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
+ "pug-error": "^1.3.2"
}
},
"pug-walk": {
@@ -10914,8 +10595,8 @@
"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
"requires": {
- "loader-utils": "1.2.3",
- "schema-utils": "1.0.0"
+ "loader-utils": "^1.1.0",
+ "schema-utils": "^1.0.0"
}
},
"rc": {
@@ -10945,26 +10626,17 @@
"scheduler": "^0.12.0"
}
},
- "react-contenteditable": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-3.2.6.tgz",
- "integrity": "sha512-jmr/wnuaU0teJ7U5ePUtEV4xDqaJS3jAFaXMF/3Dyr0COLV6gegcH0Yj727BdT7DnHWVoXVpR7m1s9hDgmSBTw==",
- "requires": {
- "@types/prop-types": "^15.5.6",
- "fast-deep-equal": "^2.0.1"
- }
- },
"react-color": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/react-color/-/react-color-2.17.0.tgz",
"integrity": "sha512-kJfE5tSaFe6GzalXOHksVjqwCPAsTl+nzS9/BWfP7j3EXbQ4IiLAF9sZGNzk3uq7HfofGYgjmcUgh0JP7xAQ0w==",
"requires": {
- "@icons/material": "0.2.4",
- "lodash": "4.17.11",
- "material-colors": "1.2.6",
- "prop-types": "15.6.2",
- "reactcss": "1.2.3",
- "tinycolor2": "1.4.1"
+ "@icons/material": "^0.2.4",
+ "lodash": ">4.17.4",
+ "material-colors": "^1.2.1",
+ "prop-types": "^15.5.10",
+ "reactcss": "^1.2.0",
+ "tinycolor2": "^1.4.1"
}
},
"react-dimensions": {
@@ -10991,8 +10663,8 @@
"resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-3.2.1.tgz",
"integrity": "sha512-r+3Bs9InID2lyIEbR8UIRVtpn4jgu1ArFEZgIy8vibJjijLSdNLX7rH9U68BBVD4RD9v44RXbaK4EHLyKXzNQw==",
"requires": {
- "classnames": "2.2.6",
- "prop-types": "15.6.2"
+ "classnames": "^2.2.5",
+ "prop-types": "^15.6.0"
}
},
"react-golden-layout": {
@@ -11069,12 +10741,12 @@
"resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-4.0.5.tgz",
"integrity": "sha512-hoIL08qU5pU1fNEx6NnLl3omD08LAUc+UkmxGXEql/PXiNWjMZHWlu8MSVg9pwSTN6dXtfky0gehrisWvSOrCg==",
"requires": {
- "@babel/runtime": "7.3.1",
- "lodash.once": "4.1.1",
- "make-event-props": "1.2.0",
- "merge-class-names": "1.1.1",
+ "@babel/runtime": "^7.0.0",
+ "lodash.once": "^4.1.1",
+ "make-event-props": "^1.1.0",
+ "merge-class-names": "^1.1.1",
"pdfjs-dist": "2.1.266",
- "prop-types": "15.6.2"
+ "prop-types": "^15.6.2"
}
},
"react-pdf-highlighter": {
@@ -11082,10 +10754,10 @@
"resolved": "https://registry.npmjs.org/react-pdf-highlighter/-/react-pdf-highlighter-2.1.2.tgz",
"integrity": "sha512-aKa/rzpFjOywcRmNyfupvrGdh7mp0VGS9RKCWDbD9p32+P3+DhJvQe/2qCvDAnTXa4LmabNqM+O0RDUcai1C1Q==",
"requires": {
- "lodash": "4.17.11",
+ "lodash": "^4.17.10",
"pdfjs-dist": "2.0.489",
- "react-pointable": "1.1.3",
- "react-rnd": "7.4.3"
+ "react-pointable": "^1.1.1",
+ "react-rnd": "^7.1.5"
},
"dependencies": {
"pdfjs-dist": {
@@ -11093,8 +10765,8 @@
"resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.0.489.tgz",
"integrity": "sha1-Y+VLKSqGeQpFRpfrRNQ0e4+/rSc=",
"requires": {
- "node-ensure": "0.0.0",
- "worker-loader": "1.1.1"
+ "node-ensure": "^0.0.0",
+ "worker-loader": "^1.1.1"
}
},
"schema-utils": {
@@ -11102,8 +10774,8 @@
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
"requires": {
- "ajv": "6.8.1",
- "ajv-keywords": "3.3.0"
+ "ajv": "^6.1.0",
+ "ajv-keywords": "^3.1.0"
}
},
"worker-loader": {
@@ -11111,8 +10783,8 @@
"resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-1.1.1.tgz",
"integrity": "sha512-qJZLVS/jMCBITDzPo/RuweYSIG8VJP5P67mP/71alGyTZRe1LYJFdwLjLalY3T5ifx0bMDRD3OB6P2p1escvlg==",
"requires": {
- "loader-utils": "1.2.3",
- "schema-utils": "0.4.7"
+ "loader-utils": "^1.0.0",
+ "schema-utils": "^0.4.0"
}
}
}
@@ -11130,8 +10802,8 @@
"resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.0.943.tgz",
"integrity": "sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==",
"requires": {
- "node-ensure": "0.0.0",
- "worker-loader": "2.0.0"
+ "node-ensure": "^0.0.0",
+ "worker-loader": "^2.0.0"
}
}
}
@@ -11147,7 +10819,7 @@
"integrity": "sha512-TLQ35nqXup7rC63qAETebbO6Znilr20CroTTeAdlYu8nvRSwB7BrmPKZhHB2GgeiSucOoeCyAA9pHPhbMpEd/Q==",
"requires": {
"re-resizable": "4.5.1",
- "react-draggable": "3.2.1"
+ "react-draggable": "^3.0.5"
}
},
"react-split-pane": {
@@ -11183,7 +10855,7 @@
"resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz",
"integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==",
"requires": {
- "lodash": "4.17.11"
+ "lodash": "^4.0.1"
}
},
"read-pkg": {
@@ -11389,8 +11061,8 @@
"resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
"integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
"requires": {
- "resolve-from": "2.0.0",
- "semver": "5.6.0"
+ "resolve-from": "^2.0.0",
+ "semver": "^5.1.0"
},
"dependencies": {
"resolve-from": {
@@ -11416,7 +11088,7 @@
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
"requires": {
- "path-parse": "1.0.6"
+ "path-parse": "^1.0.6"
}
},
"resolve-cwd": {
@@ -11459,7 +11131,7 @@
"resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
"integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
"requires": {
- "align-text": "0.1.4"
+ "align-text": "^0.1.1"
}
},
"rimraf": {
@@ -11518,7 +11190,7 @@
"integrity": "sha512-4cDsYuAjXssUSjxHKRe4DTZC0agDwsCqcMqtJAQPzC74nJ7LfAJflAtC1Zed5hMzEQKj82d3tuzqdGNRsLJ4Gw==",
"optional": true,
"requires": {
- "sparse-bitfield": "3.0.3"
+ "sparse-bitfield": "^3.0.3"
}
},
"sass-graph": {
@@ -11877,12 +11549,12 @@
"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz",
"integrity": "sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==",
"requires": {
- "debug": "4.1.1",
- "engine.io": "3.3.2",
- "has-binary2": "1.0.3",
- "socket.io-adapter": "1.1.1",
+ "debug": "~4.1.0",
+ "engine.io": "~3.3.1",
+ "has-binary2": "~1.0.2",
+ "socket.io-adapter": "~1.1.0",
"socket.io-client": "2.2.0",
- "socket.io-parser": "3.3.0"
+ "socket.io-parser": "~3.3.0"
},
"dependencies": {
"debug": {
@@ -11890,7 +11562,7 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
- "ms": "2.1.1"
+ "ms": "^2.1.1"
}
},
"ms": {
@@ -11914,15 +11586,15 @@
"base64-arraybuffer": "0.1.5",
"component-bind": "1.0.0",
"component-emitter": "1.2.1",
- "debug": "3.1.0",
- "engine.io-client": "3.3.2",
- "has-binary2": "1.0.3",
+ "debug": "~3.1.0",
+ "engine.io-client": "~3.3.1",
+ "has-binary2": "~1.0.2",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"object-component": "0.0.3",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
- "socket.io-parser": "3.3.0",
+ "socket.io-parser": "~3.3.0",
"to-array": "0.1.4"
},
"dependencies": {
@@ -11942,7 +11614,7 @@
"integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==",
"requires": {
"component-emitter": "1.2.1",
- "debug": "3.1.0",
+ "debug": "~3.1.0",
"isarray": "2.0.1"
},
"dependencies": {
@@ -12066,7 +11738,7 @@
"integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=",
"optional": true,
"requires": {
- "memory-pager": "1.5.0"
+ "memory-pager": "^1.0.2"
}
},
"spdx-correct": {
@@ -12825,9 +12497,9 @@
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
"requires": {
- "source-map": "0.5.7",
- "uglify-to-browserify": "1.0.2",
- "yargs": "3.10.0"
+ "source-map": "~0.5.1",
+ "uglify-to-browserify": "~1.0.0",
+ "yargs": "~3.10.0"
},
"dependencies": {
"camelcase": {
@@ -12840,8 +12512,8 @@
"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
"requires": {
- "center-align": "0.1.3",
- "right-align": "0.1.3",
+ "center-align": "^0.1.1",
+ "right-align": "^0.1.1",
"wordwrap": "0.0.2"
}
},
@@ -12855,9 +12527,9 @@
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"requires": {
- "camelcase": "1.2.1",
- "cliui": "2.1.0",
- "decamelize": "1.2.0",
+ "camelcase": "^1.0.2",
+ "cliui": "^2.1.0",
+ "decamelize": "^1.0.0",
"window-size": "0.1.0"
}
}
@@ -12874,7 +12546,7 @@
"resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
"integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
"requires": {
- "random-bytes": "1.0.0"
+ "random-bytes": "~1.0.0"
}
},
"undefsafe": {
@@ -13489,7 +13161,7 @@
"integrity": "sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==",
"dev": true,
"requires": {
- "memory-fs": "~0.4.1",
+ "memory-fs": "^0.4.1",
"mime": "^2.3.1",
"range-parser": "^1.0.3",
"webpack-log": "^2.0.0"
@@ -13935,8 +13607,8 @@
"resolved": "https://registry.npmjs.org/with/-/with-5.1.1.tgz",
"integrity": "sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=",
"requires": {
- "acorn": "3.3.0",
- "acorn-globals": "3.1.0"
+ "acorn": "^3.1.0",
+ "acorn-globals": "^3.0.0"
},
"dependencies": {
"acorn": {
@@ -13965,8 +13637,8 @@
"resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz",
"integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==",
"requires": {
- "loader-utils": "1.2.3",
- "schema-utils": "0.4.7"
+ "loader-utils": "^1.0.0",
+ "schema-utils": "^0.4.0"
},
"dependencies": {
"schema-utils": {
@@ -13974,8 +13646,8 @@
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
"requires": {
- "ajv": "6.8.1",
- "ajv-keywords": "3.3.0"
+ "ajv": "^6.1.0",
+ "ajv-keywords": "^3.1.0"
}
}
}
@@ -14009,7 +13681,7 @@
"resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
"integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
"requires": {
- "async-limiter": "1.0.0"
+ "async-limiter": "~1.0.0"
}
},
"xdg-basedir": {
diff --git a/package.json b/package.json
index e1a9cc6fb..f20f9d427 100644
--- a/package.json
+++ b/package.json
@@ -131,4 +131,4 @@
"url-loader": "^1.1.2",
"uuid": "^3.3.2"
}
-} \ No newline at end of file
+}
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index 3b2cd2626..84009907a 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -4,11 +4,15 @@ import { SelectionManager } from "../util/SelectionManager";
import { observer } from "mobx-react";
import './DocumentDecorations.scss'
import { CollectionFreeFormView } from "./collections/CollectionFreeFormView";
-import ContentEditable from 'react-contenteditable'
+//import ContentEditable from 'react-contenteditable'
import { KeyStore } from "../../fields/KeyStore";
import { NumberField } from "../../fields/NumberField";
import { Document } from "../../fields/Document";
import { DocumentView } from "./nodes/DocumentView";
+import { Key } from "../../fields/Key";
+import { TextField } from "../../fields/TextField";
+import { BasicField } from "../../fields/BasicField";
+import { Field, FieldValue } from "../../fields/Field";
@observer
export class DocumentDecorations extends React.Component<{}, { value: string }> {
@@ -17,23 +21,21 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
private _isPointerDown = false;
@observable private _opacity = 1;
private keyinput: React.RefObject<HTMLInputElement>;
- @observable private _documents: DocumentView[] = [];
+ private _documents: DocumentView[] = SelectionManager.SelectedDocuments();
//@observable private _title: string = this._documents[0].props.Document.Title;
- @observable private _title: string = document.title;
+ @observable private _title: string = this._documents.length > 0 ? this._documents[0].props.Document.Title : "";
+ @observable private _fieldKey: Key = KeyStore.Title;
constructor(props: Readonly<{}>) {
super(props)
DocumentDecorations.Instance = this
- this.state = { value: document.title };
this.handleChange = this.handleChange.bind(this);
this.keyinput = React.createRef();
}
@action
handleChange = (event: any) => {
- //this.setState({ value: event.target.value });
this._title = event.target.value;
- console.log("Input box has changed");
};
@action
@@ -44,19 +46,18 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
var text = e.target.value;
if (text[0] == '#') {
let command = text.slice(1, text.length);
- if (command == "Title" || command == "title") {
- this._title = this._documents[0].props.Document.Title;
- }
- else if (command == "Width" || command == "width") {
- this._title = this._documents[0].props.Document.GetNumber(KeyStore.Width, 0).toString();
- }
- else {
- this._title = "undefined key";
- }
+ this._fieldKey = new Key(command)
+ // if (command == "Title" || command == "title") {
+ // this._fieldKey = KeyStore.Title;
+ // }
+ // else if (command == "Width" || command == "width") {
+ // this._fieldKey = KeyStore.Width;
+ // }
+ this._title = "changed"
// TODO: Change field with switch statement
}
else {
- this._title = document.title;
+ this._title = "changed";
}
e.target.blur();
}
@@ -184,8 +185,24 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
}
}
+ getValue = (): string => {
+ console.log("value watched");
+ if (this._title === "changed" && this._documents.length > 0) {
+ let field = this._documents[0].props.Document.Get(this._fieldKey);
+ if (field instanceof TextField) {
+ return (field as TextField).GetValue();
+ }
+ else if (field instanceof NumberField) {
+ return (field as NumberField).GetValue().toString();
+ }
+ }
+ return this._title;
+ }
+
render() {
var bounds = this.Bounds;
+ // console.log(this._documents.length)
+ // let test = this._documents[0].props.Document.Title;
if (this.Hidden) {
return (null);
}
@@ -201,7 +218,7 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
top: bounds.y - 20 - 20,
opacity: this._opacity
}}>
- <input ref={this.keyinput} className="title" type="text" name="dynbox" value={this._title} onChange={this.handleChange} onPointerDown={this.onPointerDown} onKeyPress={this.enterPressed} />
+ <input ref={this.keyinput} className="title" type="text" name="dynbox" value={this.getValue()} onChange={this.handleChange} onPointerDown={this.onPointerDown} onKeyPress={this.enterPressed} />
<div id="documentDecorations-topLeftResizer" className="documentDecorations-resizer" onPointerDown={this.onPointerDown} onContextMenu={(e) => e.preventDefault()}></div>
<div id="documentDecorations-topResizer" className="documentDecorations-resizer" onPointerDown={this.onPointerDown} onContextMenu={(e) => e.preventDefault()}></div>
<div id="documentDecorations-topRightResizer" className="documentDecorations-resizer" onPointerDown={this.onPointerDown} onContextMenu={(e) => e.preventDefault()}></div>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-07 13:06:38 +0000