Compress sounds into atlas

2026-03-02 03:39:21 +00:00 · 2020-05-19 11:08:28 +02:00
parent 5f37ff001b
commit a7fff0dcd2
27 changed files with 368 additions and 225 deletions
--- a/gulp/gulpfile.js
+++ b/gulp/gulpfile.js
@@ -80,8 +80,13 @@ translations.gulptasksTranslations($, gulp, buildFolder);
 gulp.task("utils.cleanBuildFolder", () => {
    return gulp.src(buildFolder, { read: false }).pipe($.clean({ force: true }));
 });
+gulp.task("utils.cleanBuildTempFolder", () => {
+    return gulp
+        .src(path.join(__dirname, "..", "src", "js", "built-temp"), { read: false })
+        .pipe($.clean({ force: true }));
+});

-gulp.task("utils.cleanup", $.sequence("utils.cleanBuildFolder", "translations.clear"));
+gulp.task("utils.cleanup", $.sequence("utils.cleanBuildFolder", "utils.cleanBuildTempFolder"));

 // Requires no uncomitted files
 gulp.task("utils.requireCleanWorkingTree", cb => {
@@ -151,16 +156,12 @@ function serve({ standalone }) {
    gulp.watch("../translations/**/*.yaml", ["translations.convertToJson"]);

    gulp.watch(
-        ["../res_raw/sounds/ui/*.mp3", "../res_raw/sounds/ui/*.wav"],
-        $.sequence("sounds.encodeUi", "sounds.copy")
-    );
-    gulp.watch(
-        ["../res_raw/sounds/game/*.mp3", "../res_raw/sounds/game/*.wav"],
-        $.sequence("sounds.encodeGame", "sounds.copy")
+        ["../res_raw/sounds/sfx/*.mp3", "../res_raw/sounds/sfx/*.wav"],
+        $.sequence("sounds.sfx", "sounds.copy")
    );
    gulp.watch(
        ["../res_raw/sounds/music/*.mp3", "../res_raw/sounds/music/*.wav"],
-        $.sequence("sounds.encodeMusic", "sounds.copy")
+        $.sequence("sounds.music", "sounds.copy")
    );

    // Watch resource files and copy them on change
@@ -176,7 +177,7 @@ function serve({ standalone }) {
        return gulp.src(e.path).pipe(browserSync.reload({ stream: true }));
    });

-    gulp.watch("../src/js/translations-built/*.json").on("change", function (e) {
+    gulp.watch("../src/js/built-temp/*.json").on("change", function (e) {
        return gulp.src(e.path).pipe(browserSync.reload({ stream: true }));
    });

@@ -197,7 +198,7 @@ gulp.task("default", ["main.serveDev"]);
 /////////////////////  RUNNABLE TASKS  /////////////////////

 // Pre and postbuild
-gulp.task("step.baseResources", cb => $.multiProcess(["sounds.fullbuild", "imgres.allOptimized"], cb, false));
+gulp.task("step.baseResources", cb => $.sequence("imgres.allOptimized")(cb));
 gulp.task("step.deleteEmpty", cb => {
    deleteEmpty.sync(buildFolder);
    cb();
@@ -236,7 +237,7 @@ gulp.task("build.standalone.dev", cb => {
 });

 // Builds everything (staging)
-gulp.task("step.staging.code", $.sequence("translations.fullBuild", "js.staging"));
+gulp.task("step.staging.code", $.sequence("sounds.fullbuild", "translations.fullBuild", "js.staging"));
 gulp.task("step.staging.mainbuild", cb =>
    $.multiProcess(["utils.copyAdditionalBuildFiles", "step.baseResources", "step.staging.code"], cb, false)
 );
@@ -244,7 +245,7 @@ gulp.task("step.staging.all", $.sequence("step.staging.mainbuild", "css.prod", "
 gulp.task("build.staging", $.sequence("utils.cleanup", "step.staging.all", "step.postbuild"));

 // Builds everything (prod)
-gulp.task("step.prod.code", $.sequence("translations.fullBuild", "js.prod"));
+gulp.task("step.prod.code", $.sequence("sounds.fullbuild", "translations.fullBuild", "js.prod"));
 gulp.task("step.prod.mainbuild", cb =>
    $.multiProcess(["utils.copyAdditionalBuildFiles", "step.baseResources", "step.prod.code"], cb, false)
 );
@@ -252,7 +253,10 @@ gulp.task("step.prod.all", $.sequence("step.prod.mainbuild", "css.prod", "html.p
 gulp.task("build.prod", $.sequence("utils.cleanup", "step.prod.all", "step.postbuild"));

 // Builds everything (standalone-beta)
-gulp.task("step.standalone-beta.code", $.sequence("translations.fullBuild", "js.standalone-beta"));
+gulp.task(
+    "step.standalone-beta.code",
+    $.sequence("sounds.fullbuild", "translations.fullBuild", "js.standalone-beta")
+);
 gulp.task("step.standalone-beta.mainbuild", cb =>
    $.multiProcess(
        ["utils.copyAdditionalBuildFiles", "step.baseResources", "step.standalone-beta.code"],
@@ -267,7 +271,10 @@ gulp.task(
 gulp.task("build.standalone-beta", $.sequence("utils.cleanup", "step.standalone-beta.all", "step.postbuild"));

 // Builds everything (standalone-prod)
-gulp.task("step.standalone-prod.code", $.sequence("translations.fullBuild", "js.standalone-prod"));
+gulp.task(
+    "step.standalone-prod.code",
+    $.sequence("sounds.fullbuild", "translations.fullBuild", "js.standalone-prod")
+);
 gulp.task("step.standalone-prod.mainbuild", cb =>
    $.multiProcess(
        ["utils.copyAdditionalBuildFiles", "step.baseResources", "step.standalone-prod.code"],
--- a/gulp/package.json
+++ b/gulp/package.json
@@ -18,6 +18,7 @@
        "@types/filesystem": "^0.0.29",
        "@types/node": "^12.7.5",
        "ajv": "^6.10.2",
+        "audiosprite": "^0.7.2",
        "babel-loader": "^8.1.0",
        "browser-sync": "^2.24.6",
        "circular-dependency-plugin": "^5.0.2",
@@ -32,6 +33,7 @@
        "fastdom": "^1.0.9",
        "flatted": "^2.0.1",
        "fs-extra": "^8.1.0",
+        "gulp-audiosprite": "^1.1.0",
        "howler": "^2.1.2",
        "html-loader": "^0.5.5",
        "ignore-loader": "^0.1.2",
@@ -48,6 +50,7 @@
        "strictdom": "^1.0.1",
        "string-replace-webpack-plugin": "^0.1.3",
        "terser-webpack-plugin": "^1.1.0",
+        "through2": "^3.0.1",
        "uglify-template-string-loader": "^1.1.0",
        "unused-files-webpack-plugin": "^3.4.0",
        "webpack": "^4.31.0",
--- a/gulp/sounds.js
+++ b/gulp/sounds.js
@@ -1,4 +1,5 @@
 const path = require("path");
+const audiosprite = require("gulp-audiosprite");

 function gulptasksSounds($, gulp, buildFolder) {
    // Gather some basic infos
@@ -16,7 +17,7 @@ function gulptasksSounds($, gulp, buildFolder) {
    });

    // Encodes the game music
-    gulp.task("sounds.encodeMusic", () => {
+    gulp.task("sounds.music", () => {
        return gulp
            .src([path.join(soundsDir, "music", "**", "*.wav"), path.join(soundsDir, "music", "**", "*.mp3")])
            .pipe($.plumber())
@@ -40,53 +41,43 @@ function gulptasksSounds($, gulp, buildFolder) {
    });

    // Encodes the ui sounds
-    gulp.task("sounds.encodeUi", () => {
+    gulp.task("sounds.sfxGenerateSprites", () => {
        return gulp
-            .src([path.join(soundsDir, "ui", "**", "*.wav"), path.join(soundsDir, "ui", "**", "*.mp3")])
+            .src([path.join(soundsDir, "sfx", "**", "*.wav"), path.join(soundsDir, "sfx", "**", "*.mp3")])
            .pipe($.plumber())
            .pipe(
-                $.cache(
-                    $.fluentFfmpeg("mp3", function (cmd) {
-                        return cmd
-                            .audioBitrate(128)
-                            .audioChannels(1)
-                            .audioFrequency(22050)
-                            .audioCodec("libmp3lame")
-                            .audioFilters(filters);
-                    })
-                ),
-                {
-                    name: "uisounds",
-                    fileCache,
-                }
+                audiosprite({
+                    format: "howler",
+                    output: "sfx",
+                    gap: 0.1,
+                    export: "mp3",
+                })
            )
-            .pipe(gulp.dest(path.join(builtSoundsDir, "ui")));
+            .pipe(gulp.dest(path.join(builtSoundsDir)));
    });
-
-    // Encodes the game sounds
-    gulp.task("sounds.encodeGame", () => {
+    gulp.task("sounds.sfxOptimize", () => {
        return gulp
-
-            .src([path.join(soundsDir, "game", "**", "*.wav"), path.join(soundsDir, "game", "**", "*.mp3")])
+            .src([path.join(builtSoundsDir, "sfx.mp3")])
            .pipe($.plumber())
            .pipe(
-                $.cache(
-                    $.fluentFfmpeg("mp3", function (cmd) {
-                        return cmd
-                            .audioBitrate(128)
-                            .audioChannels(1)
-                            .audioFrequency(22050)
-                            .audioCodec("libmp3lame")
-                            .audioFilters(filters);
-                    }),
-                    {
-                        nane: "gamesounds",
-                        fileCache,
-                    }
-                )
+                $.fluentFfmpeg("mp3", function (cmd) {
+                    return cmd
+                        .audioBitrate(128)
+                        .audioChannels(1)
+                        .audioFrequency(22050)
+                        .audioCodec("libmp3lame")
+                        .audioFilters(filters);
+                })
            )
-            .pipe(gulp.dest(path.join(builtSoundsDir, "game")));
+            .pipe(gulp.dest(path.join(builtSoundsDir)));
    });
+    gulp.task("sounds.sfxCopyAtlas", () => {
+        return gulp
+            .src([path.join(builtSoundsDir, "sfx.json")])
+            .pipe(gulp.dest(path.join(__dirname, "..", "src", "js", "built-temp")));
+    });
+
+    gulp.task("sounds.sfx", ["sounds.sfxGenerateSprites", "sounds.sfxOptimize", "sounds.sfxCopyAtlas"]);

    gulp.task("sounds.copy", () => {
        return gulp
@@ -96,15 +87,10 @@ function gulptasksSounds($, gulp, buildFolder) {
            .pipe(gulp.dest(path.join(buildFolder, "res", "sounds")));
    });

-    gulp.task("sounds.buildall", cb =>
-        $.multiProcess(["sounds.encodeMusic", "sounds.encodeUi", "sounds.encodeGame"], cb, true)
-    );
+    gulp.task("sounds.buildall", cb => $.multiProcess(["sounds.music", "sounds.sfx"], cb, true));

    gulp.task("sounds.fullbuild", cb => $.sequence("sounds.clear", "sounds.buildall", "sounds.copy")(cb));
-
-    gulp.task("sounds.dev", cb => {
-        return $.sequence("sounds.buildall", "sounds.copy")(cb);
-    });
+    gulp.task("sounds.dev", cb => $.sequence("sounds.buildall", "sounds.copy")(cb));
 }

 module.exports = {
--- a/gulp/translations.js
+++ b/gulp/translations.js
@@ -3,13 +3,9 @@ const path = require("path");
 const yaml = require("gulp-yaml");

 const translationsSourceDir = path.join(__dirname, "..", "translations");
-const translationsJsonDir = path.join(__dirname, "..", "src", "js", "translations-built");
+const translationsJsonDir = path.join(__dirname, "..", "src", "js", "built-temp");

 function gulptasksTranslations($, gulp, buildFolder) {
-    gulp.task("translations.clear", () => {
-        return gulp.src(translationsJsonDir, { read: false }).pipe($.clean({ force: true }));
-    });
-
    gulp.task("translations.convertToJson", () => {
        return gulp
            .src(path.join(translationsSourceDir, "*.yaml"))
--- a/gulp/yarn.lock
+++ b/gulp/yarn.lock
@@ -1854,6 +1854,11 @@ async@~0.9.0:
  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=

+async@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
+  integrity sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=
+
 async@~2.1.4:
  version "2.1.5"
  resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc"
@@ -1871,6 +1876,18 @@ atob@^2.1.1:
  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==

+audiosprite@*, audiosprite@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/audiosprite/-/audiosprite-0.7.2.tgz#ac431a6c30c127bbb6ed743e5d178862ddf9e31e"
+  integrity sha512-9Z6UwUuv4To5nUQNRIw5/Q3qA7HYm0ANzoW5EDGPEsU2oIRVgmIlLlm9YZfpPKoeUxt54vMStl2/762189VmJw==
+  dependencies:
+    async "~0.9.0"
+    glob "^6.0.4"
+    mkdirp "^0.5.0"
+    optimist "~0.6.1"
+    underscore "~1.8.3"
+    winston "~1.0.0"
+
 author-regex@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450"
@@ -3065,7 +3082,7 @@ color@^3.0.0:
    color-convert "^1.9.1"
    color-string "^1.5.2"

-colors@1.0.3:
+colors@1.0.3, colors@1.0.x:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
@@ -3661,6 +3678,11 @@ currently-unhandled@^0.4.1:
  dependencies:
    array-find-index "^1.0.1"

+cycle@1.0.x:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
+  integrity sha1-IegLK+hYD5i0aPN5QwZisEbDStI=
+
 cyclist@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -5038,6 +5060,11 @@ extsprintf@^1.2.0:
  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=

+eyes@0.1.x:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
+  integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=
+
 fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2, fancy-log@^1.3.3:
  version "1.3.3"
  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
@@ -5837,6 +5864,17 @@ glob@^5.0.3:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

+glob@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
  version "7.1.4"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
@@ -6080,6 +6118,15 @@ graceful-fs@~1.2.0:
  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=

+gulp-audiosprite@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/gulp-audiosprite/-/gulp-audiosprite-1.1.0.tgz#1762d7fb9a669f372b33c1511e3402d79b624892"
+  integrity sha512-CwSfZjmNPlTyzcAFaE8RiKzh1dQFDLPPZMHshKwvGqNeTB86s30K8hMXGrrjFqHNF9xb0SUnXfbYT32MO4aNog==
+  dependencies:
+    audiosprite "*"
+    through2 "*"
+    vinyl "*"
+
 gulp-cache@^1.1.3:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/gulp-cache/-/gulp-cache-1.1.3.tgz#7c427670aad4d25364c3cc9c53e492b348190d27"
@@ -7627,7 +7674,7 @@ isobject@^3.0.0, isobject@^3.0.1:
  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=

-isstream@~0.1.2:
+isstream@0.1.x, isstream@~0.1.2:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
@@ -8850,6 +8897,11 @@ minimist@^1.2.5:
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==

+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+
 minipass@^2.2.1, minipass@^2.6.0, minipass@^2.6.4:
  version "2.7.0"
  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.7.0.tgz#c01093a82287c8331f08f1075499fef124888796"
@@ -9523,6 +9575,14 @@ opn@5.3.0:
  dependencies:
    is-wsl "^1.1.0"

+optimist@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
 optionator@^0.8.1, optionator@^0.8.2:
  version "0.8.2"
  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
@@ -10069,6 +10129,11 @@ pkg-dir@^3.0.0:
  dependencies:
    find-up "^3.0.0"

+pkginfo@0.3.x:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.3.1.tgz#5b29f6a81f70717142e09e765bbeab97b4f81e21"
+  integrity sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=
+
 plist@^3.0.0, plist@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
@@ -12330,6 +12395,11 @@ stable@^0.1.8:
  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==

+stack-trace@0.0.x:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
+
 stat-mode@^0.2.0:
  version "0.2.2"
  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
@@ -12892,6 +12962,13 @@ through2-filter@^3.0.0:
    through2 "~2.0.0"
    xtend "~4.0.0"

+through2@*, through2@3.0.1, through2@^3.0.0, through2@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
 through2@2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.1.tgz#384e75314d49f32de12eebb8136b8eb6b5d59da9"
@@ -12908,13 +12985,6 @@ through2@2.0.3:
    readable-stream "^2.1.5"
    xtend "~4.0.1"

-through2@3.0.1, through2@^3.0.0, through2@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
-  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
-  dependencies:
-    readable-stream "2 || 3"
-
 through2@^0.4.1, through2@~0.4.2:
  version "0.4.2"
  resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
@@ -13279,6 +13349,11 @@ unc-path-regex@^0.1.2:
  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=

+underscore@~1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
+  integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -13644,6 +13719,18 @@ vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1:
  dependencies:
    source-map "^0.5.1"

+vinyl@*, vinyl@^2.1.0, vinyl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
+  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
+  dependencies:
+    clone "^2.1.1"
+    clone-buffer "^1.0.0"
+    clone-stats "^1.0.0"
+    cloneable-readable "^1.0.0"
+    remove-trailing-separator "^1.0.1"
+    replace-ext "^1.0.0"
+
 vinyl@^0.2.1, vinyl@~0.2.2:
  version "0.2.3"
  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.2.3.tgz#bca938209582ec5a49ad538a00fa1f125e513252"
@@ -13677,18 +13764,6 @@ vinyl@^1.0.0:
    clone-stats "^0.0.1"
    replace-ext "0.0.1"

-vinyl@^2.1.0, vinyl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
 vm-browserify@^1.0.1:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
@@ -13910,6 +13985,24 @@ window-size@^0.2.0:
  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
  integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=

+winston@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-1.0.2.tgz#351c58e2323f8a4ca29a45195aa9aa3b4c35d76f"
+  integrity sha1-NRxY4jI/ikyimkUZWqmqO0w1128=
+  dependencies:
+    async "~1.0.0"
+    colors "1.0.x"
+    cycle "1.0.x"
+    eyes "0.1.x"
+    isstream "0.1.x"
+    pkginfo "0.3.x"
+    stack-trace "0.0.x"
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
 wordwrap@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"