diff --git a/package.json b/package.json index 07a6b222cd..d9b79386fd 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "gulp-uglify": "^1.4.2", "gulp-util": "^3.0.7", "gulp-watch": "^4.3.5", - "jake": "latest", + "jake": "^8.0.16", "js-fixtures": "^1.5.3", "mocha": "^4.1.0", "path": "^0.12.7", diff --git a/resources/gulp/components/common.js b/resources/gulp/components/common.js index 2f7a0f8edd..8fe777b941 100644 --- a/resources/gulp/components/common.js +++ b/resources/gulp/components/common.js @@ -13,7 +13,12 @@ gulp.task('copy-common-fonts',function(){ .pipe(gulp.dest(config.paths.build + 'common/fonts')); }); -gulp.task('build-common-font-css', ['copy-common-fonts'],function(){ +gulp.task('copy-common-roboto-fonts', function () { + return gulp.src([config.paths.src + 'common/styles/fonts/**']) + .pipe(gulp.dest(config.paths.build + 'common/fonts')); +}); + +gulp.task('build-common-font-css', ['copy-common-fonts', 'copy-common-roboto-fonts'], function () { return gulp.src([config.paths.nodes + 'font-awesome/css/font-awesome.min.css']) .pipe(gulp.dest( config.paths.build + 'common/css')); }); diff --git a/resources/www/common/styles/font-sass/_Black.scss b/resources/www/common/styles/font-sass/_Black.scss new file mode 100755 index 0000000000..b33f62c693 --- /dev/null +++ b/resources/www/common/styles/font-sass/_Black.scss @@ -0,0 +1,9 @@ +/* BEGIN Black */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Black"); + font-weight: 900; + font-style: normal; +} + +/* END Black */ diff --git a/resources/www/common/styles/font-sass/_BlackItalic.scss b/resources/www/common/styles/font-sass/_BlackItalic.scss new file mode 100755 index 0000000000..a87a046f90 --- /dev/null +++ b/resources/www/common/styles/font-sass/_BlackItalic.scss @@ -0,0 +1,9 @@ +/* BEGIN Black Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "BlackItalic"); + font-weight: 900; + font-style: italic; +} + +/* END Black Italic */ diff --git a/resources/www/common/styles/font-sass/_Bold.scss b/resources/www/common/styles/font-sass/_Bold.scss new file mode 100755 index 0000000000..dbab747c2a --- /dev/null +++ b/resources/www/common/styles/font-sass/_Bold.scss @@ -0,0 +1,16 @@ +/* BEGIN Bold */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Bold"); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Bold"); + font-weight: bold; + font-style: normal; +} + +/* END Bold */ diff --git a/resources/www/common/styles/font-sass/_BoldItalic.scss b/resources/www/common/styles/font-sass/_BoldItalic.scss new file mode 100755 index 0000000000..7fc116c27d --- /dev/null +++ b/resources/www/common/styles/font-sass/_BoldItalic.scss @@ -0,0 +1,16 @@ +/* BEGIN Bold Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "BoldItalic"); + font-weight: 700; + font-style: italic; +} + +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "BoldItalic"); + font-weight: bold; + font-style: italic; +} + +/* END Bold Italic */ diff --git a/resources/www/common/styles/font-sass/_Italic.scss b/resources/www/common/styles/font-sass/_Italic.scss new file mode 100755 index 0000000000..ea62b696e1 --- /dev/null +++ b/resources/www/common/styles/font-sass/_Italic.scss @@ -0,0 +1,16 @@ +/* BEGIN Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Italic"); + font-weight: 400; + font-style: italic; +} + +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Italic"); + font-weight: normal; + font-style: italic; +} + +/* END Italic */ diff --git a/resources/www/common/styles/font-sass/_Light.scss b/resources/www/common/styles/font-sass/_Light.scss new file mode 100755 index 0000000000..43743ea4d8 --- /dev/null +++ b/resources/www/common/styles/font-sass/_Light.scss @@ -0,0 +1,9 @@ +/* BEGIN Light */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Light"); + font-weight: 300; + font-style: normal; +} + +/* END Light */ diff --git a/resources/www/common/styles/font-sass/_LightItalic.scss b/resources/www/common/styles/font-sass/_LightItalic.scss new file mode 100755 index 0000000000..e9ea4af4c7 --- /dev/null +++ b/resources/www/common/styles/font-sass/_LightItalic.scss @@ -0,0 +1,9 @@ +/* BEGIN Light Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "LightItalic"); + font-weight: 300; + font-style: italic; +} + +/* END Light Italic */ diff --git a/resources/www/common/styles/font-sass/_Medium.scss b/resources/www/common/styles/font-sass/_Medium.scss new file mode 100755 index 0000000000..aab0cb7201 --- /dev/null +++ b/resources/www/common/styles/font-sass/_Medium.scss @@ -0,0 +1,9 @@ +/* BEGIN Medium */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Medium"); + font-weight: 500; + font-style: normal; +} + +/* END Medium */ diff --git a/resources/www/common/styles/font-sass/_MediumItalic.scss b/resources/www/common/styles/font-sass/_MediumItalic.scss new file mode 100755 index 0000000000..c84866b67c --- /dev/null +++ b/resources/www/common/styles/font-sass/_MediumItalic.scss @@ -0,0 +1,9 @@ +/* BEGIN Medium Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "MediumItalic"); + font-weight: 500; + font-style: italic; +} + +/* END Medium Italic */ diff --git a/resources/www/common/styles/font-sass/_Regular.scss b/resources/www/common/styles/font-sass/_Regular.scss new file mode 100755 index 0000000000..243476febf --- /dev/null +++ b/resources/www/common/styles/font-sass/_Regular.scss @@ -0,0 +1,16 @@ +/* BEGIN Regular */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Regular"); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Regular"); + font-weight: normal; + font-style: normal; +} + +/* END Regular */ diff --git a/resources/www/common/styles/font-sass/_Thin.scss b/resources/www/common/styles/font-sass/_Thin.scss new file mode 100755 index 0000000000..4aa62328ef --- /dev/null +++ b/resources/www/common/styles/font-sass/_Thin.scss @@ -0,0 +1,9 @@ +/* BEGIN Thin */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Thin"); + font-weight: 100; + font-style: normal; +} + +/* END Thin */ diff --git a/resources/www/common/styles/font-sass/_ThinItalic.scss b/resources/www/common/styles/font-sass/_ThinItalic.scss new file mode 100755 index 0000000000..b35ea59db1 --- /dev/null +++ b/resources/www/common/styles/font-sass/_ThinItalic.scss @@ -0,0 +1,9 @@ +/* BEGIN Thin Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "ThinItalic"); + font-weight: 100; + font-style: italic; +} + +/* END Thin Italic */ diff --git a/resources/www/common/styles/font-sass/_mixins.scss b/resources/www/common/styles/font-sass/_mixins.scss new file mode 100755 index 0000000000..96af5dabd1 --- /dev/null +++ b/resources/www/common/styles/font-sass/_mixins.scss @@ -0,0 +1,4 @@ +@mixin fontdef-woff($FontPath, $FontName, $FontVersion:"1.0.0", $FontType:"Regular") { + src: url('#{$FontPath}/#{$FontType}/#{$FontName}-#{$FontType}.woff2?v=#{$FontVersion}') format('woff2'), + url('#{$FontPath}/#{$FontType}/#{$FontName}-#{$FontType}.woff?v=#{$FontVersion}') format('woff'); +} diff --git a/resources/www/common/styles/font-sass/_variables.scss b/resources/www/common/styles/font-sass/_variables.scss new file mode 100755 index 0000000000..1b2c876ceb --- /dev/null +++ b/resources/www/common/styles/font-sass/_variables.scss @@ -0,0 +1,3 @@ +$FontPath: "../fonts" !default; +$FontName: "Roboto" !default; +$FontVersion: "2.137" !default; diff --git a/resources/www/common/styles/font-sass/roboto.scss b/resources/www/common/styles/font-sass/roboto.scss new file mode 100755 index 0000000000..aaec00856f --- /dev/null +++ b/resources/www/common/styles/font-sass/roboto.scss @@ -0,0 +1,14 @@ +@import "variables"; +@import "mixins"; +@import "Thin"; +@import "ThinItalic"; +@import "Light"; +@import "LightItalic"; +@import "Regular"; +@import "Italic"; +@import "Medium"; +@import "MediumItalic"; +@import "Bold"; +@import "BoldItalic"; +@import "Black"; +@import "BlackItalic"; diff --git a/resources/www/common/styles/fonts/Black/Roboto-Black.ttf b/resources/www/common/styles/fonts/Black/Roboto-Black.ttf new file mode 100755 index 0000000000..689fe5cb3c Binary files /dev/null and b/resources/www/common/styles/fonts/Black/Roboto-Black.ttf differ diff --git a/resources/www/common/styles/fonts/Black/Roboto-Black.woff b/resources/www/common/styles/fonts/Black/Roboto-Black.woff new file mode 100755 index 0000000000..1fe59bab31 Binary files /dev/null and b/resources/www/common/styles/fonts/Black/Roboto-Black.woff differ diff --git a/resources/www/common/styles/fonts/Black/Roboto-Black.woff2 b/resources/www/common/styles/fonts/Black/Roboto-Black.woff2 new file mode 100755 index 0000000000..41186d078e Binary files /dev/null and b/resources/www/common/styles/fonts/Black/Roboto-Black.woff2 differ diff --git a/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.ttf b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.ttf new file mode 100755 index 0000000000..0b4e0ee108 Binary files /dev/null and b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.ttf differ diff --git a/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff new file mode 100755 index 0000000000..532150fce9 Binary files /dev/null and b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff differ diff --git a/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff2 b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff2 new file mode 100755 index 0000000000..df3c3f4472 Binary files /dev/null and b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff2 differ diff --git a/resources/www/common/styles/fonts/Bold/Roboto-Bold.ttf b/resources/www/common/styles/fonts/Bold/Roboto-Bold.ttf new file mode 100755 index 0000000000..d3f01ad245 Binary files /dev/null and b/resources/www/common/styles/fonts/Bold/Roboto-Bold.ttf differ diff --git a/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff b/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff new file mode 100755 index 0000000000..83a333ad47 Binary files /dev/null and b/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff differ diff --git a/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff2 b/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff2 new file mode 100755 index 0000000000..76817cc761 Binary files /dev/null and b/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff2 differ diff --git a/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.ttf b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.ttf new file mode 100755 index 0000000000..41cc1e7531 Binary files /dev/null and b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.ttf differ diff --git a/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff new file mode 100755 index 0000000000..7f8c135d12 Binary files /dev/null and b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff differ diff --git a/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff2 b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff2 new file mode 100755 index 0000000000..45c9ef7328 Binary files /dev/null and b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff2 differ diff --git a/resources/www/common/styles/fonts/COPYRIGHT.txt b/resources/www/common/styles/fonts/COPYRIGHT.txt new file mode 100755 index 0000000000..a7ef69930c --- /dev/null +++ b/resources/www/common/styles/fonts/COPYRIGHT.txt @@ -0,0 +1 @@ +Copyright 2011 Google Inc. All Rights Reserved. \ No newline at end of file diff --git a/resources/www/common/styles/fonts/DESCRIPTION.en_us.html b/resources/www/common/styles/fonts/DESCRIPTION.en_us.html new file mode 100755 index 0000000000..cca3687e66 --- /dev/null +++ b/resources/www/common/styles/fonts/DESCRIPTION.en_us.html @@ -0,0 +1,16 @@ +

