diff --git a/package-lock.json b/package-lock.json
index e7f7db3aea..de1a0326c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,12 +5,12 @@
"requires": true,
"dependencies": {
"@babel/code-frame": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz",
- "integrity": "sha512-cuAuTTIQ9RqcFRJ/Y8PvTh+paepNcaGxwQwjIDRWPXmzzyAeCO4KqS9ikMvq0MCbRk6GlYKwfzStrcP3/jSL8g==",
+ "version": "7.0.0-beta.54",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.54.tgz",
+ "integrity": "sha1-ACT5b99wKKIdaOJzr9TpUyFKHq0=",
"dev": true,
"requires": {
- "@babel/highlight": "7.0.0-beta.44"
+ "@babel/highlight": "7.0.0-beta.54"
}
},
"@babel/core": {
@@ -303,9 +303,9 @@
}
},
"@babel/highlight": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz",
- "integrity": "sha512-Il19yJvy7vMFm8AVAh6OZzaFoAd0hbkeMZiX3P5HGD+z7dyI7RzndHB0dg6Urh/VAFfHtpOIzDUSxmY6coyZWQ==",
+ "version": "7.0.0-beta.54",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.54.tgz",
+ "integrity": "sha1-FV1Qc1gym45waJcAF8P9dKmwhYQ=",
"dev": true,
"requires": {
"chalk": "^2.0.0",
@@ -1329,9 +1329,9 @@
}
},
"abab": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
- "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
+ "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==",
"dev": true
},
"abbrev": {
@@ -1724,12 +1724,12 @@
}
},
"append-transform": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
- "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
+ "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
"dev": true,
"requires": {
- "default-require-extensions": "^1.0.0"
+ "default-require-extensions": "^2.0.0"
}
},
"aproba": {
@@ -1907,12 +1907,20 @@
"dev": true
},
"async": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz",
- "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ=",
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+ "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
"dev": true,
"requires": {
- "lodash": "^4.14.0"
+ "lodash": "^4.17.10"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "4.17.10",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+ "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+ "dev": true
+ }
}
},
"async-each": {
@@ -1942,15 +1950,16 @@
"integrity": "sha512-SuiKH8vbsOyCALjA/+EINmt/Kdl+TQPrtFgW7XZZcwtryFu9e5kQoX3bjCW6mIvGH1fbeAZZuvwGR5IlBRznGw=="
},
"autoprefixer": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.0.0.tgz",
- "integrity": "sha512-bMt9puCb+xk5ds1ghr1zzfJ09+SjOcseHCEawhMjibM5KfxkodW8PQMhhEnllyj4Cz3Yixy9A+/0De2VC9R+dQ==",
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.0.1.tgz",
+ "integrity": "sha512-ytUcgSKu1mZh8pCJq54BkaK7ijigK+nhqVmu8PYOR00letCkrU71qTfKnzhQgn7by/QJvlJGUAofMt+jyXJTxA==",
+ "dev": true,
"requires": {
"browserslist": "^4.0.1",
"caniuse-lite": "^1.0.30000865",
"normalize-range": "^0.1.2",
"num2fraction": "^1.2.2",
- "postcss": "^7.0.0",
+ "postcss": "^7.0.1",
"postcss-value-parser": "^3.2.3"
},
"dependencies": {
@@ -1958,6 +1967,7 @@
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
"requires": {
"color-convert": "^1.9.0"
}
@@ -1966,6 +1976,7 @@
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.0.1.tgz",
"integrity": "sha512-QqiiIWchEIkney3wY53/huI7ZErouNAdvOkjorUALAwRcu3tEwOV3Sh6He0DnP38mz1JjBpCBb50jQBmaYuHPw==",
+ "dev": true,
"requires": {
"caniuse-lite": "^1.0.30000865",
"electron-to-chromium": "^1.3.52",
@@ -1976,6 +1987,7 @@
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
@@ -1983,9 +1995,10 @@
}
},
"postcss": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.0.tgz",
- "integrity": "sha512-ACgL/mXREjfCothsspfbxdiXIQowQeEyW7TJgsvAgCK8igWa2ZNCsbGNGnasbEF1++L9xb7qYpo23Aa3rGmiCg==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.1.tgz",
+ "integrity": "sha512-c6M68yZX0bWnZ0GcX8duWcfweGeGQvYgw6w4xksRePDmrpCrLMqneN07xwce17ACWBAr0S+DoI0T31axZ21TKg==",
+ "dev": true,
"requires": {
"chalk": "^2.4.1",
"source-map": "^0.6.1",
@@ -1995,12 +2008,14 @@
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
},
"supports-color": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+ "dev": true,
"requires": {
"has-flag": "^3.0.0"
}
@@ -2053,9 +2068,9 @@
}
},
"babel-core": {
- "version": "6.26.0",
- "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
- "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
+ "version": "6.26.3",
+ "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
"dev": true,
"requires": {
"babel-code-frame": "^6.26.0",
@@ -2068,15 +2083,15 @@
"babel-traverse": "^6.26.0",
"babel-types": "^6.26.0",
"babylon": "^6.18.0",
- "convert-source-map": "^1.5.0",
- "debug": "^2.6.8",
+ "convert-source-map": "^1.5.1",
+ "debug": "^2.6.9",
"json5": "^0.5.1",
"lodash": "^4.17.4",
"minimatch": "^3.0.4",
"path-is-absolute": "^1.0.1",
- "private": "^0.1.7",
+ "private": "^0.1.8",
"slash": "^1.0.0",
- "source-map": "^0.5.6"
+ "source-map": "^0.5.7"
}
},
"babel-generator": {
@@ -2106,13 +2121,13 @@
}
},
"babel-jest": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-22.4.3.tgz",
- "integrity": "sha512-BgSjmtl3mW3i+VeVHEr9d2zFSAT66G++pJcHQiUjd00pkW+voYXFctIm/indcqOWWXw5a1nUpR1XWszD9fJ1qg==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-22.4.4.tgz",
+ "integrity": "sha512-A9NB6/lZhYyypR9ATryOSDcqBaqNdzq4U+CN+/wcMsLcmKkPxQEoTKLajGfd3IkxNyVBT8NewUK2nWyGbSzHEQ==",
"dev": true,
"requires": {
"babel-plugin-istanbul": "^4.1.5",
- "babel-preset-jest": "^22.4.3"
+ "babel-preset-jest": "^22.4.4"
}
},
"babel-loader": {
@@ -2149,9 +2164,9 @@
}
},
"babel-plugin-jest-hoist": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz",
- "integrity": "sha512-zhvv4f6OTWy2bYevcJftwGCWXMFe7pqoz41IhMi4xna7xNsX5NygdagsrE0y6kkfuXq8UalwvPwKTyAxME2E/g==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.4.tgz",
+ "integrity": "sha512-DUvGfYaAIlkdnygVIEl0O4Av69NtuQWcrjMOv6DODPuhuGLDnbsARz3AwiiI/EkIMMlxQDUcrZ9yoyJvTNjcVQ==",
"dev": true
},
"babel-plugin-syntax-object-rest-spread": {
@@ -2161,12 +2176,12 @@
"dev": true
},
"babel-preset-jest": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-22.4.3.tgz",
- "integrity": "sha512-a+M3LTEXTq3gxv0uBN9Qm6ahUl7a8pj923nFbCUdqFUSsf3YrX8Uc+C3MEwji5Af3LiQjSC7w4ooYewlz8HRTA==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-22.4.4.tgz",
+ "integrity": "sha512-+dxMtOFwnSYWfum0NaEc0O03oSdwBsjx4tMSChRDPGwu/4wSY6Q6ANW3wkjKpJzzguaovRs/DODcT4hbSN8yiA==",
"dev": true,
"requires": {
- "babel-plugin-jest-hoist": "^22.4.3",
+ "babel-plugin-jest-hoist": "^22.4.4",
"babel-plugin-syntax-object-rest-spread": "^6.13.0"
}
},
@@ -2421,15 +2436,6 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
"dev": true
},
- "boom": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
- "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
- "dev": true,
- "requires": {
- "hoek": "4.x.x"
- }
- },
"boxen": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
@@ -2486,9 +2492,9 @@
"dev": true
},
"browser-resolve": {
- "version": "1.11.2",
- "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
- "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=",
+ "version": "1.11.3",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+ "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
"dev": true,
"requires": {
"resolve": "1.1.7"
@@ -2601,9 +2607,9 @@
}
},
"bson": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.6.tgz",
- "integrity": "sha512-D8zmlb46xfuK2gGvKmUjIklQEouN2nQ0LEHHeZ/NoHM2LDiMk2EYzZ5Ntw/Urk+bgMDosOZxaRzXxvhI5TcAVQ==",
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.9.tgz",
+ "integrity": "sha512-IQX9/h7WdMBIW/q/++tGd+emQr0XMdeZ6icnT/74Xk9fnabWn+gZgpE+9V+gujL3hhJOoNrnDVY7tWdzc7NUTg==",
"dev": true
},
"buffer": {
@@ -2784,7 +2790,17 @@
"caniuse-lite": {
"version": "1.0.30000865",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz",
- "integrity": "sha512-vs79o1mOSKRGv/1pSkp4EXgl4ZviWeYReXw60XfacPU64uQWZwJT6vZNmxRF9O+6zu71sJwMxLK5JXxbzuVrLw=="
+ "integrity": "sha512-vs79o1mOSKRGv/1pSkp4EXgl4ZviWeYReXw60XfacPU64uQWZwJT6vZNmxRF9O+6zu71sJwMxLK5JXxbzuVrLw==",
+ "dev": true
+ },
+ "capture-exit": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
+ "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
+ "dev": true,
+ "requires": {
+ "rsvp": "^3.3.3"
+ }
},
"capture-stack-trace": {
"version": "1.0.0",
@@ -2849,23 +2865,24 @@
"dev": true
},
"chokidar": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
- "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+ "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
"dev": true,
"requires": {
"anymatch": "^2.0.0",
"async-each": "^1.0.0",
"braces": "^2.3.0",
- "fsevents": "^1.1.2",
+ "fsevents": "^1.2.2",
"glob-parent": "^3.1.0",
"inherits": "^2.0.1",
"is-binary-path": "^1.0.0",
"is-glob": "^4.0.0",
+ "lodash.debounce": "^4.0.8",
"normalize-path": "^2.1.1",
"path-is-absolute": "^1.0.0",
"readdirp": "^2.0.0",
- "upath": "^1.0.0"
+ "upath": "^1.0.5"
},
"dependencies": {
"array-unique": {
@@ -3185,9 +3202,9 @@
"dev": true
},
"compare-versions": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.1.0.tgz",
- "integrity": "sha512-4hAxDSBypT/yp2ySFD346So6Ragw5xmBn/e/agIGl3bZr6DLUqnoRZPusxKrXdYRZpgexO9daejmIenlq/wrIQ==",
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.3.0.tgz",
+ "integrity": "sha512-MAAAIOdi2s4Gl6rZ76PNcUa9IOYB+5ICdT41o5uMRf09aEu/F9RK+qhe8RjXNPwcTjGV7KU7h2P/fljThFVqyQ==",
"dev": true
},
"component-emitter": {
@@ -3334,9 +3351,9 @@
"dev": true
},
"cookiejar": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
- "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+ "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
"dev": true
},
"copy-concurrently": {
@@ -3448,26 +3465,6 @@
"which": "^1.2.9"
}
},
- "cryptiles": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
- "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
- "dev": true,
- "requires": {
- "boom": "5.x.x"
- },
- "dependencies": {
- "boom": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
- "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
- "dev": true,
- "requires": {
- "hoek": "4.x.x"
- }
- }
- }
- },
"crypto-browserify": {
"version": "3.12.0",
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -3725,15 +3722,15 @@
}
},
"cssom": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
- "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz",
+ "integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==",
"dev": true
},
"cssstyle": {
- "version": "0.2.37",
- "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
- "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.0.0.tgz",
+ "integrity": "sha512-Bpuh47j2mRMY60X90mXaJAEtJwxvA2roZzbgwAXYhMbmwmakdRr4Cq9L5SkleKJNLOKqHIa2YWyOXDX3VgggSQ==",
"dev": true,
"requires": {
"cssom": "0.3.x"
@@ -3779,6 +3776,14 @@
"abab": "^1.0.4",
"whatwg-mimetype": "^2.0.0",
"whatwg-url": "^6.4.0"
+ },
+ "dependencies": {
+ "abab": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
+ "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
+ "dev": true
+ }
}
},
"date-now": {
@@ -3812,9 +3817,9 @@
"dev": true
},
"deep-extend": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
- "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
"dev": true
},
"deep-is": {
@@ -3824,12 +3829,20 @@
"dev": true
},
"default-require-extensions": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
- "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
+ "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
"dev": true,
"requires": {
- "strip-bom": "^2.0.0"
+ "strip-bom": "^3.0.0"
+ },
+ "dependencies": {
+ "strip-bom": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+ "dev": true
+ }
}
},
"define-properties": {
@@ -3944,13 +3957,6 @@
"repeating": "^2.0.0"
}
},
- "detect-libc": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
- "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
- "dev": true,
- "optional": true
- },
"detect-newline": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
@@ -4144,7 +4150,8 @@
"electron-to-chromium": {
"version": "1.3.52",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.52.tgz",
- "integrity": "sha1-0tnxJwuko7lnuDHEDvcftNmrXOA="
+ "integrity": "sha1-0tnxJwuko7lnuDHEDvcftNmrXOA=",
+ "dev": true
},
"elliptic": {
"version": "6.4.0",
@@ -4289,9 +4296,9 @@
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
"escodegen": {
- "version": "1.9.1",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
- "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+ "version": "1.11.0",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
+ "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
"dev": true,
"requires": {
"esprima": "^3.1.3",
@@ -4494,12 +4501,12 @@
}
},
"exec-sh": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz",
- "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==",
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+ "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
"dev": true,
"requires": {
- "merge": "^1.1.3"
+ "merge": "^1.2.0"
}
},
"execa": {
@@ -4793,14 +4800,14 @@
}
},
"fill-range": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
- "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
"dev": true,
"requires": {
"is-number": "^2.1.0",
"isobject": "^2.0.0",
- "randomatic": "^1.1.3",
+ "randomatic": "^3.0.0",
"repeat-element": "^1.1.2",
"repeat-string": "^1.5.2"
}
@@ -4963,16 +4970,6 @@
"readable-stream": "^2.0.0"
}
},
- "fs-minipass": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
- "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "minipass": "^2.2.1"
- }
- },
"fs-write-stream-atomic": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -4991,231 +4988,131 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"fsevents": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.0.tgz",
- "integrity": "sha512-ROrBIbmw4ulxmQTwYAAGyN/0xgIOAFd6gX/K3F1aGLP/K5KxkubrlGISMV5EEWEB7qtiEdE0HpaqvMMHR+Ib6w==",
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+ "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
"dev": true,
"optional": true,
"requires": {
"nan": "^2.9.2",
- "node-pre-gyp": "^0.9.0"
+ "node-pre-gyp": "^0.10.0"
},
"dependencies": {
"abbrev": {
- "version": "1.1.0",
- "bundled": true
- },
- "ajv": {
- "version": "4.11.8",
+ "version": "1.1.1",
"bundled": true,
- "requires": {
- "co": "^4.6.0",
- "json-stable-stringify": "^1.0.1"
- }
+ "dev": true,
+ "optional": true
},
"ansi-regex": {
"version": "2.1.1",
- "bundled": true
+ "bundled": true,
+ "dev": true
},
"aproba": {
- "version": "1.1.1",
- "bundled": true
+ "version": "1.2.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"are-we-there-yet": {
"version": "1.1.4",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
}
},
- "asn1": {
- "version": "0.2.3",
- "bundled": true
- },
- "assert-plus": {
- "version": "0.2.0",
- "bundled": true
- },
- "asynckit": {
- "version": "0.4.0",
- "bundled": true
- },
- "aws-sign2": {
- "version": "0.6.0",
- "bundled": true
- },
- "aws4": {
- "version": "1.6.0",
- "bundled": true
- },
"balanced-match": {
- "version": "0.4.2",
- "bundled": true
- },
- "bcrypt-pbkdf": {
- "version": "1.0.1",
+ "version": "1.0.0",
"bundled": true,
- "optional": true,
- "requires": {
- "tweetnacl": "^0.14.3"
- }
- },
- "block-stream": {
- "version": "0.0.9",
- "bundled": true,
- "requires": {
- "inherits": "~2.0.0"
- }
- },
- "boom": {
- "version": "2.10.1",
- "bundled": true,
- "requires": {
- "hoek": "2.x.x"
- }
+ "dev": true
},
"brace-expansion": {
- "version": "1.1.7",
+ "version": "1.1.11",
"bundled": true,
+ "dev": true,
"requires": {
- "balanced-match": "^0.4.1",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
- "buffer-shims": {
- "version": "1.0.0",
- "bundled": true
- },
- "caseless": {
- "version": "0.12.0",
- "bundled": true
- },
- "co": {
- "version": "4.6.0",
- "bundled": true
+ "chownr": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"code-point-at": {
"version": "1.1.0",
- "bundled": true
- },
- "combined-stream": {
- "version": "1.0.5",
"bundled": true,
- "requires": {
- "delayed-stream": "~1.0.0"
- }
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
- "bundled": true
+ "bundled": true,
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
- "bundled": true
+ "bundled": true,
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
- "bundled": true
- },
- "cryptiles": {
- "version": "2.0.5",
"bundled": true,
- "requires": {
- "boom": "2.x.x"
- }
- },
- "dashdash": {
- "version": "1.14.1",
- "bundled": true,
- "requires": {
- "assert-plus": "^1.0.0"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true
- }
- }
+ "dev": true,
+ "optional": true
},
"debug": {
- "version": "2.6.8",
+ "version": "2.6.9",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"ms": "2.0.0"
}
},
"deep-extend": {
- "version": "0.4.2",
- "bundled": true
- },
- "delayed-stream": {
- "version": "1.0.0",
- "bundled": true
+ "version": "0.5.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"delegates": {
"version": "1.0.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"detect-libc": {
- "version": "1.0.2",
- "bundled": true
- },
- "ecc-jsbn": {
- "version": "0.1.1",
+ "version": "1.0.3",
"bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "fs-minipass": {
+ "version": "1.2.5",
+ "bundled": true,
+ "dev": true,
"optional": true,
"requires": {
- "jsbn": "~0.1.0"
- }
- },
- "extend": {
- "version": "3.0.1",
- "bundled": true
- },
- "extsprintf": {
- "version": "1.0.2",
- "bundled": true
- },
- "forever-agent": {
- "version": "0.6.1",
- "bundled": true
- },
- "form-data": {
- "version": "2.1.4",
- "bundled": true,
- "requires": {
- "asynckit": "^0.4.0",
- "combined-stream": "^1.0.5",
- "mime-types": "^2.1.12"
+ "minipass": "^2.2.1"
}
},
"fs.realpath": {
"version": "1.0.0",
- "bundled": true
- },
- "fstream": {
- "version": "1.0.11",
"bundled": true,
- "requires": {
- "graceful-fs": "^4.1.2",
- "inherits": "~2.0.0",
- "mkdirp": ">=0.5 0",
- "rimraf": "2"
- }
- },
- "fstream-ignore": {
- "version": "1.0.5",
- "bundled": true,
- "requires": {
- "fstream": "^1.0.0",
- "inherits": "2",
- "minimatch": "^3.0.0"
- }
+ "dev": true,
+ "optional": true
},
"gauge": {
"version": "2.7.4",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
@@ -5227,22 +5124,11 @@
"wide-align": "^1.1.0"
}
},
- "getpass": {
- "version": "0.1.7",
- "bundled": true,
- "requires": {
- "assert-plus": "^1.0.0"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true
- }
- }
- },
"glob": {
"version": "7.1.2",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -5252,52 +5138,35 @@
"path-is-absolute": "^1.0.0"
}
},
- "graceful-fs": {
- "version": "4.1.11",
- "bundled": true
- },
- "har-schema": {
- "version": "1.0.5",
- "bundled": true
- },
- "har-validator": {
- "version": "4.2.1",
- "bundled": true,
- "requires": {
- "ajv": "^4.9.1",
- "har-schema": "^1.0.5"
- }
- },
"has-unicode": {
"version": "2.0.1",
- "bundled": true
- },
- "hawk": {
- "version": "3.1.3",
"bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "iconv-lite": {
+ "version": "0.4.21",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
- "boom": "2.x.x",
- "cryptiles": "2.x.x",
- "hoek": "2.x.x",
- "sntp": "1.x.x"
+ "safer-buffer": "^2.1.0"
}
},
- "hoek": {
- "version": "2.16.3",
- "bundled": true
- },
- "http-signature": {
- "version": "1.1.1",
+ "ignore-walk": {
+ "version": "3.0.1",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
- "assert-plus": "^0.2.0",
- "jsprim": "^1.2.2",
- "sshpk": "^1.7.0"
+ "minimatch": "^3.0.4"
}
},
"inflight": {
"version": "1.0.6",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
@@ -5305,123 +5174,134 @@
},
"inherits": {
"version": "2.0.3",
- "bundled": true
+ "bundled": true,
+ "dev": true
},
"ini": {
- "version": "1.3.4",
- "bundled": true
+ "version": "1.3.5",
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
+ "dev": true,
"requires": {
"number-is-nan": "^1.0.0"
}
},
- "is-typedarray": {
- "version": "1.0.0",
- "bundled": true
- },
"isarray": {
"version": "1.0.0",
- "bundled": true
- },
- "isstream": {
- "version": "0.1.2",
- "bundled": true
- },
- "jodid25519": {
- "version": "1.0.2",
- "bundled": true,
- "optional": true,
- "requires": {
- "jsbn": "~0.1.0"
- }
- },
- "jsbn": {
- "version": "0.1.1",
"bundled": true,
+ "dev": true,
"optional": true
},
- "json-schema": {
- "version": "0.2.3",
- "bundled": true
- },
- "json-stable-stringify": {
- "version": "1.0.1",
- "bundled": true,
- "requires": {
- "jsonify": "~0.0.0"
- }
- },
- "json-stringify-safe": {
- "version": "5.0.1",
- "bundled": true
- },
- "jsonify": {
- "version": "0.0.0",
- "bundled": true
- },
- "jsprim": {
- "version": "1.4.0",
- "bundled": true,
- "requires": {
- "assert-plus": "1.0.0",
- "extsprintf": "1.0.2",
- "json-schema": "0.2.3",
- "verror": "1.3.6"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true
- }
- }
- },
- "mime-db": {
- "version": "1.27.0",
- "bundled": true
- },
- "mime-types": {
- "version": "2.1.15",
- "bundled": true,
- "requires": {
- "mime-db": "~1.27.0"
- }
- },
"minimatch": {
"version": "3.0.4",
"bundled": true,
+ "dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
- "bundled": true
+ "bundled": true,
+ "dev": true
+ },
+ "minipass": {
+ "version": "2.2.4",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "safe-buffer": "^5.1.1",
+ "yallist": "^3.0.0"
+ }
+ },
+ "minizlib": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "minipass": "^2.2.1"
+ }
},
"mkdirp": {
"version": "0.5.1",
"bundled": true,
+ "dev": true,
"requires": {
"minimist": "0.0.8"
}
},
"ms": {
"version": "2.0.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "needle": {
+ "version": "2.2.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "debug": "^2.1.2",
+ "iconv-lite": "^0.4.4",
+ "sax": "^1.2.4"
+ }
+ },
+ "node-pre-gyp": {
+ "version": "0.10.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "detect-libc": "^1.0.2",
+ "mkdirp": "^0.5.1",
+ "needle": "^2.2.0",
+ "nopt": "^4.0.1",
+ "npm-packlist": "^1.1.6",
+ "npmlog": "^4.0.2",
+ "rc": "^1.1.7",
+ "rimraf": "^2.6.1",
+ "semver": "^5.3.0",
+ "tar": "^4"
+ }
},
"nopt": {
"version": "4.0.1",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"abbrev": "1",
"osenv": "^0.1.4"
}
},
- "npmlog": {
- "version": "4.1.0",
+ "npm-bundled": {
+ "version": "1.0.3",
"bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "npm-packlist": {
+ "version": "1.1.10",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ignore-walk": "^3.0.1",
+ "npm-bundled": "^1.0.1"
+ }
+ },
+ "npmlog": {
+ "version": "4.1.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
@@ -5431,34 +5311,40 @@
},
"number-is-nan": {
"version": "1.0.1",
- "bundled": true
- },
- "oauth-sign": {
- "version": "0.8.2",
- "bundled": true
+ "bundled": true,
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"once": {
"version": "1.4.0",
"bundled": true,
+ "dev": true,
"requires": {
"wrappy": "1"
}
},
"os-homedir": {
"version": "1.0.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"os-tmpdir": {
"version": "1.0.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"osenv": {
- "version": "0.1.4",
+ "version": "0.1.5",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
@@ -5466,29 +5352,23 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "bundled": true
- },
- "performance-now": {
- "version": "0.2.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"process-nextick-args": {
- "version": "1.0.7",
- "bundled": true
- },
- "punycode": {
- "version": "1.4.1",
- "bundled": true
- },
- "qs": {
- "version": "6.4.0",
- "bundled": true
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"rc": {
- "version": "1.2.1",
+ "version": "1.2.7",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
- "deep-extend": "~0.4.0",
+ "deep-extend": "^0.5.1",
"ini": "~1.3.0",
"minimist": "^1.2.0",
"strip-json-comments": "~2.0.1"
@@ -5496,105 +5376,75 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
}
}
},
"readable-stream": {
- "version": "2.2.9",
+ "version": "2.3.6",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
- "buffer-shims": "~1.0.0",
"core-util-is": "~1.0.0",
- "inherits": "~2.0.1",
+ "inherits": "~2.0.3",
"isarray": "~1.0.0",
- "process-nextick-args": "~1.0.6",
- "string_decoder": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
- "request": {
- "version": "2.81.0",
- "bundled": true,
- "requires": {
- "aws-sign2": "~0.6.0",
- "aws4": "^1.2.1",
- "caseless": "~0.12.0",
- "combined-stream": "~1.0.5",
- "extend": "~3.0.0",
- "forever-agent": "~0.6.1",
- "form-data": "~2.1.1",
- "har-validator": "~4.2.1",
- "hawk": "~3.1.3",
- "http-signature": "~1.1.0",
- "is-typedarray": "~1.0.0",
- "isstream": "~0.1.2",
- "json-stringify-safe": "~5.0.1",
- "mime-types": "~2.1.7",
- "oauth-sign": "~0.8.1",
- "performance-now": "^0.2.0",
- "qs": "~6.4.0",
- "safe-buffer": "^5.0.1",
- "stringstream": "~0.0.4",
- "tough-cookie": "~2.3.0",
- "tunnel-agent": "^0.6.0",
- "uuid": "^3.0.0"
- }
- },
"rimraf": {
- "version": "2.6.1",
+ "version": "2.6.2",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"glob": "^7.0.5"
}
},
"safe-buffer": {
- "version": "5.0.1",
- "bundled": true
+ "version": "5.1.1",
+ "bundled": true,
+ "dev": true
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "sax": {
+ "version": "1.2.4",
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"semver": {
- "version": "5.3.0",
- "bundled": true
+ "version": "5.5.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"set-blocking": {
"version": "2.0.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"signal-exit": {
"version": "3.0.2",
- "bundled": true
- },
- "sntp": {
- "version": "1.0.9",
"bundled": true,
- "requires": {
- "hoek": "2.x.x"
- }
- },
- "sshpk": {
- "version": "1.13.0",
- "bundled": true,
- "requires": {
- "asn1": "~0.2.3",
- "assert-plus": "^1.0.0",
- "bcrypt-pbkdf": "^1.0.0",
- "dashdash": "^1.12.0",
- "ecc-jsbn": "~0.1.1",
- "getpass": "^0.1.1",
- "jodid25519": "^1.0.0",
- "jsbn": "~0.1.0",
- "tweetnacl": "~0.14.0"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true
- }
- }
+ "dev": true,
+ "optional": true
},
"string-width": {
"version": "1.0.2",
"bundled": true,
+ "dev": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -5602,98 +5452,67 @@
}
},
"string_decoder": {
- "version": "1.0.1",
+ "version": "1.1.1",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
- "safe-buffer": "^5.0.1"
+ "safe-buffer": "~5.1.0"
}
},
- "stringstream": {
- "version": "0.0.5",
- "bundled": true
- },
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
+ "dev": true,
"requires": {
"ansi-regex": "^2.0.0"
}
},
"strip-json-comments": {
"version": "2.0.1",
- "bundled": true
- },
- "tar": {
- "version": "2.2.1",
- "bundled": true,
- "requires": {
- "block-stream": "*",
- "fstream": "^1.0.2",
- "inherits": "2"
- }
- },
- "tar-pack": {
- "version": "3.4.0",
- "bundled": true,
- "requires": {
- "debug": "^2.2.0",
- "fstream": "^1.0.10",
- "fstream-ignore": "^1.0.5",
- "once": "^1.3.3",
- "readable-stream": "^2.1.4",
- "rimraf": "^2.5.1",
- "tar": "^2.2.1",
- "uid-number": "^0.0.6"
- }
- },
- "tough-cookie": {
- "version": "2.3.2",
- "bundled": true,
- "requires": {
- "punycode": "^1.4.1"
- }
- },
- "tunnel-agent": {
- "version": "0.6.0",
- "bundled": true,
- "requires": {
- "safe-buffer": "^5.0.1"
- }
- },
- "tweetnacl": {
- "version": "0.14.5",
"bundled": true,
+ "dev": true,
"optional": true
},
- "uid-number": {
- "version": "0.0.6",
- "bundled": true
+ "tar": {
+ "version": "4.4.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chownr": "^1.0.1",
+ "fs-minipass": "^1.2.5",
+ "minipass": "^2.2.4",
+ "minizlib": "^1.1.0",
+ "mkdirp": "^0.5.0",
+ "safe-buffer": "^5.1.1",
+ "yallist": "^3.0.2"
+ }
},
"util-deprecate": {
"version": "1.0.2",
- "bundled": true
- },
- "uuid": {
- "version": "3.0.1",
- "bundled": true
- },
- "verror": {
- "version": "1.3.6",
"bundled": true,
- "requires": {
- "extsprintf": "1.0.2"
- }
+ "dev": true,
+ "optional": true
},
"wide-align": {
"version": "1.1.2",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"string-width": "^1.0.2"
}
},
"wrappy": {
"version": "1.0.2",
- "bundled": true
+ "bundled": true,
+ "dev": true
+ },
+ "yallist": {
+ "version": "3.0.2",
+ "bundled": true,
+ "dev": true
}
}
},
@@ -6068,18 +5887,6 @@
"minimalistic-assert": "^1.0.1"
}
},
- "hawk": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
- "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
- "dev": true,
- "requires": {
- "boom": "4.x.x",
- "cryptiles": "3.x.x",
- "hoek": "4.x.x",
- "sntp": "2.x.x"
- }
- },
"he": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
@@ -6125,12 +5932,6 @@
"minimalistic-crypto-utils": "^1.0.1"
}
},
- "hoek": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
- "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==",
- "dev": true
- },
"hoist-non-react-statics": {
"version": "2.5.5",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
@@ -6709,16 +6510,6 @@
"integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=",
"dev": true
},
- "ignore-walk": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
- "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "minimatch": "^3.0.4"
- }
- },
"import-cwd": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -7280,9 +7071,9 @@
}
},
"istanbul-lib-source-maps": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz",
- "integrity": "sha512-UzuK0g1wyQijiaYQxj/CdNycFhAd2TLtO2obKQMTZrZ1jzEMRY3rvpASEKkaxbRR6brvdovfA03znPa/pXcejg==",
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz",
+ "integrity": "sha512-8O2T/3VhrQHn0XcJbP1/GN7kXMiRAlPi+fj3uEHrjBD8Oz7Py0prSC25C09NuAZS6bgW1NNKAvCSHZXB0irSGA==",
"dev": true,
"requires": {
"debug": "^3.1.0",
@@ -7301,12 +7092,12 @@
"dev": true
},
"istanbul-lib-hook": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz",
- "integrity": "sha512-p3En6/oGkFQV55Up8ZPC2oLxvgSxD8CzA0yBrhRZSh3pfv3OFj9aSGVC0yoerAi/O4u7jUVnOGVX1eVFM+0tmQ==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz",
+ "integrity": "sha512-eLAMkPG9FU0v5L02lIkcj/2/Zlz9OuluaXikdr5iStk8FDbSwAixTK9TkYxbF0eNnzAJTwM2fkV2A1tpsIp4Jg==",
"dev": true,
"requires": {
- "append-transform": "^0.4.0"
+ "append-transform": "^1.0.0"
}
},
"istanbul-lib-instrument": {
@@ -7387,19 +7178,19 @@
}
},
"jest": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/jest/-/jest-22.4.3.tgz",
- "integrity": "sha512-FFCdU/pXOEASfHxFDOWUysI/+FFoqiXJADEIXgDKuZyqSmBD3tZ4BEGH7+M79v7czj7bbkhwtd2LaEDcJiM/GQ==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-22.4.4.tgz",
+ "integrity": "sha512-eBhhW8OS/UuX3HxgzNBSVEVhSuRDh39Z1kdYkQVWna+scpgsrD7vSeBI7tmEvsguPDMnfJodW28YBnhv/BzSew==",
"dev": true,
"requires": {
"import-local": "^1.0.0",
- "jest-cli": "^22.4.3"
+ "jest-cli": "^22.4.4"
},
"dependencies": {
"cliui": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz",
- "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
"dev": true,
"requires": {
"string-width": "^2.1.1",
@@ -7408,9 +7199,9 @@
}
},
"jest-cli": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-22.4.3.tgz",
- "integrity": "sha512-IiHybF0DJNqZPsbjn4Cy4vcqcmImpoFwNFnkehzVw8lTUSl4axZh5DHewu5bdpZF2Y5gUqFKYzH0FH4Qx2k+UA==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-22.4.4.tgz",
+ "integrity": "sha512-I9dsgkeyjVEEZj9wrGrqlH+8OlNob9Iptyl+6L5+ToOLJmHm4JwOPatin1b2Bzp5R5YRQJ+oiedx7o1H7wJzhA==",
"dev": true,
"requires": {
"ansi-escapes": "^3.0.0",
@@ -7424,20 +7215,20 @@
"istanbul-lib-coverage": "^1.1.1",
"istanbul-lib-instrument": "^1.8.0",
"istanbul-lib-source-maps": "^1.2.1",
- "jest-changed-files": "^22.4.3",
- "jest-config": "^22.4.3",
- "jest-environment-jsdom": "^22.4.3",
- "jest-get-type": "^22.4.3",
- "jest-haste-map": "^22.4.3",
- "jest-message-util": "^22.4.3",
- "jest-regex-util": "^22.4.3",
- "jest-resolve-dependencies": "^22.4.3",
- "jest-runner": "^22.4.3",
- "jest-runtime": "^22.4.3",
- "jest-snapshot": "^22.4.3",
- "jest-util": "^22.4.3",
- "jest-validate": "^22.4.3",
- "jest-worker": "^22.4.3",
+ "jest-changed-files": "^22.2.0",
+ "jest-config": "^22.4.4",
+ "jest-environment-jsdom": "^22.4.1",
+ "jest-get-type": "^22.1.0",
+ "jest-haste-map": "^22.4.2",
+ "jest-message-util": "^22.4.0",
+ "jest-regex-util": "^22.1.0",
+ "jest-resolve-dependencies": "^22.1.0",
+ "jest-runner": "^22.4.4",
+ "jest-runtime": "^22.4.4",
+ "jest-snapshot": "^22.4.0",
+ "jest-util": "^22.4.1",
+ "jest-validate": "^22.4.4",
+ "jest-worker": "^22.2.2",
"micromatch": "^2.3.11",
"node-notifier": "^5.2.1",
"realpath-native": "^1.0.0",
@@ -7481,22 +7272,22 @@
}
},
"jest-config": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-22.4.3.tgz",
- "integrity": "sha512-KSg3EOToCgkX+lIvenKY7J8s426h6ahXxaUFJxvGoEk0562Z6inWj1TnKoGycTASwiLD+6kSYFALcjdosq9KIQ==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-22.4.4.tgz",
+ "integrity": "sha512-9CKfo1GC4zrXSoMLcNeDvQBfgtqGTB1uP8iDIZ97oB26RCUb886KkKWhVcpyxVDOUxbhN+uzcBCeFe7w+Iem4A==",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"glob": "^7.1.1",
- "jest-environment-jsdom": "^22.4.3",
- "jest-environment-node": "^22.4.3",
- "jest-get-type": "^22.4.3",
- "jest-jasmine2": "^22.4.3",
- "jest-regex-util": "^22.4.3",
- "jest-resolve": "^22.4.3",
- "jest-util": "^22.4.3",
- "jest-validate": "^22.4.3",
- "pretty-format": "^22.4.3"
+ "jest-environment-jsdom": "^22.4.1",
+ "jest-environment-node": "^22.4.1",
+ "jest-get-type": "^22.1.0",
+ "jest-jasmine2": "^22.4.4",
+ "jest-regex-util": "^22.1.0",
+ "jest-resolve": "^22.4.2",
+ "jest-util": "^22.4.1",
+ "jest-validate": "^22.4.4",
+ "pretty-format": "^22.4.0"
}
},
"jest-diff": {
@@ -7563,21 +7354,21 @@
}
},
"jest-jasmine2": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-22.4.3.tgz",
- "integrity": "sha512-yZCPCJUcEY6R5KJB/VReo1AYI2b+5Ky+C+JA1v34jndJsRcLpU4IZX4rFJn7yDTtdNbO/nNqg+3SDIPNH2ecnw==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-22.4.4.tgz",
+ "integrity": "sha512-nK3vdUl50MuH7vj/8at7EQVjPGWCi3d5+6aCi7Gxy/XMWdOdbH1qtO/LjKbqD8+8dUAEH+BVVh7HkjpCWC1CSw==",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"co": "^4.6.0",
- "expect": "^22.4.3",
+ "expect": "^22.4.0",
"graceful-fs": "^4.1.11",
"is-generator-fn": "^1.0.0",
- "jest-diff": "^22.4.3",
- "jest-matcher-utils": "^22.4.3",
- "jest-message-util": "^22.4.3",
- "jest-snapshot": "^22.4.3",
- "jest-util": "^22.4.3",
+ "jest-diff": "^22.4.0",
+ "jest-matcher-utils": "^22.4.0",
+ "jest-message-util": "^22.4.0",
+ "jest-snapshot": "^22.4.0",
+ "jest-util": "^22.4.1",
"source-map-support": "^0.5.0"
}
},
@@ -7646,43 +7437,43 @@
}
},
"jest-runner": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-22.4.3.tgz",
- "integrity": "sha512-U7PLlQPRlWNbvOHWOrrVay9sqhBJmiKeAdKIkvX4n1G2tsvzLlf77nBD28GL1N6tGv4RmuTfI8R8JrkvCa+IBg==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-22.4.4.tgz",
+ "integrity": "sha512-5S/OpB51igQW9xnkM5Tgd/7ZjiAuIoiJAVtvVTBcEBiXBIFzWM3BAMPBM19FX68gRV0KWyFuGKj0EY3M3aceeQ==",
"dev": true,
"requires": {
"exit": "^0.1.2",
- "jest-config": "^22.4.3",
- "jest-docblock": "^22.4.3",
- "jest-haste-map": "^22.4.3",
- "jest-jasmine2": "^22.4.3",
- "jest-leak-detector": "^22.4.3",
- "jest-message-util": "^22.4.3",
- "jest-runtime": "^22.4.3",
- "jest-util": "^22.4.3",
- "jest-worker": "^22.4.3",
+ "jest-config": "^22.4.4",
+ "jest-docblock": "^22.4.0",
+ "jest-haste-map": "^22.4.2",
+ "jest-jasmine2": "^22.4.4",
+ "jest-leak-detector": "^22.4.0",
+ "jest-message-util": "^22.4.0",
+ "jest-runtime": "^22.4.4",
+ "jest-util": "^22.4.1",
+ "jest-worker": "^22.2.2",
"throat": "^4.0.0"
}
},
"jest-runtime": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-22.4.3.tgz",
- "integrity": "sha512-Eat/esQjevhx9BgJEC8udye+FfoJ2qvxAZfOAWshYGS22HydHn5BgsvPdTtt9cp0fSl5LxYOFA1Pja9Iz2Zt8g==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-22.4.4.tgz",
+ "integrity": "sha512-WRTj9m///npte1YjuphCYX7GRY/c2YvJImU9t7qOwFcqHr4YMzmX6evP/3Sehz5DKW2Vi8ONYPCFWe36JVXxfw==",
"dev": true,
"requires": {
"babel-core": "^6.0.0",
- "babel-jest": "^22.4.3",
+ "babel-jest": "^22.4.4",
"babel-plugin-istanbul": "^4.1.5",
"chalk": "^2.0.1",
"convert-source-map": "^1.4.0",
"exit": "^0.1.2",
"graceful-fs": "^4.1.11",
- "jest-config": "^22.4.3",
- "jest-haste-map": "^22.4.3",
- "jest-regex-util": "^22.4.3",
- "jest-resolve": "^22.4.3",
- "jest-util": "^22.4.3",
- "jest-validate": "^22.4.3",
+ "jest-config": "^22.4.4",
+ "jest-haste-map": "^22.4.2",
+ "jest-regex-util": "^22.1.0",
+ "jest-resolve": "^22.4.2",
+ "jest-util": "^22.4.1",
+ "jest-validate": "^22.4.4",
"json-stable-stringify": "^1.0.1",
"micromatch": "^2.3.11",
"realpath-native": "^1.0.0",
@@ -7693,9 +7484,9 @@
},
"dependencies": {
"cliui": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz",
- "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
"dev": true,
"requires": {
"string-width": "^2.1.1",
@@ -7781,16 +7572,16 @@
}
},
"jest-validate": {
- "version": "22.4.3",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-22.4.3.tgz",
- "integrity": "sha512-CfFM18W3GSP/xgmA4UouIx0ljdtfD2mjeBC6c89Gg17E44D4tQhAcTrZmf9djvipwU30kSTnk6CzcxdCCeSXfA==",
+ "version": "22.4.4",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-22.4.4.tgz",
+ "integrity": "sha512-dmlf4CIZRGvkaVg3fa0uetepcua44DHtktHm6rcoNVtYlpwe6fEJRkMFsaUVcFHLzbuBJ2cPw9Gl9TKfnzMVwg==",
"dev": true,
"requires": {
"chalk": "^2.0.1",
- "jest-config": "^22.4.3",
- "jest-get-type": "^22.4.3",
+ "jest-config": "^22.4.4",
+ "jest-get-type": "^22.1.0",
"leven": "^2.1.0",
- "pretty-format": "^22.4.3"
+ "pretty-format": "^22.4.0"
}
},
"jest-worker": {
@@ -7840,43 +7631,43 @@
"optional": true
},
"jsdom": {
- "version": "11.8.0",
- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.8.0.tgz",
- "integrity": "sha512-fZZSH6P8tVqYIQl0WKpZuQljPu2cW41Uj/c9omtyGwjwZCB8c82UAi7BSQs/F1FgWovmZsoU02z3k28eHp0Cdw==",
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+ "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
"dev": true,
"requires": {
- "abab": "^1.0.4",
- "acorn": "^5.3.0",
+ "abab": "^2.0.0",
+ "acorn": "^5.5.3",
"acorn-globals": "^4.1.0",
"array-equal": "^1.0.0",
"cssom": ">= 0.3.2 < 0.4.0",
- "cssstyle": ">= 0.2.37 < 0.3.0",
+ "cssstyle": "^1.0.0",
"data-urls": "^1.0.0",
- "domexception": "^1.0.0",
- "escodegen": "^1.9.0",
+ "domexception": "^1.0.1",
+ "escodegen": "^1.9.1",
"html-encoding-sniffer": "^1.0.2",
- "left-pad": "^1.2.0",
- "nwmatcher": "^1.4.3",
+ "left-pad": "^1.3.0",
+ "nwsapi": "^2.0.7",
"parse5": "4.0.0",
"pn": "^1.1.0",
- "request": "^2.83.0",
+ "request": "^2.87.0",
"request-promise-native": "^1.0.5",
"sax": "^1.2.4",
"symbol-tree": "^3.2.2",
- "tough-cookie": "^2.3.3",
+ "tough-cookie": "^2.3.4",
"w3c-hr-time": "^1.0.1",
"webidl-conversions": "^4.0.2",
"whatwg-encoding": "^1.0.3",
"whatwg-mimetype": "^2.1.0",
- "whatwg-url": "^6.4.0",
- "ws": "^4.0.0",
+ "whatwg-url": "^6.4.1",
+ "ws": "^5.2.0",
"xml-name-validator": "^3.0.0"
},
"dependencies": {
"acorn": {
- "version": "5.5.3",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
- "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+ "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
"dev": true
},
"acorn-globals": {
@@ -7967,9 +7758,9 @@
}
},
"kareem": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.0.6.tgz",
- "integrity": "sha512-/C+l8gABdHsAIfNpykJNWmYodpTnDRyn+JhORkP2VgEf1GgdAc+oTHjVADwISwCJKta031EOIwY6+Hki5z8SpQ==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.2.1.tgz",
+ "integrity": "sha512-xpDFy8OxkFM+vK6pXy6JmH92ibeEFUuDWzas5M9L7MzVmHW3jzwAHxodCPV/BYkf4A31bVDLyonrMfp9RXb/oA==",
"dev": true
},
"killable": {
@@ -8268,6 +8059,12 @@
"object-visit": "^1.0.0"
}
},
+ "math-random": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+ "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
+ "dev": true
+ },
"md5.js": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
@@ -8446,34 +8243,6 @@
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
},
- "minipass": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
- "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
- "dev": true,
- "requires": {
- "safe-buffer": "^5.1.1",
- "yallist": "^3.0.0"
- },
- "dependencies": {
- "yallist": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
- "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
- "dev": true
- }
- }
- },
- "minizlib": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
- "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
- "dev": true,
- "optional": true,
- "requires": {
- "minipass": "^2.2.1"
- }
- },
"mississippi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
@@ -8538,35 +8307,37 @@
}
},
"mongodb": {
- "version": "3.0.6",
- "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.6.tgz",
- "integrity": "sha512-nEg7SnzcyobArDTXEqvI1BasY6Z45h1lyBtVMCS9gRTkbtwrDn6WcLRa+MVRYufrJXxQPkAiYJQ94eCUzit0EQ==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.1.1.tgz",
+ "integrity": "sha512-GU9oWK4pi8PC7NyGiwjFMwZyMqwGWoMEMvM0LZh7UKW/FFAqgmZKjjriD+5MEOCDUJE2dtHX93/K5UtDxO0otg==",
"dev": true,
"requires": {
- "mongodb-core": "3.0.6"
+ "mongodb-core": "3.1.0"
}
},
"mongodb-core": {
- "version": "3.0.6",
- "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.6.tgz",
- "integrity": "sha512-EIaEyA4DEft4je4Hfa+CDswKdFhlev9V9o5KJo/nITgG6KNKz5Rxg5ZuMGEjGkMwFkydFQ3Kz0CxZ18AXhRrEg==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.1.0.tgz",
+ "integrity": "sha512-qRjG62Fu//CZhkgn0jA/k8jh5MhACIq8cOJUryH6sck87pgt+C222MSD02tsCq5zNo/B6ZFHtNodZ2qpf8E86g==",
"dev": true,
"requires": {
"bson": "~1.0.4",
- "require_optional": "^1.0.1"
+ "require_optional": "^1.0.1",
+ "saslprep": "^1.0.0"
}
},
"mongoose": {
- "version": "5.0.15",
- "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.0.15.tgz",
- "integrity": "sha512-S37I7V8nZE7JgPExgqb7zOKqezhvQP3JNa60rQEfVESvPkuan2gk/KoYeww7UK/gkKii8mR7OLyuzfRTa7rxxQ==",
+ "version": "5.2.5",
+ "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.2.5.tgz",
+ "integrity": "sha512-GmGJ+pL5l+flVpy9TImiY/snlZBydDRLBoL7D2Rqqd2vBf0BIZ+LB0IoPaG0JEKE1S5q6aJfjMaAunFF7d1z1w==",
"dev": true,
"requires": {
- "async": "2.1.4",
- "bson": "~1.0.4",
- "kareem": "2.0.6",
+ "async": "2.6.1",
+ "bson": "~1.0.5",
+ "kareem": "2.2.1",
"lodash.get": "4.4.2",
- "mongodb": "3.0.6",
+ "mongodb": "3.1.1",
+ "mongodb-core": "3.1.0",
"mongoose-legacy-pluralize": "1.0.2",
"mpath": "0.4.1",
"mquery": "3.0.0",
@@ -8695,18 +8466,6 @@
"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
"dev": true
},
- "needle": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz",
- "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==",
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "^2.1.2",
- "iconv-lite": "^0.4.4",
- "sax": "^1.2.4"
- }
- },
"negotiator": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -8987,29 +8746,11 @@
"which": "^1.3.0"
}
},
- "node-pre-gyp": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz",
- "integrity": "sha1-8RwHUW3ZL4cZnbx+GDjqt81WyeA=",
- "dev": true,
- "optional": true,
- "requires": {
- "detect-libc": "^1.0.2",
- "mkdirp": "^0.5.1",
- "needle": "^2.2.0",
- "nopt": "^4.0.1",
- "npm-packlist": "^1.1.6",
- "npmlog": "^4.0.2",
- "rc": "^1.1.7",
- "rimraf": "^2.6.1",
- "semver": "^5.3.0",
- "tar": "^4"
- }
- },
"node-releases": {
"version": "1.0.0-alpha.10",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.10.tgz",
"integrity": "sha512-BSQrRgOfN6L/MoKIa7pRUc7dHvflCXMcqyTBvphixcSsgJTuUd24vAFONuNfVsuwTyz28S1HEc9XN6ZKylk4Hg==",
+ "dev": true,
"requires": {
"semver": "^5.3.0"
}
@@ -9689,9 +9430,9 @@
}
},
"nodemon": {
- "version": "1.17.3",
- "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz",
- "integrity": "sha512-8AtS+wA5u6qoE12LONjqOzUzxAI5ObzSw6U5LgqpaO/0y6wwId4l5dN0ZulYyYdpLZD1MbkBp7GjG1hqaoRqYg==",
+ "version": "1.18.3",
+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz",
+ "integrity": "sha512-XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g==",
"dev": true,
"requires": {
"chokidar": "^2.0.2",
@@ -9727,14 +9468,12 @@
}
},
"nopt": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
- "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+ "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
"dev": true,
- "optional": true,
"requires": {
- "abbrev": "1",
- "osenv": "^0.1.4"
+ "abbrev": "1"
}
},
"normalize-package-data": {
@@ -9759,7 +9498,8 @@
"normalize-range": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
- "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
+ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+ "dev": true
},
"normalize-url": {
"version": "3.2.0",
@@ -9767,24 +9507,6 @@
"integrity": "sha512-WvF3Myk0NhXkG8S9bygFM4IC1KOvnVJGq0QoGeoqOYOBeinBZp5ybW3QuYbTc89lkWBMM9ZBO4QGRoc0353kKA==",
"dev": true
},
- "npm-bundled": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz",
- "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==",
- "dev": true,
- "optional": true
- },
- "npm-packlist": {
- "version": "1.1.10",
- "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz",
- "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
- "dev": true,
- "optional": true,
- "requires": {
- "ignore-walk": "^3.0.1",
- "npm-bundled": "^1.0.1"
- }
- },
"npm-run-all": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.3.tgz",
@@ -9903,17 +9625,18 @@
"num2fraction": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
- "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
+ "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+ "dev": true
},
"number-is-nan": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
},
- "nwmatcher": {
- "version": "1.4.4",
- "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz",
- "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==",
+ "nwsapi": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.7.tgz",
+ "integrity": "sha512-VZXniaaaORAXGCNsvUNefsKRQYk8zCzQZ57jalgrpHcU70OrAzKAiN/3plYtH/VPRmZeYyUzQiYfKzcMXC1g5Q==",
"dev": true
},
"oauth-sign": {
@@ -10944,7 +10667,8 @@
"postcss-value-parser": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
- "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU="
+ "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
+ "dev": true
},
"prelude-ls": {
"version": "1.1.2",
@@ -11268,43 +10992,27 @@
"dev": true
},
"randomatic": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
- "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
+ "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
"dev": true,
"requires": {
- "is-number": "^3.0.0",
- "kind-of": "^4.0.0"
+ "is-number": "^4.0.0",
+ "kind-of": "^6.0.0",
+ "math-random": "^1.0.1"
},
"dependencies": {
"is-number": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "dev": true,
- "requires": {
- "kind-of": "^3.0.2"
- },
- "dependencies": {
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+ "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+ "dev": true
},
"kind-of": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
- "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
- "dev": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
}
}
},
@@ -11372,12 +11080,12 @@
}
},
"rc": {
- "version": "1.2.6",
- "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz",
- "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=",
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
"dev": true,
"requires": {
- "deep-extend": "~0.4.0",
+ "deep-extend": "^0.6.0",
"ini": "~1.3.0",
"minimist": "^1.2.0",
"strip-json-comments": "~2.0.1"
@@ -11537,9 +11245,9 @@
}
},
"realpath-native": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.0.tgz",
- "integrity": "sha512-XJtlRJ9jf0E1H1SLeJyQ9PGzQD7S65h1pRXEcAeK48doKOnKxcgPeNohJvD5u/2sI9J1oke6E8bZHS/fmW1UiQ==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.1.tgz",
+ "integrity": "sha512-W14EcXuqUvKP8dkWkD7B95iMy77lpMnlFXbbk409bQtNCbeu0kvRE5reo+yIZ3JXxg6frbGsz2DLQ39lrCB40g==",
"dev": true,
"requires": {
"util.promisify": "^1.0.0"
@@ -11739,9 +11447,9 @@
}
},
"request": {
- "version": "2.85.0",
- "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
- "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
+ "version": "2.87.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+ "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
"dev": true,
"requires": {
"aws-sign2": "~0.7.0",
@@ -11752,7 +11460,6 @@
"forever-agent": "~0.6.1",
"form-data": "~2.3.1",
"har-validator": "~5.0.3",
- "hawk": "~6.0.2",
"http-signature": "~1.2.0",
"is-typedarray": "~1.0.0",
"isstream": "~0.1.2",
@@ -11762,7 +11469,6 @@
"performance-now": "^2.1.0",
"qs": "~6.5.1",
"safe-buffer": "^5.1.1",
- "stringstream": "~0.0.5",
"tough-cookie": "~2.3.3",
"tunnel-agent": "^0.6.0",
"uuid": "^3.1.0"
@@ -11932,6 +11638,12 @@
"inherits": "^2.0.1"
}
},
+ "rsvp": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+ "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+ "dev": true
+ },
"run-async": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
@@ -11994,15 +11706,16 @@
"dev": true
},
"sane": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.0.tgz",
- "integrity": "sha512-glfKd7YH4UCrh/7dD+UESsr8ylKWRE7UQPoXuz28FgmcF0ViJQhCTCCZHICRKxf8G8O1KdLEn20dcICK54c7ew==",
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz",
+ "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=",
"dev": true,
"requires": {
"anymatch": "^2.0.0",
+ "capture-exit": "^1.2.0",
"exec-sh": "^0.2.0",
"fb-watchman": "^2.0.0",
- "fsevents": "^1.1.1",
+ "fsevents": "^1.2.3",
"micromatch": "^3.1.4",
"minimist": "^1.1.1",
"walker": "~1.0.5",
@@ -12291,6 +12004,13 @@
}
}
},
+ "saslprep": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.1.tgz",
+ "integrity": "sha512-ntN6SbE3hRqd45PKKadRPgA+xHPWg5lPSj2JWJdJvjTwXDDfkPVtXWvP8jJojvnm+rAsZ2b299C5NwZqq818EA==",
+ "dev": true,
+ "optional": true
+ },
"sass-graph": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
@@ -12798,15 +12518,6 @@
"kind-of": "^3.2.0"
}
},
- "sntp": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
- "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
- "dev": true,
- "requires": {
- "hoek": "4.x.x"
- }
- },
"sockjs": {
"version": "0.3.19",
"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
@@ -12818,9 +12529,9 @@
}
},
"sockjs-client": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
- "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.5.tgz",
+ "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=",
"dev": true,
"requires": {
"debug": "^2.6.6",
@@ -12866,11 +12577,12 @@
}
},
"source-map-support": {
- "version": "0.5.4",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz",
- "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==",
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
+ "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
"dev": true,
"requires": {
+ "buffer-from": "^1.0.0",
"source-map": "^0.6.0"
},
"dependencies": {
@@ -13128,8 +12840,7 @@
},
"stringstream": {
"version": "0.0.5",
- "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
- "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+ "resolved": ""
},
"strip-ansi": {
"version": "4.0.0",
@@ -13251,13 +12962,13 @@
}
},
"supertest": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.0.0.tgz",
- "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.1.0.tgz",
+ "integrity": "sha512-O44AMnmJqx294uJQjfUmEyYOg7d9mylNFsMw/Wkz4evKd1njyPrtCN+U6ZIC7sKtfEVQhfTqFFijlXx8KP/Czw==",
"dev": true,
"requires": {
"methods": "~1.1.2",
- "superagent": "^3.0.0"
+ "superagent": "3.8.2"
}
},
"supports-color": {
@@ -13337,31 +13048,6 @@
"integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
"dev": true
},
- "tar": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz",
- "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==",
- "dev": true,
- "optional": true,
- "requires": {
- "chownr": "^1.0.1",
- "fs-minipass": "^1.2.5",
- "minipass": "^2.2.4",
- "minizlib": "^1.1.0",
- "mkdirp": "^0.5.0",
- "safe-buffer": "^5.1.1",
- "yallist": "^3.0.2"
- },
- "dependencies": {
- "yallist": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
- "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
- "dev": true,
- "optional": true
- }
- }
- },
"term-size": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
@@ -13796,17 +13482,6 @@
"dev": true,
"requires": {
"nopt": "~1.0.10"
- },
- "dependencies": {
- "nopt": {
- "version": "1.0.10",
- "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
- "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
- "dev": true,
- "requires": {
- "abbrev": "1"
- }
- }
}
},
"tough-cookie": {
@@ -14140,9 +13815,9 @@
"dev": true
},
"upath": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz",
- "integrity": "sha512-d4SJySNBXDaQp+DPrziv3xGS6w3d2Xt69FijJr86zMPBy23JEloMCEOUBBzuN7xCtjLCnmB9tI/z7SBCahHBOw==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+ "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
"dev": true
},
"update-notifier": {
@@ -14425,9 +14100,9 @@
"dev": true
},
"webpack": {
- "version": "4.16.1",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.1.tgz",
- "integrity": "sha512-6jpzObU18y7lXDJz7XCLvzgrqcJ0rZ2jhKvnTivza9gM2GvPW93xxtmEll2GgmdC0zVQAtbHrH/9BtyMjSDZfA==",
+ "version": "4.16.3",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.3.tgz",
+ "integrity": "sha512-3VcrVoFgzSz1IYgga71YpU3HO89Al5bSnDOj9RJQPsy+FNyI1sFsUyJITn3pktNuaRBlQT0usvKZE3GgkPGAIw==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.5.13",
@@ -15011,9 +14686,9 @@
}
},
"webpack-dev-server": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.4.tgz",
- "integrity": "sha512-itcIUDFkHuj1/QQxzUFOEXXmxOj5bku2ScLEsOFPapnq2JRTm58gPdtnBphBJOKL2+M3p6+xygL64bI+3eyzzw==",
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.5.tgz",
+ "integrity": "sha512-LVHg+EPwZLHIlfvokSTgtJqO/vI5CQi89fASb5JEDtVMDjY0yuIEqPPdMiKaBJIB/Ab7v/UN/sYZ7WsZvntQKw==",
"dev": true,
"requires": {
"ansi-html": "0.0.7",
@@ -15037,7 +14712,7 @@
"selfsigned": "^1.9.1",
"serve-index": "^1.7.2",
"sockjs": "0.3.19",
- "sockjs-client": "1.1.4",
+ "sockjs-client": "1.1.5",
"spdy": "^3.4.1",
"strip-ansi": "^3.0.0",
"supports-color": "^5.1.0",
@@ -15255,14 +14930,14 @@
"dev": true
},
"whatwg-url": {
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.0.tgz",
- "integrity": "sha512-Z0CVh/YE217Foyb488eo+iBv+r7eAQ0wSTyApi9n06jhcA3z6Nidg/EGvl0UFkg7kMdKxfBzzr+o9JF+cevgMg==",
+ "version": "6.5.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+ "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
"dev": true,
"requires": {
"lodash.sortby": "^4.7.0",
- "tr46": "^1.0.0",
- "webidl-conversions": "^4.0.1"
+ "tr46": "^1.0.1",
+ "webidl-conversions": "^4.0.2"
}
},
"which": {
@@ -15415,13 +15090,12 @@
}
},
"ws": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
- "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+ "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
"dev": true,
"requires": {
- "async-limiter": "~1.0.0",
- "safe-buffer": "~5.1.0"
+ "async-limiter": "~1.0.0"
}
},
"xdg-basedir": {
diff --git a/package.json b/package.json
index f950b22599..bd2ae8b576 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
"author": "",
"license": "ISC",
"dependencies": {
- "autoprefixer": "^9.0.0",
"file-loader": "^1.1.11",
"node-sass-chokidar": "^1.3.3",
"npm-run-all": "^4.1.3",
@@ -32,27 +31,27 @@
"@babel/preset-env": "^7.0.0-beta.54",
"@babel/preset-react": "^7.0.0-beta.54",
"@babel/preset-stage-2": "^7.0.0-beta.54",
- "autoprefixer": "^9.0.0",
+ "autoprefixer": "^9.0.1",
"babel-loader": "^8.0.0-beta.4",
"css-loader": "^1.0.0",
"eslint": "^4.19.1",
"express": "^4.16.3",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"html-webpack-plugin": "^3.2.0",
- "jest": "^22.4.3",
- "mongoose": "^5.0.15",
+ "jest": "^22.4.4",
+ "mongoose": "^5.2.5",
"node-sass": "^4.9.2",
- "nodemon": "^1.17.3",
+ "nodemon": "^1.18.3",
"optimize-css-assets-webpack-plugin": "^5.0.0",
"postcss-flexbugs-fixes": "^3.3.1",
"postcss-loader": "^2.1.6",
"sass-loader": "^7.0.3",
"style-loader": "^0.21.0",
- "supertest": "^3.0.0",
+ "supertest": "^3.1.0",
"uglifyjs-webpack-plugin": "^1.2.7",
- "webpack": "^4.16.1",
+ "webpack": "^4.16.3",
"webpack-cli": "^3.1.0",
- "webpack-dev-server": "^3.1.4",
+ "webpack-dev-server": "^3.1.5",
"webpack-merge": "^4.1.3"
}
}
diff --git a/src/client/assets/fonts/GTPressura-Light.eot b/src/client/assets/fonts/GTPressura-Light.eot
new file mode 100644
index 0000000000..81c1938744
Binary files /dev/null and b/src/client/assets/fonts/GTPressura-Light.eot differ
diff --git a/src/client/assets/fonts/GTPressura-Light.svg b/src/client/assets/fonts/GTPressura-Light.svg
new file mode 100644
index 0000000000..821fc9c0b8
--- /dev/null
+++ b/src/client/assets/fonts/GTPressura-Light.svg
@@ -0,0 +1,3556 @@
+
+
+
diff --git a/src/client/assets/fonts/GTPressura-Light.ttf b/src/client/assets/fonts/GTPressura-Light.ttf
new file mode 100644
index 0000000000..7897e7aa5a
Binary files /dev/null and b/src/client/assets/fonts/GTPressura-Light.ttf differ
diff --git a/src/client/assets/fonts/GTPressura-Light.woff b/src/client/assets/fonts/GTPressura-Light.woff
new file mode 100644
index 0000000000..bbcff4ad86
Binary files /dev/null and b/src/client/assets/fonts/GTPressura-Light.woff differ
diff --git a/src/client/assets/fonts/GTPressuraMono.eot b/src/client/assets/fonts/GTPressuraMono.eot
new file mode 100644
index 0000000000..86566003c8
Binary files /dev/null and b/src/client/assets/fonts/GTPressuraMono.eot differ
diff --git a/src/client/assets/fonts/GTPressuraMono.otf b/src/client/assets/fonts/GTPressuraMono.otf
new file mode 100644
index 0000000000..c4cacd8d2a
Binary files /dev/null and b/src/client/assets/fonts/GTPressuraMono.otf differ
diff --git a/src/client/assets/fonts/GTPressuraMono.svg b/src/client/assets/fonts/GTPressuraMono.svg
new file mode 100644
index 0000000000..9f12f20749
--- /dev/null
+++ b/src/client/assets/fonts/GTPressuraMono.svg
@@ -0,0 +1,1467 @@
+
+
+
diff --git a/src/client/assets/fonts/GTPressuraMono.ttf b/src/client/assets/fonts/GTPressuraMono.ttf
new file mode 100644
index 0000000000..469c2056b7
Binary files /dev/null and b/src/client/assets/fonts/GTPressuraMono.ttf differ
diff --git a/src/client/assets/fonts/GTPressuraMono.woff b/src/client/assets/fonts/GTPressuraMono.woff
new file mode 100644
index 0000000000..bbd0ad850e
Binary files /dev/null and b/src/client/assets/fonts/GTPressuraMono.woff differ
diff --git a/src/client/assets/fonts/NoeDisplay-Bold.eot b/src/client/assets/fonts/NoeDisplay-Bold.eot
new file mode 100644
index 0000000000..71726c9ef0
Binary files /dev/null and b/src/client/assets/fonts/NoeDisplay-Bold.eot differ
diff --git a/src/client/assets/fonts/NoeDisplay-Bold.svg b/src/client/assets/fonts/NoeDisplay-Bold.svg
new file mode 100644
index 0000000000..3521fb5fd6
--- /dev/null
+++ b/src/client/assets/fonts/NoeDisplay-Bold.svg
@@ -0,0 +1,11884 @@
+
+
+
diff --git a/src/client/assets/fonts/NoeDisplay-Bold.ttf b/src/client/assets/fonts/NoeDisplay-Bold.ttf
new file mode 100644
index 0000000000..52e00046f2
Binary files /dev/null and b/src/client/assets/fonts/NoeDisplay-Bold.ttf differ
diff --git a/src/client/assets/fonts/NoeDisplay-Bold.woff b/src/client/assets/fonts/NoeDisplay-Bold.woff
new file mode 100644
index 0000000000..78618c8946
Binary files /dev/null and b/src/client/assets/fonts/NoeDisplay-Bold.woff differ
diff --git a/src/client/assets/fonts/cal-regular-webfont.eot b/src/client/assets/fonts/cal-regular-webfont.eot
new file mode 100644
index 0000000000..a711d9a1fc
Binary files /dev/null and b/src/client/assets/fonts/cal-regular-webfont.eot differ
diff --git a/src/client/assets/fonts/cal-regular-webfont.svg b/src/client/assets/fonts/cal-regular-webfont.svg
new file mode 100644
index 0000000000..661183df93
--- /dev/null
+++ b/src/client/assets/fonts/cal-regular-webfont.svg
@@ -0,0 +1,2021 @@
+
+
+
\ No newline at end of file
diff --git a/src/client/assets/fonts/cal-regular-webfont.ttf b/src/client/assets/fonts/cal-regular-webfont.ttf
new file mode 100644
index 0000000000..560b135d33
Binary files /dev/null and b/src/client/assets/fonts/cal-regular-webfont.ttf differ
diff --git a/src/client/assets/fonts/cal-regular-webfont.woff b/src/client/assets/fonts/cal-regular-webfont.woff
new file mode 100644
index 0000000000..a65c62d2d6
Binary files /dev/null and b/src/client/assets/fonts/cal-regular-webfont.woff differ
diff --git a/src/client/assets/fonts/cal-regular-webfont.woff2 b/src/client/assets/fonts/cal-regular-webfont.woff2
new file mode 100644
index 0000000000..c494698b2c
Binary files /dev/null and b/src/client/assets/fonts/cal-regular-webfont.woff2 differ
diff --git a/src/client/components/App.js b/src/client/components/App.js
index b24213057b..6efdaf4a8a 100644
--- a/src/client/components/App.js
+++ b/src/client/components/App.js
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
import { Switch, withRouter, Route } from 'react-router-dom';
+import Sidebar from 'payload/client/components/layout/Sidebar';
import '../scss/app.css';
@@ -7,6 +8,7 @@ class App extends Component {
render() {
return (
+
Here's the main h1
)
diff --git a/src/client/components/Sidebar/index.scss b/src/client/components/Sidebar/index.scss
deleted file mode 100644
index 695a692c0c..0000000000
--- a/src/client/components/Sidebar/index.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import '_vars';
-
-.sidebar {
- background: $black;
-}
diff --git a/src/client/components/graphics/Emblem/emblem.svg b/src/client/components/graphics/Emblem/emblem.svg
new file mode 100644
index 0000000000..43164fb95b
--- /dev/null
+++ b/src/client/components/graphics/Emblem/emblem.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/client/components/graphics/Emblem/index.js b/src/client/components/graphics/Emblem/index.js
new file mode 100644
index 0000000000..76842c256f
--- /dev/null
+++ b/src/client/components/graphics/Emblem/index.js
@@ -0,0 +1,14 @@
+import React from 'react';
+
+import './index.css';
+
+export default () => {
+ return (
+
+ )
+}
diff --git a/src/client/components/graphics/Emblem/index.scss b/src/client/components/graphics/Emblem/index.scss
new file mode 100644
index 0000000000..4db084a404
--- /dev/null
+++ b/src/client/components/graphics/Emblem/index.scss
@@ -0,0 +1,6 @@
+.cls-1 {
+ fill:#333;
+}
+.cls-2 {
+ fill:#666;
+}
diff --git a/src/client/components/Sidebar/index.js b/src/client/components/layout/Sidebar/index.js
similarity index 62%
rename from src/client/components/Sidebar/index.js
rename to src/client/components/layout/Sidebar/index.js
index 88085d8645..04a8af0705 100644
--- a/src/client/components/Sidebar/index.js
+++ b/src/client/components/layout/Sidebar/index.js
@@ -1,11 +1,13 @@
import React from 'react';
+import Emblem from 'payload/client/components/graphics/Emblem';
import './index.css';
export default () => {
return (
)
-};
\ No newline at end of file
+};
diff --git a/src/client/components/layout/Sidebar/index.scss b/src/client/components/layout/Sidebar/index.scss
new file mode 100644
index 0000000000..f65c894689
--- /dev/null
+++ b/src/client/components/layout/Sidebar/index.scss
@@ -0,0 +1,8 @@
+@import '_vars';
+
+.sidebar {
+
+ .emblem {
+ width: 100px;
+ }
+}
diff --git a/src/client/scss/_fonts.scss b/src/client/scss/_fonts.scss
new file mode 100644
index 0000000000..fe9ae3dbfc
--- /dev/null
+++ b/src/client/scss/_fonts.scss
@@ -0,0 +1,81 @@
+/////////////////////////////
+// CALIBRE
+/////////////////////////////
+
+@font-face {
+ font-family: 'calibre-web';
+ src: url('../assets/fonts/cal-regular-webfont.eot');
+ src: url('../assets/fonts/cal-regular-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../assets/fonts/cal-regular-webfont.woff2') format('woff2'),
+ url('../assets/fonts/cal-regular-webfont.woff') format('woff'),
+ url('../assets/fonts/cal-regular-webfont.ttf') format('truetype'),
+ url('../assets/fonts/cal-regular-webfont.svg#calibre_regularregular') format('svg');
+ font-weight: 400;
+ font-style: normal;
+}
+
+/////////////////////////////
+// NOE DISPLAY
+/////////////////////////////
+
+@font-face {
+ font-family: 'noe-display-web';
+ src: url('../assets/fonts/NoeDisplay-Bold.eot') format('embedded-opentype');
+ font-weight: bold;
+ font-style: normal;
+ }
+
+ @font-face {
+ font-family: 'noe-display-web';
+ src: url('../assets/fonts/NoeDisplay-Bold.woff') format('woff'), url('../assets/fonts/NoeDisplay-Bold.ttf') format('truetype'), url('../assets/fonts/NoeDisplay-Bold.svg#NoeDisplay-Bold') format('svg');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'noe-display-web';
+ src: url('../assets/fonts/NoeDisplay-Bold.eot') format('embedded-opentype');
+ font-weight: normal;
+ font-style: normal;
+ }
+
+ @font-face {
+ font-family: 'noe-display-web';
+ src: url('../assets/fonts/NoeDisplay-Bold.woff') format('woff'), url('../assets/fonts/NoeDisplay-Bold.ttf') format('truetype'), url('../assets/fonts/NoeDisplay-Bold.svg#NoeDisplay-Bold') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+/////////////////////////////
+// GT PRESSURA MONO
+/////////////////////////////
+
+
+@font-face {
+ font-family: 'gt-pressura-web';
+ src: url('../assets/fonts/GTPressuraMono.eot') format('embedded-opentype');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'gt-pressura-web';
+ src: url('../assets/fonts/GTPressuraMono.otf') format('opentype'),
+ url('../assets/fonts/GTPressuraMono.woff') format('woff'), url('../assets/fonts/GTPressuraMono.ttf') format('truetype'), url('../assets/fonts/GTPressuraMono.svg#GTPressuraMono') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'gt-pressura-web';
+ src: url('../assets/fonts/GTPressura-Light.eot') format('embedded-opentype');
+ font-weight: 100;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'gt-pressura-web';
+ src: url('../assets/fonts/GTPressura-Light.woff') format('woff'), url('../assets/fonts/GTPressura-Light.ttf') format('truetype'), url('../assets/fonts/GTPressura-Light.svg#GTPressura-Light') format('svg');
+ font-weight: 100;
+ font-style: normal;
+}
diff --git a/src/client/scss/_grid.scss b/src/client/scss/_grid.scss
new file mode 100644
index 0000000000..4025126fe3
--- /dev/null
+++ b/src/client/scss/_grid.scss
@@ -0,0 +1,39 @@
+@import '_structure';
+
+/////////////////////////////
+// GRID
+/////////////////////////////
+
+// Gutter
+$gutter : rem(.5);
+$cols : 12;
+
+/////////////////////////////
+// ROWS
+/////////////////////////////
+
+@mixin row {
+ display: flex;
+ flex-wrap: wrap;
+ margin-right: -#{$gutter};
+ margin-left: -#{$gutter};
+}
+
+/////////////////////////////
+// COLUMN SETUP
+/////////////////////////////
+
+@mixin gutter {
+ margin-left: $gutter;
+ margin-right: $gutter;
+}
+
+@mixin col($col) {
+ @include gutter;
+ width: calc(#{$col / $cols * 100 + %} - #{rem(1.01)});
+}
+
+@mixin push($col) {
+ margin-right: $gutter;
+ margin-left: calc(#{$col / $cols * 100 + %} + #{$gutter});
+}
diff --git a/src/client/scss/_queries.scss b/src/client/scss/_queries.scss
new file mode 100644
index 0000000000..ada481ee9f
--- /dev/null
+++ b/src/client/scss/_queries.scss
@@ -0,0 +1,21 @@
+/////////////////////////////
+// MEDIA QUERIES
+/////////////////////////////
+
+@mixin small-break {
+ @media (max-width: #{$mobile-width}) {
+ @content;
+ }
+}
+
+@mixin mid-break {
+ @media (max-height: #{$desktop-height}), (max-width: #{$tablet-width}) {
+ @content;
+ }
+}
+
+@mixin large-break {
+ @media (max-width: #{$content-width}) {
+ @content;
+ }
+}
diff --git a/src/client/scss/_structure.scss b/src/client/scss/_structure.scss
new file mode 100644
index 0000000000..b565ec572f
--- /dev/null
+++ b/src/client/scss/_structure.scss
@@ -0,0 +1,116 @@
+@import '_queries';
+@import '_vars';
+
+/////////////////////////////
+// PADDING
+/////////////////////////////
+
+@mixin pad {
+ padding: $base;
+
+ @include mid-break {
+ padding: rem(.75);
+ }
+
+ @include small-break {
+ padding: rem(.5);
+ }
+}
+
+@mixin pad-x2 {
+ padding: rem(2) rem(2) rem(1);
+
+ @include mid-break {
+ padding: rem(1) rem(1) 0;
+ }
+}
+
+/////////////////////////////
+// VERTICAL PADDING
+/////////////////////////////
+
+@mixin pad-vert {
+ padding-top: $base;
+
+ @include mid-break {
+ padding-top: rem(.5);
+ }
+}
+
+@mixin pad-vert-x2 {
+ padding-top: rem(2);
+ padding-bottom: $base;
+
+ @include mid-break {
+ padding-top: $base;
+ padding-bottom: 0;
+ }
+}
+
+@mixin pad-vert-x3 {
+ padding-top: rem(3);
+ padding-bottom: rem(2);
+
+ @include mid-break {
+ padding-top: rem(2);
+ padding-bottom: $base;
+ }
+}
+
+@mixin pad-vert-x4 {
+ padding-top: rem(4);
+ padding-bottom: rem(3);
+
+ @include mid-break {
+ padding-top: rem(2);
+ padding-bottom: $base;
+ }
+}
+
+/////////////////////////////
+// MARGIN
+/////////////////////////////
+
+@mixin m {
+ margin-bottom: $base;
+
+ @include small-break {
+ margin-bottom: rem(.75);
+ }
+}
+
+@mixin m-x2 {
+ margin-bottom: rem(2);
+
+ @include mid-break {
+ margin-bottom: $base;
+ }
+
+ @include small-break {
+ margin-bottom: rem(.75);
+ }
+}
+
+@mixin m-x3 {
+ margin-bottom: rem(3);
+
+ @include mid-break {
+ margin-bottom: rem(2);
+ }
+
+ @include small-break {
+ margin-bottom: rem(1);
+ }
+}
+
+@mixin m-x4 {
+ margin-bottom: rem(4);
+
+ @include mid-break {
+ margin-bottom: rem(3);
+ }
+
+ @include small-break {
+ margin-bottom: rem(2);
+ }
+}
diff --git a/src/client/scss/_type.scss b/src/client/scss/_type.scss
new file mode 100644
index 0000000000..c0ccc23097
--- /dev/null
+++ b/src/client/scss/_type.scss
@@ -0,0 +1,115 @@
+@import '_vars';
+@import '_structure';
+
+/////////////////////////////
+// HEADINGS
+/////////////////////////////
+
+%h1, %h2, %h3, %h4, %h5 {
+ font-family: $font-brand;
+ font-weight: 700;
+ color: lighten($black, 4%);
+}
+
+%jumbo {
+ font-size: rem(2.5);
+ line-height: 1;
+ margin: 0 0 rem(2);
+}
+
+%h1 {
+ margin: 0 0 rem(1.5);
+ font-size: rem(2);
+ line-height: rem(2);
+ letter-spacing: rem(.025);
+
+ @include small-break {
+ font-size: rem(1.25);
+ line-height: rem(1.25);
+ }
+}
+
+%h2 {
+ margin: 0 0 rem(1);
+ font-size: rem(1.5);
+ line-height: rem(1.75);
+ letter-spacing: rem(.02);
+
+ @include small-break {
+ font-size: rem(.85);
+ line-height: rem(.85);
+ }
+}
+
+%h3 {
+ margin: 0 0 rem(1);
+ font-size: rem(1);
+ line-height: 1.25;
+ font-weight: 500;
+
+ @include small-break {
+ font-size: rem(.65);
+ line-height: rem(.75);
+ }
+}
+
+%h4 {
+ margin: 0 0 $base;
+ font-size: rem(.75);
+ line-height: 1.5;
+}
+
+%h5 {
+ margin: 0;
+ font-size: rem(.5);
+ line-height: 1.5;
+ font-weight: 700;
+}
+
+%small {
+ margin: 0;
+ font-size: rem(.4);
+ line-height: 1.5;
+}
+
+/////////////////////////////
+// TYPE STYLES
+/////////////////////////////
+
+%label {
+ text-transform: uppercase;
+ letter-spacing: rem(.05);
+ font-size: rem(.3);
+ font-family: $font-label;
+ -webkit-font-smoothing: auto;
+
+ @include mid-break {
+ font-size: rem(.375);
+ letter-spacing: rem(.05);
+ }
+}
+
+%large-body {
+ font-size: rem(.6);
+ line-height: rem(1);
+ letter-spacing: rem(.02);
+
+ @include mid-break {
+ font-size: rem(.7);
+ line-height: rem(1);
+ }
+
+ @include small-break {
+ font-size: rem(.55);
+ line-height: rem(.75);
+ }
+}
+
+%code {
+ font-size: rem(.4);
+ color: $gray;
+
+ span {
+ color: $black;
+ }
+}
diff --git a/src/client/scss/app.scss b/src/client/scss/app.scss
index 9c140423c4..cb74f31b22 100644
--- a/src/client/scss/app.scss
+++ b/src/client/scss/app.scss
@@ -1,10 +1,97 @@
+@import '_fonts';
@import '_vars';
+@import '_type';
+@import '_grid';
+
+/////////////////////////////
+// GLOBAL STYLES
+/////////////////////////////
+
+* {
+ box-sizing: border-box;
+}
+
+html, body {
+ height: 100%;
+}
body {
- background: purple;
- color: white;
-
- h1 {
- color: black;
- }
+ font-family: $font-body;
+ font-weight: 400;
+ color: $black;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ margin: 0;
+}
+
+html {
+ font-size: $body;
+ line-height: rem(1);
+ font-size: 20px;
+
+ @include mid-break {
+ font-size: 18px;
+ line-height: rem(1);
+ }
+
+ @include small-break {
+ font-size: 16px;
+ line-height: rem(.8)
+ }
+}
+
+::selection {
+ background: $green;
+ color: $black;
+}
+
+::-moz-selection {
+ background: $green;
+ color: $black;
+}
+
+img {
+ max-width: 100%;
+ height: auto;
+ display: block;
+}
+
+h1 {
+ @extend %h1;
+}
+
+h2 {
+ @extend %h2;
+}
+
+h3 {
+ @extend %h3;
+}
+
+h4 {
+ @extend %h4;
+}
+
+h5 {
+ @extend %h5;
+}
+
+p {
+ margin: 0 0 rem(.5);
+}
+
+ul {
+ padding-left: $base;
+ margin: 0 0 $base;
+}
+
+a {
+ text-decoration: none;
+ color: $black;
+ border-bottom: 1px solid $black;
+
+ &:hover {
+ color: $dark-green;
+ border-bottom: 1px solid $dark-green;
+ }
}