+ Roboto has a dual nature. + It has a mechanical skeleton and the forms are largely geometric. + At the same time, the font features friendly and open curves. + While some grotesks distort their letterforms to force a rigid rhythm, Roboto doesn’t compromise, allowing letters + to be settled into their natural width. + This makes for a more natural reading rhythm more commonly found in humanist and serif types. +

+

+ This is the regular family, which can be used alongside the Roboto Condensed family and the Roboto Slab family. +

+

+ To contribute, see github.com/google/roboto +

diff --git a/resources/www/common/styles/fonts/Italic/Roboto-Italic.ttf b/resources/www/common/styles/fonts/Italic/Roboto-Italic.ttf new file mode 100755 index 0000000000..6a1cee5b29 Binary files /dev/null and b/resources/www/common/styles/fonts/Italic/Roboto-Italic.ttf differ diff --git a/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff b/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff new file mode 100755 index 0000000000..6e4197d44d Binary files /dev/null and b/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff differ diff --git a/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff2 b/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff2 new file mode 100755 index 0000000000..e7f173b7ed Binary files /dev/null and b/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff2 differ diff --git a/resources/www/common/styles/fonts/LICENSE.txt b/resources/www/common/styles/fonts/LICENSE.txt new file mode 100755 index 0000000000..d645695673 --- /dev/null +++ b/resources/www/common/styles/fonts/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/resources/www/common/styles/fonts/Light/Roboto-Light.ttf b/resources/www/common/styles/fonts/Light/Roboto-Light.ttf new file mode 100755 index 0000000000..219063a578 Binary files /dev/null and b/resources/www/common/styles/fonts/Light/Roboto-Light.ttf differ diff --git a/resources/www/common/styles/fonts/Light/Roboto-Light.woff b/resources/www/common/styles/fonts/Light/Roboto-Light.woff new file mode 100755 index 0000000000..d0158be692 Binary files /dev/null and b/resources/www/common/styles/fonts/Light/Roboto-Light.woff differ diff --git a/resources/www/common/styles/fonts/Light/Roboto-Light.woff2 b/resources/www/common/styles/fonts/Light/Roboto-Light.woff2 new file mode 100755 index 0000000000..ddbf4a9250 Binary files /dev/null and b/resources/www/common/styles/fonts/Light/Roboto-Light.woff2 differ diff --git a/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.ttf b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.ttf new file mode 100755 index 0000000000..0e81e876fc Binary files /dev/null and b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.ttf differ diff --git a/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff new file mode 100755 index 0000000000..f20dfa7955 Binary files /dev/null and b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff differ diff --git a/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff2 b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff2 new file mode 100755 index 0000000000..ba70c2a396 Binary files /dev/null and b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff2 differ diff --git a/resources/www/common/styles/fonts/METADATA.pb b/resources/www/common/styles/fonts/METADATA.pb new file mode 100755 index 0000000000..a4d2bb221f --- /dev/null +++ b/resources/www/common/styles/fonts/METADATA.pb @@ -0,0 +1,121 @@ +name: "Roboto" +designer: "Christian Robertson" +license: "APACHE2" +category: "SANS_SERIF" +date_added: "2013-01-09" +fonts { + name: "Roboto" + style: "normal" + weight: 100 + filename: "Roboto-Thin.ttf" + post_script_name: "Roboto-Thin" + full_name: "Roboto Thin" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 100 + filename: "Roboto-ThinItalic.ttf" + post_script_name: "Roboto-ThinItalic" + full_name: "Roboto Thin Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 300 + filename: "Roboto-Light.ttf" + post_script_name: "Roboto-Light" + full_name: "Roboto Light" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 300 + filename: "Roboto-LightItalic.ttf" + post_script_name: "Roboto-LightItalic" + full_name: "Roboto Light Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 400 + filename: "Roboto-Regular.ttf" + post_script_name: "Roboto-Regular" + full_name: "Roboto" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 400 + filename: "Roboto-Italic.ttf" + post_script_name: "Roboto-Italic" + full_name: "Roboto Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 500 + filename: "Roboto-Medium.ttf" + post_script_name: "Roboto-Medium" + full_name: "Roboto Medium" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 500 + filename: "Roboto-MediumItalic.ttf" + post_script_name: "Roboto-MediumItalic" + full_name: "Roboto Medium Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 700 + filename: "Roboto-Bold.ttf" + post_script_name: "Roboto-Bold" + full_name: "Roboto Bold" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 700 + filename: "Roboto-BoldItalic.ttf" + post_script_name: "Roboto-BoldItalic" + full_name: "Roboto Bold Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 900 + filename: "Roboto-Black.ttf" + post_script_name: "Roboto-Black" + full_name: "Roboto Black" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 900 + filename: "Roboto-BlackItalic.ttf" + post_script_name: "Roboto-BlackItalic" + full_name: "Roboto Black Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +subsets: "menu" +subsets: "cyrillic" +subsets: "cyrillic-ext" +subsets: "greek" +subsets: "greek-ext" +subsets: "latin" +subsets: "latin-ext" +subsets: "vietnamese" diff --git a/resources/www/common/styles/fonts/Medium/Roboto-Medium.ttf b/resources/www/common/styles/fonts/Medium/Roboto-Medium.ttf new file mode 100755 index 0000000000..1a7f3b0bba Binary files /dev/null and b/resources/www/common/styles/fonts/Medium/Roboto-Medium.ttf differ diff --git a/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff b/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff new file mode 100755 index 0000000000..cbac5e5dd9 Binary files /dev/null and b/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff differ diff --git a/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff2 b/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff2 new file mode 100755 index 0000000000..6a88805fed Binary files /dev/null and b/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff2 differ diff --git a/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.ttf b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.ttf new file mode 100755 index 0000000000..003029527c Binary files /dev/null and b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.ttf differ diff --git a/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff new file mode 100755 index 0000000000..3e635c1a20 Binary files /dev/null and b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff differ diff --git a/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff2 b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff2 new file mode 100755 index 0000000000..cf21729c6b Binary files /dev/null and b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff2 differ diff --git a/resources/www/common/styles/fonts/Regular/Roboto-Regular.ttf b/resources/www/common/styles/fonts/Regular/Roboto-Regular.ttf new file mode 100755 index 0000000000..2c97eeadff Binary files /dev/null and b/resources/www/common/styles/fonts/Regular/Roboto-Regular.ttf differ diff --git a/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff b/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff new file mode 100755 index 0000000000..f43dd1b5fe Binary files /dev/null and b/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff differ diff --git a/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff2 b/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff2 new file mode 100755 index 0000000000..9a0064ec27 Binary files /dev/null and b/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff2 differ diff --git a/resources/www/common/styles/fonts/Thin/Roboto-Thin.ttf b/resources/www/common/styles/fonts/Thin/Roboto-Thin.ttf new file mode 100755 index 0000000000..b74a4fd1a2 Binary files /dev/null and b/resources/www/common/styles/fonts/Thin/Roboto-Thin.ttf differ diff --git a/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff b/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff new file mode 100755 index 0000000000..c95f7b3863 Binary files /dev/null and b/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff differ diff --git a/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff2 b/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff2 new file mode 100755 index 0000000000..2fb9b5f68c Binary files /dev/null and b/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff2 differ diff --git a/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.ttf b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.ttf new file mode 100755 index 0000000000..dd0ddb8526 Binary files /dev/null and b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.ttf differ diff --git a/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff new file mode 100755 index 0000000000..6284128b83 Binary files /dev/null and b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff differ diff --git a/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff2 b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff2 new file mode 100755 index 0000000000..67c4240666 Binary files /dev/null and b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff2 differ diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss index 5f60dafe15..ad1e9e34cd 100644 --- a/resources/www/common/styles/main.scss +++ b/resources/www/common/styles/main.scss @@ -2,6 +2,7 @@ * Common stylesheet, builded into assets/common/styles/common.css */ @import '../../../../node_modules/font-awesome/scss/font-awesome.scss'; +@import './roboto.scss'; @import '../../_shared/styles/variables'; @import '../../vendors/bootstrap/bootstrap'; @import '../../vendors/bootstrap/responsive'; diff --git a/resources/www/common/styles/roboto.scss b/resources/www/common/styles/roboto.scss new file mode 100755 index 0000000000..4b832c14d7 --- /dev/null +++ b/resources/www/common/styles/roboto.scss @@ -0,0 +1,15 @@ +@import "font-sass/variables"; +@import "font-sass/mixins"; +@import "font-sass/Thin"; +@import "font-sass/ThinItalic"; +@import "font-sass/Light"; +@import "font-sass/LightItalic"; +@import "font-sass/Regular"; +@import "font-sass/Italic"; +@import "font-sass/Medium"; +@import "font-sass/MediumItalic"; +@import "font-sass/Bold"; +@import "font-sass/BoldItalic"; +@import "font-sass/Black"; +@import "font-sass/BlackItalic"; + diff --git a/templates/web/prod/actions/Tools/index.html.twig b/templates/web/prod/actions/Tools/index.html.twig index f208b07d3a..3d4cb6029c 100644 --- a/templates/web/prod/actions/Tools/index.html.twig +++ b/templates/web/prod/actions/Tools/index.html.twig @@ -91,108 +91,6 @@ - {% if selectionLength == 1 %} - {% for record in records %} - {% if record.get_type() == 'video' %} -
-
- - {{ "screenshot video" | trans }} -
-
-
- -
- {% set outputFormats = record.getSubdfefByDeviceAndMime(null, ['image/jpeg', 'image/png']) %} - {% set previewHtml5 = record.getSubdfefByDeviceAndMime(constant('\\databox_subdef::DEVICE_SCREEN'), ['video/ogg', 'video/mp4', 'video/webm']) %} - {% set dataW = constant('media_subdef::TC_DATA_WIDTH') %} - {% set dataH = constant('media_subdef::TC_DATA_HEIGHT') %} - - {% set technical_info = record.get_technical_infos %} - {% set width = technical_info[dataW].value %} - {% set height = technical_info[dataH].value %} - - {% if width and height %} - {% set rawRatio = (width / height)|number_format(3, '.') %} - {% set rawRatioLength = rawRatio|length %} - {% set ratio = rawRatio|slice(0,rawRatioLength-1) %} - {% else %} - {% set ratio = '' %} - {% endif %} - - -
- -
-
- -
- {{ 'take a screenshot' | trans }} -
- -
-
- -
-
- -
-

{{ 'To take a screenshot click on camera' | trans }}

- - - -
-
-
-
-
-
- - - - -
-
-
-
- - {{ "video range extractor" | trans }} -
-
-
-
-
Ratio
{{ ratio }}
-
Type
{{ record.get_mime() }}
- {% if record.exif[constant('media_subdef::TC_DATA_FRAMERATE')] is defined %} -
{{ 'Images par secondes' | trans }}
-
{{ record.exif[constant('media_subdef::TC_DATA_FRAMERATE')] | round(2) }} ips
- {% endif %} - {% if record.exif[constant('media_subdef::TC_DATA_AUDIOCODEC')] is defined %} -
{{ 'Codec Audio' | trans }}
-
{{ record.exif[constant('media_subdef::TC_DATA_AUDIOCODEC')] }}
- {% endif %} -
{{ 'Size' | trans }}
{% set width = record.exif[constant('media_subdef::TC_DATA_WIDTH')]|default - (null) %} - {% set height = record.exif[constant('media_subdef::TC_DATA_HEIGHT')]|default(null) %} - {% if width is not none and height is not none %} - {{ width ~ " x " ~ height }} - {% endif %}
-
-
-
- {% endif %} - {% endfor %} - {% endif %} -
{% trans %}Changes for rotation will be applied only on diff --git a/yarn.lock b/yarn.lock index 3df1433437..ef93586b93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,8 +39,8 @@ acorn@^4.0.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" acorn@^5.0.0: - version "5.5.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.1.tgz#84e05a9ea0acbe131227da50301e62464dc9c1d8" + version "5.5.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" after@0.8.2: version "0.8.2" @@ -53,8 +53,8 @@ agent-base@4, agent-base@^4.1.0: es6-promisify "^5.0.0" agentkeepalive@^3.3.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.4.0.tgz#92487926ec1a93100a89a8a46a6b2d82513543ce" + version "3.4.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.4.1.tgz#aa95aebc3a749bca5ed53e3880a09f5235b48f0c" dependencies: humanize-ms "^1.2.1" @@ -79,24 +79,27 @@ ajv@^5.0.0, ajv@^5.1.0: json-schema-traverse "^0.3.0" ajv@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.1.tgz#28a6abc493a2abe0fb4c8507acaedb43fa550671" + version "6.4.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6" dependencies: fast-deep-equal "^1.0.0" fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" + uri-js "^3.0.2" alchemy-embed-medias@^0.5.1: - version "0.5.3" - resolved "https://registry.yarnpkg.com/alchemy-embed-medias/-/alchemy-embed-medias-0.5.3.tgz#5b7b6c9a38d2b4bb76369936217e0740a38ccea2" + version "0.5.4" + resolved "https://registry.yarnpkg.com/alchemy-embed-medias/-/alchemy-embed-medias-0.5.4.tgz#0fd4c943b0c09158959065a67920fa22ab7fbd36" dependencies: es5-shim "^4.3.1" flowplayer "^6.0.4" + gulp-install "^1.0.0" html5shiv "~3.7.3" jquery "~1.11.3" lodash.merge "^3.3.2" modernizr "~3.0.0" pdfjs-dist "1.8.366" + pym.js "^1.3.2" screenfull "^2.0.0" swfobject "^2.2.1" underscore "^1.8.3" @@ -347,8 +350,8 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" atob@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d" + version "2.1.0" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc" autoprefixer@^6.0.0: version "6.7.7" @@ -450,15 +453,14 @@ big.js@^3.1.3: resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" bin-links@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.0.tgz#e0a92cb57f01c4dc1088bca2bae6be110b9f64f9" + version "1.1.2" + resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.2.tgz#fb74bd54bae6b7befc6c6221f25322ac830d9757" dependencies: bluebird "^3.5.0" cmd-shim "^2.0.2" - fs-write-stream-atomic "^1.0.10" gentle-fs "^2.0.0" graceful-fs "^4.1.11" - slide "^1.1.6" + write-file-atomic "^2.3.0" binary-extensions@^1.0.0: version "1.11.0" @@ -508,8 +510,8 @@ blueimp-load-image@2.12.2: resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-2.12.2.tgz#6a17598aab858d4fbf01543e0631141b51057c87" blueimp-load-image@>=1.9.1, blueimp-load-image@^2.14.0, blueimp-load-image@^2.17.1: - version "2.18.0" - resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-2.18.0.tgz#03b93687eb382a7136cfbcbd4f0e936b6763fc0e" + version "2.19.0" + resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-2.19.0.tgz#b61eeac0063f371c710fdb78aebbc4d7d34f8e2e" blueimp-tmpl@3.6.0: version "3.6.0" @@ -707,6 +709,10 @@ bs-recipes@1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585" +buffer-from@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531" + buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" @@ -799,8 +805,8 @@ camelcase@^4.0.0, camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000813" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000813.tgz#e0a1c603f8880ad787b2a35652b2733f32a5e29a" + version "1.0.30000821" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000821.tgz#3fcdc67c446a94a9cdd848248a4e3e54b2da7419" capture-stack-trace@^1.0.0: version "1.0.0" @@ -880,8 +886,8 @@ chokidar@1.7.0, chokidar@^1.6.1: fsevents "^1.0.0" chokidar@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7" + version "2.0.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176" dependencies: anymatch "^2.0.0" async-each "^1.0.0" @@ -895,12 +901,16 @@ chokidar@^2.0.2: readdirp "^2.0.0" upath "^1.0.0" optionalDependencies: - fsevents "^1.0.0" + fsevents "^1.1.2" chownr@^1.0.1, chownr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" +ci-info@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2" + cidr-regex@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-1.0.6.tgz#74abfd619df370b9d54ab14475568e97dd64c0c1" @@ -963,6 +973,14 @@ cliui@^3.0.3, cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" +cliui@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc" + dependencies: + string-width "^2.1.1" + strip-ansi "^4.0.0" + wrap-ansi "^2.0.0" + clone-buffer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" @@ -980,20 +998,20 @@ clone@^0.2.0: resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" clone@^1.0.0, clone@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" clone@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" cloneable-readable@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117" + version "1.1.2" + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.2.tgz#d591dee4a8f8bc15da43ce97dceeba13d43e2a65" dependencies: inherits "^2.0.1" - process-nextick-args "^1.0.6" - through2 "^2.0.1" + process-nextick-args "^2.0.0" + readable-stream "^2.3.5" cmd-shim@^2.0.2, cmd-shim@~2.0.2: version "2.0.2" @@ -1036,8 +1054,8 @@ colors@1.0.3: resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" colors@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + version "1.2.1" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794" columnify@~1.5.4: version "1.5.4" @@ -1071,8 +1089,8 @@ commander@2.8.x: graceful-readlink ">= 1.0.0" commander@^2.2.0, commander@^2.9.0: - version "2.14.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" + version "2.15.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" component-bind@1.0.0: version "1.0.0" @@ -1099,9 +1117,10 @@ concat-stream@1.6.0: typedarray "^0.0.6" concat-stream@^1.5.0, concat-stream@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26" + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" dependencies: + buffer-from "^1.0.0" inherits "^2.0.3" readable-stream "^2.2.2" typedarray "^0.0.6" @@ -1120,8 +1139,8 @@ config-chain@~1.1.11: proto-list "~1.2.1" configstore@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90" + version "3.1.2" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" dependencies: dot-prop "^4.1.0" graceful-fs "^4.1.2" @@ -1177,8 +1196,8 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" core-js@^2.4.0: - version "2.5.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" + version "2.5.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0" core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1284,6 +1303,10 @@ d@1: dependencies: es5-ext "^0.10.9" +dargs@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dargs/-/dargs-5.1.0.tgz#ec7ea50c78564cd36c9d5ec18f66329fade27829" + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -1417,11 +1440,7 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" -depd@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" - -depd@~1.1.0: +depd@~1.1.0, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -1452,6 +1471,10 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" +detect-newline@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" + dev-ip@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" @@ -1500,9 +1523,9 @@ dot-prop@^4.1.0: dependencies: is-obj "^1.0.0" -dotenv@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d" +dotenv@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" duplexer2@0.0.2: version "0.0.2" @@ -1556,8 +1579,8 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" electron-to-chromium@^1.2.7: - version "1.3.36" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.36.tgz#0eabf71a9ebea9013fb1cc35a390e068624f27e8" + version "1.3.41" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.41.tgz#7e33643e00cd85edfd17e04194f6d00e73737235" elliptic@^6.0.0: version "6.4.0" @@ -1602,8 +1625,8 @@ end-of-stream@~0.1.5: once "~1.3.0" engine.io-client@~3.1.0: - version "3.1.5" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.5.tgz#85de17666560327ef1817978f6e3f8101ded2c47" + version "3.1.6" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd" dependencies: component-emitter "1.2.1" component-inherit "0.0.3" @@ -1666,11 +1689,12 @@ error-ex@^1.2.0: is-arrayish "^0.2.1" es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.39" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.39.tgz#fca21b67559277ca4ac1a1ed7048b107b6f76d87" + version "0.10.42" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d" dependencies: es6-iterator "~2.0.3" es6-symbol "~3.1.1" + next-tick "1" es5-shim@^4.3.1, es5-shim@^4.5.1: version "4.5.10" @@ -2003,7 +2027,7 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.0.0: +find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" dependencies: @@ -2047,8 +2071,8 @@ flowplayer@^6.0.4: resolved "https://registry.yarnpkg.com/flowplayer/-/flowplayer-6.0.5.tgz#2493f2165d46873ac47e9938cda68195d92aef23" flush-write-stream@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417" + version "1.0.3" + resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd" dependencies: inherits "^2.0.1" readable-stream "^2.0.4" @@ -2163,7 +2187,7 @@ fs-extra@^1.0.0: jsonfile "^2.1.0" klaw "^1.0.0" -fs-minipass@^1.2.3: +fs-minipass@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" dependencies: @@ -2177,7 +2201,7 @@ fs-vacuum@^1.2.10, fs-vacuum@~1.2.10: path-is-inside "^1.0.1" rimraf "^2.5.2" -fs-write-stream-atomic@^1.0.10, fs-write-stream-atomic@^1.0.8, fs-write-stream-atomic@~1.0.10: +fs-write-stream-atomic@^1.0.8, fs-write-stream-atomic@~1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" dependencies: @@ -2194,7 +2218,7 @@ fs@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/fs/-/fs-0.0.2.tgz#e1f244ef3933c1b2a64bd4799136060d0f5914f8" -fsevents@^1.0.0: +fsevents@^1.0.0, fsevents@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" dependencies: @@ -2584,6 +2608,17 @@ gulp-install@^0.6.0: through2 "^2.0.0" which "^1.0.9" +gulp-install@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/gulp-install/-/gulp-install-1.1.0.tgz#9386b46cb4669b47257b6adf4e3ea2e83c928a1a" + dependencies: + dargs "^5.1.0" + gulp-util "^3.0.7" + lodash.groupby "^4.6.0" + p-queue "^1.0.0" + through2 "^2.0.3" + which "^1.2.14" + gulp-match@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/gulp-match/-/gulp-match-1.0.3.tgz#91c7c0d7f29becd6606d57d80a7f8776a87aba8e" @@ -2611,12 +2646,12 @@ gulp-rename@~1.1.0: map-stream ">=0.0.4" gulp-sass@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/gulp-sass/-/gulp-sass-3.1.0.tgz#53dc4b68a1f5ddfe4424ab4c247655269a8b74b7" + version "3.2.1" + resolved "https://registry.yarnpkg.com/gulp-sass/-/gulp-sass-3.2.1.tgz#2e3688a96fd8be1c0c01340750c191b2e79fab94" dependencies: gulp-util "^3.0" lodash.clonedeep "^4.3.2" - node-sass "^4.2.0" + node-sass "^4.8.3" through2 "^2.0.0" vinyl-sourcemaps-apply "^0.2.0" @@ -2899,9 +2934,9 @@ homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" -hosted-git-info@^2.1.4, hosted-git-info@^2.4.2, hosted-git-info@^2.5.0, hosted-git-info@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" +hosted-git-info@^2.1.4, hosted-git-info@^2.4.2, hosted-git-info@^2.5.0, hosted-git-info@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" html5shiv@^3.7.3, html5shiv@~3.7.3: version "3.7.3" @@ -2920,13 +2955,13 @@ http-errors@~1.5.0: statuses ">= 1.3.1 < 2" http-errors@~1.6.1: - version "1.6.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" + version "1.6.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" dependencies: - depd "1.1.1" + depd "~1.1.2" inherits "2.0.3" - setprototypeof "1.0.3" - statuses ">= 1.3.1 < 2" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" http-proxy-agent@^2.0.0: version "2.1.0" @@ -2963,8 +2998,8 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" https-proxy-agent@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.0.tgz#7fbba856be8cd677986f42ebd3664f6317257887" + version "2.2.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0" dependencies: agent-base "^4.1.0" debug "^3.1.0" @@ -2992,8 +3027,8 @@ iconv-lite@~0.4.13: resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" ieee754@^1.1.4: - version "1.1.8" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" + version "1.1.11" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455" iferr@^0.1.5, iferr@~0.1.5: version "0.1.5" @@ -3065,12 +3100,12 @@ ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" -init-package-json@~1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.1.tgz#cd873a167796befb99612b28762a0b6393fd8f6a" +init-package-json@^1.10.3: + version "1.10.3" + resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe" dependencies: glob "^7.1.1" - npm-package-arg "^4.0.0 || ^5.0.0" + npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0" promzard "^0.3.0" read "~1.0.1" read-package-json "1 || 2" @@ -3137,6 +3172,12 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" +is-ci@^1.0.10: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5" + dependencies: + ci-info "^1.0.0" + is-cidr@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-1.0.0.tgz#fb5aacf659255310359da32cae03e40c6a1c2afc" @@ -3299,8 +3340,8 @@ is-path-cwd@^1.0.0: resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" is-path-in-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc" + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52" dependencies: is-path-inside "^1.0.0" @@ -3428,9 +3469,9 @@ jade@0.26.3: commander "0.6.1" mkdirp "0.3.0" -jake@latest: - version "8.0.15" - resolved "https://registry.yarnpkg.com/jake/-/jake-8.0.15.tgz#f0da7d58e790ac1a8f86e6ee0f193e5d9230eabb" +jake@^8.0.16: + version "8.0.16" + resolved "https://registry.yarnpkg.com/jake/-/jake-8.0.16.tgz#e454911b06ee5cd72afe4e656e522860af69013f" dependencies: async "0.9.x" chalk "0.4.x" @@ -3482,8 +3523,8 @@ jquery.cookie@^1.4.1: resolved "https://registry.yarnpkg.com/jquery.cookie/-/jquery.cookie-1.4.1.tgz#d63dce209eab691fe63316db08ca9e47e0f9385b" jquery.fancytree@^2.27.0: - version "2.28.0" - resolved "https://registry.yarnpkg.com/jquery.fancytree/-/jquery.fancytree-2.28.0.tgz#13cbfbedb1c5aa2b6619b64908c95fccf0138b28" + version "2.28.1" + resolved "https://registry.yarnpkg.com/jquery.fancytree/-/jquery.fancytree-2.28.1.tgz#0ff40370ba630be531a2f2f2a57071c6101890ab" dependencies: jquery ">=1.9" @@ -3538,7 +3579,7 @@ json-loader@^0.5.4: version "0.5.7" resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" -json-parse-better-errors@^1.0.0: +json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a" @@ -3637,12 +3678,6 @@ lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" -lazy-cache@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264" - dependencies: - set-getter "^0.1.0" - lazy-property@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz#84ddc4b370679ba8bd4cdcfa4c06b43d57111147" @@ -3653,21 +3688,17 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -leaflet-contextmenu@^1.4.0: +leaflet-contextmenu@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/leaflet-contextmenu/-/leaflet-contextmenu-1.4.0.tgz#e2bda481af1026080eabaa32997e531fd44f605c" -leaflet-draw@^0.4.10: - version "0.4.14" - resolved "https://registry.yarnpkg.com/leaflet-draw/-/leaflet-draw-0.4.14.tgz#1b5b06d570873a015aa96b80d664dab496c45a4a" +leaflet-draw@^0.3.0: + version "0.3.2" + resolved "https://registry.yarnpkg.com/leaflet-draw/-/leaflet-draw-0.3.2.tgz#717ee8fed4c2a9679c12162e1f922d2da503d109" -leaflet@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.0.2.tgz#fa4fbcb7844944fc2bfb0bcf9ca0dea13463ca21" - -leaflet@^1.1.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.1.tgz#86f336d2fb0e2d0ff446677049a5dc34cf0ea60e" +leaflet@0.7.7, leaflet@^0.7.7: + version "0.7.7" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-0.7.7.tgz#1e352ba54e63d076451fa363c900890cb2cf75ee" levn@~0.3.0: version "0.3.0" @@ -3676,9 +3707,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -libcipm@^1.3.3: - version "1.6.0" - resolved "https://registry.yarnpkg.com/libcipm/-/libcipm-1.6.0.tgz#3ca7cff31f148615a6aac2b14759de14a5688134" +libcipm@^1.6.0: + version "1.6.1" + resolved "https://registry.yarnpkg.com/libcipm/-/libcipm-1.6.1.tgz#156c0efd3f091aa3cf53592a32d0f026d3605eff" dependencies: bin-links "^1.1.0" bluebird "^3.5.1" @@ -3694,18 +3725,18 @@ libcipm@^1.3.3: rimraf "^2.6.2" worker-farm "^1.5.4" -libnpx@~9.7.1: - version "9.7.1" - resolved "https://registry.yarnpkg.com/libnpx/-/libnpx-9.7.1.tgz#55300b5e119bd47b714be9704ca0696ffb18b025" +libnpx@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/libnpx/-/libnpx-10.0.1.tgz#a0104a1336e7621e52172d7970dc1b97fa17ae89" dependencies: - dotenv "^4.0.0" - npm-package-arg "^5.1.2" - rimraf "^2.6.1" + dotenv "^5.0.1" + npm-package-arg "^6.0.0" + rimraf "^2.6.2" safe-buffer "^5.1.0" - update-notifier "^2.2.0" - which "^1.2.14" - y18n "^3.2.1" - yargs "^8.0.2" + update-notifier "^2.3.0" + which "^1.3.0" + y18n "^4.0.0" + yargs "^11.0.0" liftoff@^2.1.0: version "2.5.0" @@ -3940,6 +3971,10 @@ lodash.escape@~2.4.1: lodash._reunescapedhtml "~2.4.1" lodash.keys "~2.4.1" +lodash.groupby@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1" + lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" @@ -4114,16 +4149,16 @@ loud-rejection@^1.0.0: signal-exit "^3.0.0" lowercase-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" lru-cache@2: version "2.7.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@~4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" + version "4.1.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f" dependencies: pseudomap "^1.0.2" yallist "^2.1.2" @@ -4178,15 +4213,15 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -mapbox.js@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/mapbox.js/-/mapbox.js-3.1.1.tgz#4ebe41bd89b533f507fb3455f4f490e417ea1e8f" +mapbox.js@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/mapbox.js/-/mapbox.js-2.4.0.tgz#c43b084a5dd71334c83ee1df28fa67443d73c29c" dependencies: corslite "0.0.6" isarray "0.0.1" - leaflet "1.0.2" + leaflet "0.7.7" mustache "2.2.1" - sanitize-caja "0.1.4" + sanitize-caja "0.1.3" marked@^0.2.8: version "0.2.10" @@ -4256,8 +4291,8 @@ micromatch@2.3.11, micromatch@^2.1.5: regex-cache "^0.4.2" micromatch@^3.0.4, micromatch@^3.1.4: - version "3.1.9" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89" + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" dependencies: arr-diff "^4.0.0" array-unique "^0.3.2" @@ -4271,7 +4306,7 @@ micromatch@^3.0.4, micromatch@^3.1.4: object.pick "^1.3.0" regex-not "^1.0.0" snapdragon "^0.8.1" - to-regex "^3.0.1" + to-regex "^3.0.2" miller-rabin@^4.0.0: version "4.0.1" @@ -4347,10 +4382,11 @@ minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" -minipass@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.1.tgz#5ada97538b1027b4cf7213432428578cb564011f" +minipass@^2.2.1, minipass@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40" dependencies: + safe-buffer "^5.1.1" yallist "^3.0.0" minizlib@^1.1.0: @@ -4389,6 +4425,21 @@ mississippi@^2.0.0: stream-each "^1.1.0" through2 "^2.0.0" +mississippi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" + dependencies: + concat-stream "^1.5.0" + duplexify "^3.4.2" + end-of-stream "^1.1.0" + flush-write-stream "^1.0.0" + from2 "^2.1.0" + parallel-transform "^1.1.0" + pump "^3.0.0" + pumpify "^1.3.3" + stream-each "^1.1.0" + through2 "^2.0.0" + mixin-deep@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" @@ -4501,9 +4552,9 @@ mute-stream@~0.0.4: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.3.0, nan@^2.3.2: - version "2.9.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866" +nan@^2.10.0, nan@^2.3.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" nanomatch@^1.2.9: version "1.2.9" @@ -4523,8 +4574,8 @@ nanomatch@^1.2.9: to-regex "^3.0.1" natives@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.1.tgz#011acce1f7cbd87f7ba6b3093d6cd9392be1c574" + version "1.1.2" + resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.2.tgz#4437ca1ed8a7f047531ccdfaf2792853df4efa1c" negotiator@0.6.1: version "0.6.1" @@ -4534,6 +4585,10 @@ neo-async@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f" +next-tick@1: + version "1.0.0" + resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" + node-ensure@^0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7" @@ -4608,9 +4663,9 @@ node-pre-gyp@^0.6.39: tar "^2.2.1" tar-pack "^3.4.0" -node-sass@^4.2.0: - version "4.7.2" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e" +node-sass@^4.8.3: + version "4.8.3" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.8.3.tgz#d077cc20a08ac06f661ca44fb6f19cd2ed41debb" dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -4624,7 +4679,7 @@ node-sass@^4.2.0: lodash.mergewith "^4.6.0" meow "^3.7.0" mkdirp "^0.5.1" - nan "^2.3.2" + nan "^2.10.0" node-gyp "^3.3.1" npmlog "^4.0.0" request "~2.79.0" @@ -4688,9 +4743,9 @@ npm-install-checks@~3.0.0: dependencies: semver "^2.3.0 || 3.x || 4 || 5" -npm-lifecycle@^2.0.0, npm-lifecycle@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.0.0.tgz#d66fba59e7098dbb5862df66c0d81ed75108f1c6" +npm-lifecycle@^2.0.0, npm-lifecycle@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.0.1.tgz#897313f05ed24db8e28d99fa8b42c31b625e6237" dependencies: byline "^5.0.0" graceful-fs "^4.1.11" @@ -4709,16 +4764,7 @@ npm-modernizr@^2.8.3: version "2.8.3" resolved "https://registry.yarnpkg.com/npm-modernizr/-/npm-modernizr-2.8.3.tgz#f6ae12112faae3d173ea7e8a45fda80e7a8823ed" -"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0", "npm-package-arg@^4.0.0 || ^5.0.0", npm-package-arg@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-5.1.2.tgz#fb18d17bb61e60900d6312619919bd753755ab37" - dependencies: - hosted-git-info "^2.4.2" - osenv "^0.1.4" - semver "^5.1.0" - validate-npm-package-name "^3.0.0" - -npm-package-arg@^6.0.0, npm-package-arg@~6.0.0: +"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@~6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.0.0.tgz#8cce04b49d3f9faec3f56b0fe5f4391aeb9d2fac" dependencies: @@ -4727,6 +4773,15 @@ npm-package-arg@^6.0.0, npm-package-arg@~6.0.0: semver "^5.4.1" validate-npm-package-name "^3.0.0" +npm-package-arg@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-5.1.2.tgz#fb18d17bb61e60900d6312619919bd753755ab37" + dependencies: + hosted-git-info "^2.4.2" + osenv "^0.1.4" + semver "^5.1.0" + validate-npm-package-name "^3.0.0" + npm-packlist@^1.1.10, npm-packlist@~1.1.10: version "1.1.10" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a" @@ -4748,20 +4803,21 @@ npm-profile@^3.0.1: aproba "^1.1.2" make-fetch-happen "^2.5.0" -npm-registry-client@~8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.5.0.tgz#4878fb6fa1f18a5dc08ae83acf94d0d0112d7ed0" +npm-registry-client@^8.5.1: + version "8.5.1" + resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.5.1.tgz#8115809c0a4b40938b8a109b8ea74d26c6f5d7f1" dependencies: concat-stream "^1.5.2" graceful-fs "^4.1.6" normalize-package-data "~1.0.1 || ^2.0.0" - npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0" + npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" once "^1.3.3" request "^2.74.0" retry "^0.10.0" + safe-buffer "^5.1.1" semver "2 >=2.2.1 || 3.x || 4 || 5" slide "^1.1.3" - ssri "^4.1.2" + ssri "^5.2.4" optionalDependencies: npmlog "2 || ^3.1.0 || ^4.0.0" @@ -4776,8 +4832,8 @@ npm-user-validate@~1.0.0: resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951" npm@^5.6.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/npm/-/npm-5.7.1.tgz#cf03d41f70472a74d08061cbe8d56ac418026a55" + version "5.8.0" + resolved "https://registry.yarnpkg.com/npm/-/npm-5.8.0.tgz#5e4bfb8c2e7ada01dd41ec0555d13dd0f446ddb2" dependencies: JSONStream "^1.3.2" abbrev "~1.1.1" @@ -4796,6 +4852,7 @@ npm@^5.6.0: columnify "~1.5.4" config-chain "~1.1.11" detect-indent "~5.0.0" + detect-newline "^2.1.0" dezalgo "~1.0.3" editor "~1.0.0" find-npm-prefix "^1.0.2" @@ -4805,16 +4862,17 @@ npm@^5.6.0: glob "~7.1.2" graceful-fs "~4.1.11" has-unicode "~2.0.1" - hosted-git-info "~2.5.0" + hosted-git-info "^2.6.0" iferr "~0.1.5" inflight "~1.0.6" inherits "~2.0.3" ini "^1.3.5" - init-package-json "~1.10.1" + init-package-json "^1.10.3" is-cidr "~1.0.0" + json-parse-better-errors "^1.0.1" lazy-property "~1.0.0" - libcipm "^1.3.3" - libnpx "~9.7.1" + libcipm "^1.6.0" + libnpx "^10.0.1" lockfile "~1.0.3" lodash._baseuniq "~4.6.0" lodash.clonedeep "~4.5.0" @@ -4823,24 +4881,24 @@ npm@^5.6.0: lodash.without "~4.4.0" lru-cache "~4.1.1" meant "~1.0.1" - mississippi "^2.0.0" + mississippi "^3.0.0" mkdirp "~0.5.1" move-concurrently "^1.0.1" nopt "~4.0.1" normalize-package-data "~2.4.0" npm-cache-filename "~1.0.2" npm-install-checks "~3.0.0" - npm-lifecycle "~2.0.0" + npm-lifecycle "^2.0.1" npm-package-arg "~6.0.0" npm-packlist "~1.1.10" npm-profile "^3.0.1" - npm-registry-client "~8.5.0" + npm-registry-client "^8.5.1" npm-user-validate "~1.0.0" npmlog "~4.1.2" once "~1.4.0" opener "~1.4.3" osenv "^0.1.5" - pacote "^7.3.3" + pacote "^7.6.1" path-is-inside "~1.0.2" promise-inflight "~1.0.1" qrcode-terminal "~0.11.0" @@ -4849,9 +4907,9 @@ npm@^5.6.0: read "~1.0.7" read-cmd-shim "~1.0.1" read-installed "~4.0.3" - read-package-json "~2.0.12" + read-package-json "^2.0.13" read-package-tree "~5.1.6" - readable-stream "^2.3.4" + readable-stream "^2.3.5" request "~2.83.0" retry "~0.10.1" rimraf "~2.6.2" @@ -4863,7 +4921,7 @@ npm@^5.6.0: sorted-union-stream "~2.1.3" ssri "^5.2.4" strip-ansi "~4.0.0" - tar "^4.3.3" + tar "^4.4.0" text-table "~0.2.0" uid-number "0.0.6" umask "~1.1.0" @@ -4873,9 +4931,9 @@ npm@^5.6.0: uuid "^3.2.1" validate-npm-package-name "~3.0.0" which "~1.3.0" - worker-farm "^1.5.2" + worker-farm "^1.5.4" wrappy "~1.0.2" - write-file-atomic "~2.1.0" + write-file-atomic "^2.3.0" "npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@~4.1.2: version "4.1.2" @@ -5082,6 +5140,10 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" +p-queue@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-1.2.0.tgz#639cb8b07270c15b71d7a6446a8e30414f3c96d1" + p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" @@ -5095,9 +5157,9 @@ package-json@^4.0.0: registry-url "^3.0.3" semver "^5.1.0" -pacote@^7.3.3, pacote@^7.5.1: - version "7.5.3" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-7.5.3.tgz#d0304a517d2a39a978caca69f825aaf0eca74232" +pacote@^7.5.1, pacote@^7.6.1: + version "7.6.1" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-7.6.1.tgz#d44621c89a5a61f173989b60236757728387c094" dependencies: bluebird "^3.5.1" cacache "^10.0.4" @@ -5106,7 +5168,7 @@ pacote@^7.3.3, pacote@^7.5.1: lru-cache "^4.1.1" make-fetch-happen "^2.6.0" minimatch "^3.0.4" - mississippi "^2.0.0" + mississippi "^3.0.0" mkdirp "^0.5.1" normalize-package-data "^2.4.0" npm-package-arg "^6.0.0" @@ -5120,7 +5182,7 @@ pacote@^7.3.3, pacote@^7.5.1: safe-buffer "^5.1.1" semver "^5.5.0" ssri "^5.2.4" - tar "^4.3.3" + tar "^4.4.0" unique-filename "^1.1.0" which "^1.3.0" @@ -5309,8 +5371,8 @@ phantomjs-prebuilt@^2.1.3: which "^1.2.10" phraseanet-common@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/phraseanet-common/-/phraseanet-common-0.4.1.tgz#c5a76683cf1a6bf3338d253a6f5417d86b27f5f7" + version "0.4.2" + resolved "https://registry.yarnpkg.com/phraseanet-common/-/phraseanet-common-0.4.2.tgz#740de9bf254116adc506c9703015ab1533f89864" dependencies: es6-promise "^4.1.1" humane-js "^3.2.2" @@ -5320,8 +5382,8 @@ phraseanet-common@^0.4.1: pym.js "^1.3.1" phraseanet-production-client@^0.33.0: - version "0.33.7" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.33.7.tgz#7b5ecb6e3001de9132cd12cb6574f6d25dc25cb9" + version "0.33.13" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.33.13.tgz#82e6e4d3d54659b8270ca2f421a170b032c4e79b" dependencies: axios "^0.16.2" backbone "^1.3.3" @@ -5341,11 +5403,11 @@ phraseanet-production-client@^0.33.0: jquery-ui-datepicker-with-i18n "^1.10.4" jquery.fancytree "~2.7" jquery.tree "0.0.5" - leaflet "^1.1.0" - leaflet-contextmenu "^1.4.0" - leaflet-draw "^0.4.10" + leaflet "^0.7.7" + leaflet-contextmenu "^1.0.0" + leaflet-draw "^0.3.0" lodash.merge "^4.6.0" - mapbox.js "^3.1.1" + mapbox.js "^2.4.0" nouislider "^9.2.0" phraseanet-common "^0.4.1" pym.js "^1.3.1" @@ -5421,11 +5483,7 @@ pretty-hrtime@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" -process-nextick-args@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - -process-nextick-args@~2.0.0: +process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" @@ -5500,6 +5558,13 @@ pump@^2.0.0, pump@^2.0.1: end-of-stream "^1.1.0" once "^1.3.1" +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + pumpify@^1.3.3: version "1.4.0" resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb" @@ -5516,7 +5581,11 @@ punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" -pym.js@^1.3.1: +punycode@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d" + +pym.js@^1.3.1, pym.js@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/pym.js/-/pym.js-1.3.2.tgz#0ebd083c5a7ef7650214db872b4b29a10743305d" @@ -5541,8 +5610,8 @@ qs@~6.5.1: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" query-string@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.0.tgz#9583b15fd1307f899e973ed418886426a9976469" + version "5.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" dependencies: decode-uri-component "^0.2.0" object-assign "^4.1.0" @@ -5616,8 +5685,8 @@ range-parser@~1.2.0: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" rc@^1.0.1, rc@^1.1.6, rc@^1.1.7: - version "1.2.5" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd" + version "1.2.6" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -5643,12 +5712,12 @@ read-installed@~4.0.3: optionalDependencies: graceful-fs "^4.1.2" -"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.12, read-package-json@~2.0.12: - version "2.0.12" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.12.tgz#68ea45f98b3741cb6e10ae3bbd42a605026a6951" +"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.12, read-package-json@^2.0.13: + version "2.0.13" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a" dependencies: glob "^7.1.1" - json-parse-better-errors "^1.0.0" + json-parse-better-errors "^1.0.1" normalize-package-data "^2.0.0" slash "^1.0.0" optionalDependencies: @@ -5700,7 +5769,7 @@ read@1, read@~1.0.1, read@~1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.4: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d" dependencies: @@ -5823,9 +5892,9 @@ request-progress@^2.0.1: dependencies: throttleit "^1.0.0" -request@2, request@^2.74.0, request@^2.81.0, request@~2.83.0: - version "2.83.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" +request@2, request@^2.74.0, request@^2.81.0: + version "2.85.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" dependencies: aws-sign2 "~0.7.0" aws4 "^1.6.0" @@ -5902,6 +5971,33 @@ request@~2.79.0: tunnel-agent "~0.4.1" uuid "^3.0.0" +request@~2.83.0: + version "2.83.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.6.0" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.1" + 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" + json-stringify-safe "~5.0.1" + mime-types "~2.1.17" + oauth-sign "~0.8.2" + 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" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -5938,8 +6034,8 @@ resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" resolve@^1.1.6, resolve@^1.1.7: - version "1.5.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" + version "1.6.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" dependencies: path-parse "^1.0.5" @@ -6017,9 +6113,9 @@ samsam@~1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621" -sanitize-caja@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/sanitize-caja/-/sanitize-caja-0.1.4.tgz#7803e8e452b8e3bacb342dbd93adb885acd078af" +sanitize-caja@0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/sanitize-caja/-/sanitize-caja-0.1.3.tgz#cefbd7cb0e907bea74e8abcb8e86753ec5445576" sass-graph@^2.2.4: version "2.2.4" @@ -6116,12 +6212,6 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" -set-getter@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376" - dependencies: - to-object-path "^0.3.0" - set-immediate-shim@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" @@ -6152,13 +6242,13 @@ setprototypeof@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08" -setprototypeof@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.10" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b" + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" dependencies: inherits "^2.0.1" safe-buffer "^5.0.1" @@ -6205,7 +6295,7 @@ slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" -slide@^1.1.3, slide@^1.1.5, slide@^1.1.6, slide@~1.1.3, slide@~1.1.6: +slide@^1.1.3, slide@^1.1.6, slide@~1.1.3, slide@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" @@ -6228,8 +6318,8 @@ snapdragon-util@^3.0.1: kind-of "^3.2.0" snapdragon@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370" + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" dependencies: base "^0.11.1" debug "^2.2.0" @@ -6238,7 +6328,7 @@ snapdragon@^0.8.1: map-cache "^0.2.2" source-map "^0.5.6" source-map-resolve "^0.5.0" - use "^2.0.0" + use "^3.1.0" sntp@1.x.x: version "1.0.9" @@ -6401,8 +6491,8 @@ squirejs@^0.2.1: resolved "https://registry.yarnpkg.com/squirejs/-/squirejs-0.2.1.tgz#0a52b13ded8a12adb43604e133fd29e4e027c667" sshpk@^1.7.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" + version "1.14.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -6414,15 +6504,9 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" -ssri@^4.1.2: - version "4.1.6" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-4.1.6.tgz#0cb49b6ac84457e7bdd466cb730c3cb623e9a25b" - dependencies: - safe-buffer "^5.1.0" - ssri@^5.0.0, ssri@^5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.2.4.tgz#9985e14041e65fc397af96542be35724ac11da52" + version "5.3.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06" dependencies: safe-buffer "^5.1.1" @@ -6433,9 +6517,9 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -"statuses@>= 1.3.1 < 2": - version "1.4.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" +"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2": + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" statuses@~1.3.0, statuses@~1.3.1: version "1.3.1" @@ -6473,8 +6557,8 @@ stream-each@^1.1.0: stream-shift "^1.0.0" stream-http@^2.7.2: - version "2.8.0" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10" + version "2.8.1" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" @@ -6520,8 +6604,8 @@ string-width@^2.0.0, string-width@^2.1.1: strip-ansi "^4.0.0" string_decoder@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403" + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" dependencies: safe-buffer "~5.1.0" @@ -6667,15 +6751,16 @@ tar@^2.0.0, tar@^2.2.1: fstream "^1.0.2" inherits "2" -tar@^4.3.3: - version "4.4.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.0.tgz#3aaf8c29b6b800a8215f33efb4df1c95ce2ac2f5" +tar@^4.4.0: + version "4.4.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749" dependencies: chownr "^1.0.1" - fs-minipass "^1.2.3" - minipass "^2.2.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" temp-write@~0.1.0: @@ -6735,7 +6820,7 @@ through2@^0.5.0: readable-stream "~1.0.17" xtend "~3.0.0" -through2@^2.0.0, through2@^2.0.1: +through2@^2.0.0, through2@^2.0.1, through2@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" dependencies: @@ -6795,7 +6880,7 @@ to-regex-range@^2.1.0: is-number "^3.0.0" repeat-string "^1.6.1" -to-regex@^3.0.1: +to-regex@^3.0.1, to-regex@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" dependencies: @@ -6976,7 +7061,22 @@ upath@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d" -update-notifier@^2.2.0, update-notifier@~2.3.0: +update-notifier@^2.3.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.4.0.tgz#f9b4c700fbfd4ec12c811587258777d563d8c866" + dependencies: + boxen "^1.2.1" + chalk "^2.0.1" + configstore "^3.0.0" + import-lazy "^2.1.0" + is-ci "^1.0.10" + is-installed-globally "^0.1.0" + is-npm "^1.0.0" + latest-version "^3.0.0" + semver-diff "^2.0.0" + xdg-basedir "^3.0.0" + +update-notifier@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451" dependencies: @@ -6990,6 +7090,12 @@ update-notifier@^2.2.0, update-notifier@~2.3.0: semver-diff "^2.0.0" xdg-basedir "^3.0.0" +uri-js@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa" + dependencies: + punycode "^2.1.0" + urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" @@ -7007,13 +7113,11 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" -use@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8" +use@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544" dependencies: - define-property "^0.2.5" - isobject "^3.0.0" - lazy-cache "^2.0.2" + kind-of "^6.0.2" user-home@^1.1.1: version "1.1.1" @@ -7100,8 +7204,8 @@ video.js@5.5.3: xhr "~2.2.0" video.js@^6.1.0, video.js@^6.2.4: - version "6.7.4" - resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.7.4.tgz#05cf1bbb10aae60fdb27dbc803446f95cf207026" + version "6.8.0" + resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.8.0.tgz#c3cff35d483595e22efc294ba2e720198151f9c9" dependencies: babel-runtime "^6.9.2" global "4.3.2" @@ -7133,8 +7237,8 @@ videojs-font@2.1.0: resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.1.0.tgz#a25930a67f6c9cfbf2bb88dacb8c6b451f093379" videojs-hotkeys@^0.2.20: - version "0.2.20" - resolved "https://registry.yarnpkg.com/videojs-hotkeys/-/videojs-hotkeys-0.2.20.tgz#1dce9d42c29da392cf1742b89ba292c6706c8973" + version "0.2.21" + resolved "https://registry.yarnpkg.com/videojs-hotkeys/-/videojs-hotkeys-0.2.21.tgz#aa0a0a8484e8a8311ff9f4ba82d0934348566bad" videojs-ie8@1.1.1: version "1.1.1" @@ -7340,12 +7444,11 @@ wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" -worker-farm@^1.5.2, worker-farm@^1.5.4: - version "1.5.4" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.4.tgz#4debbe46b40edefcc717ebde74a90b1ae1e909a1" +worker-farm@^1.5.4: + version "1.6.0" + resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0" dependencies: errno "~0.1.7" - xtend "~4.0.1" worker-loader@^0.8.0: version "0.8.1" @@ -7369,7 +7472,7 @@ wrench@^1.5.8: version "1.5.9" resolved "https://registry.yarnpkg.com/wrench/-/wrench-1.5.9.tgz#411691c63a9b2531b1700267279bdeca23b2142a" -write-file-atomic@^2.0.0: +write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" dependencies: @@ -7377,14 +7480,6 @@ write-file-atomic@^2.0.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" -write-file-atomic@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.1.0.tgz#1769f4b551eedce419f0505deae2e26763542d37" - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - slide "^1.1.5" - ws@~3.3.1: version "3.3.3" resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" @@ -7461,6 +7556,12 @@ yargs-parser@^7.0.0: dependencies: camelcase "^4.1.0" +yargs-parser@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" + dependencies: + camelcase "^4.1.0" + yargs@3.29.0: version "3.29.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.29.0.tgz#1aab9660eae79d8b8f675bcaeeab6ee34c2cf69c" @@ -7491,6 +7592,23 @@ yargs@6.4.0: y18n "^3.2.1" yargs-parser "^4.1.0" +yargs@^11.0.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" + dependencies: + cliui "^4.0.0" + decamelize "^1.1.1" + find-up "^2.1.0" + get-caller-file "^1.0.1" + os-locale "^2.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1" + yargs-parser "^9.0.2" + yargs@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-2.3.0.tgz#e900c87250ec5cd080db6009fe3dd63156f1d7fb"