build: revert back to downloading cldr-data directly rather than via npm (#39341)

Revert back to downloading cldr-data directly as the npm package seems to no longer be maintained and additionally, it carries a ~350mb cost in our node modules that is unnecessarily downloaded by most developers and on CI. PR Close #39341
2020-10-20 09:01:23 -07:00 · 2020-10-20 09:01:23 -07:00 · 200b770b85
commit 200b770b85
parent 25e14327ea
8 changed files with 237 additions and 99 deletions
--- a/.gitignore
+++ b/.gitignore
@ -48,3 +48,6 @@ baseline.json

 # Ignore .history for the xyz.local-history VSCode extension
 .history
+
+# CLDR data
+tools/gulp-tasks/cldr/cldr-data/
--- a/gulpfile.js
+++ b/gulpfile.js
@ -32,4 +32,5 @@ gulp.task('changelog', loadTask('changelog'));
 gulp.task('changelog:zonejs', loadTask('changelog-zonejs'));
 gulp.task('check-env', () => {/* this is a noop because the env test ran already above */});
 gulp.task('cldr:extract', loadTask('cldr', 'extract'));
+gulp.task('cldr:download', loadTask('cldr', 'download'));
 gulp.task('cldr:gen-closure-locale', loadTask('cldr', 'closure'));
--- a/package.json
+++ b/package.json
@ -169,7 +169,7 @@
    "check-side-effects": "0.0.21",
    "clang-format": "^1.4.0",
    "cldr": "4.10.0",
-    "cldr-data": "36.0.0",
+    "cldr-data-downloader": "0.3.2",
    "cldrjs": "0.5.0",
    "cli-progress": "^3.7.0",
    "conventional-changelog": "^2.0.3",
--- a/tools/gulp-tasks/cldr.js
+++ b/tools/gulp-tasks/cldr.js
@ -6,14 +6,29 @@
 * found in the LICENSE file at https://angular.io/license
 */

+const path = require('path');
 const fs = require('fs');

 module.exports = {
  extract: gulp => done => {
+    if (!fs.existsSync(path.join(__dirname, 'cldr/cldr-data'))) {
+      throw new Error(`You must run "gulp cldr:download" before you can extract the data`);
+    }
    const extract = require('./cldr/extract');
    return extract(gulp, done);
  },

+  download: gulp => done => {
+    const cldrDownloader = require('cldr-data-downloader');
+    const cldrDataFolder = path.join(__dirname, 'cldr/cldr-data');
+    if (fs.existsSync(cldrDataFolder)) {
+      fs.rmdirSync(cldrDataFolder, {recursive: true});
+    } else {
+      fs.mkdirSync(cldrDataFolder);
+    }
+    cldrDownloader(path.join(__dirname, 'cldr/cldr-urls.json'), cldrDataFolder, {}, done);
+  },
+
  closure: gulp => done => {
    const {RELATIVE_I18N_DATA_FOLDER} = require('./cldr/extract');
    // tslint:disable-next-line:no-console
--- a/tools/gulp-tasks/cldr/cldr-data.js
+++ b/tools/gulp-tasks/cldr/cldr-data.js
@ -0,0 +1,86 @@
+// tslint:disable:file-header
+
+/**
+ * Npm module for Unicode CLDR JSON data
+ *
+ * @license
+ * Copyright 2013 Rafael Xavier de Souza
+ * Released under the MIT license
+ * https://github.com/rxaviers/cldr-data-npm/blob/master/LICENSE-MIT
+ */
+
+'use strict';
+
+const JSON_EXTENSION = /^(.*)\.json$/;
+
+const assert = require('assert');
+const _fs = require('fs');
+const _path = require('path');
+
+function argsToArray(arg) {
+  return [].slice.call(arg, 0);
+}
+
+function jsonFiles(dirName) {
+  const fileList = _fs.readdirSync(_path.join(__dirname, 'cldr-data', dirName));
+
+  return fileList.reduce(function(sum, file) {
+    if (JSON_EXTENSION.test(file)) {
+      return sum.concat(file.match(JSON_EXTENSION)[1]);
+    }
+  }, []);
+}
+
+function cldrData(path /*, ...*/) {
+  assert(
+      typeof path === 'string',
+      'must include path (e.g., "main/en/numbers" or "supplemental/likelySubtags")');
+
+  if (arguments.length > 1) {
+    return argsToArray(arguments).reduce(function(sum, path) {
+      sum.push(cldrData(path));
+      return sum;
+    }, []);
+  }
+  return require('./cldr-data/' + path);
+}
+
+function mainPathsFor(locales) {
+  return locales.reduce(function(sum, locale) {
+    const mainFiles = jsonFiles(_path.join('main', locale));
+    mainFiles.forEach(function(mainFile) {
+      sum.push(_path.join('main', locale, mainFile));
+    });
+    return sum;
+  }, []);
+}
+
+function supplementalPaths() {
+  const supplementalFiles = jsonFiles('supplemental');
+
+  return supplementalFiles.map(function(supplementalFile) {
+    return _path.join('supplemental', supplementalFile);
+  });
+}
+
+Object.defineProperty(cldrData, 'availableLocales', {
+  get: function() {
+    return cldrData('availableLocales').availableLocales;
+  }
+});
+
+cldrData.all = function() {
+  const paths = supplementalPaths().concat(mainPathsFor(this.availableLocales));
+  return cldrData.apply({}, paths);
+};
+
+cldrData.entireMainFor = function(locale /*, ...*/) {
+  assert(typeof locale === 'string', 'must include locale (e.g., "en")');
+  return cldrData.apply({}, mainPathsFor(argsToArray(arguments)));
+};
+
+cldrData.entireSupplemental = function() {
+  return cldrData.apply({}, supplementalPaths());
+};
+
+module.exports = cldrData;
--- a/tools/gulp-tasks/cldr/cldr-urls.json
+++ b/tools/gulp-tasks/cldr/cldr-urls.json
@ -0,0 +1,22 @@
+{
+  "core": [
+    "https://github.com/unicode-cldr/cldr-core/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-segments-modern/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-dates-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-buddhist-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-chinese-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-coptic-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-dangi-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-ethiopic-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-hebrew-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-indian-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-islamic-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-japanese-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-persian-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-roc-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-localenames-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-misc-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-numbers-full/archive/36.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-units-full/archive/36.0.0.zip"
+  ]
+}
--- a/tools/gulp-tasks/cldr/extract.js
+++ b/tools/gulp-tasks/cldr/extract.js
@ -46,7 +46,7 @@ const HEADER = `/**

 // tslint:disable:no-console
 module.exports = (gulp, done) => {
-  const cldrData = require('cldr-data');
+  const cldrData = require('./cldr-data');
  const LOCALES = cldrData.availableLocales;

  console.log(`Loading CLDR data...`);
--- a/yarn.lock
+++ b/yarn.lock
@ -2625,10 +2625,10 @@ adjust-sourcemap-loader@2.0.0:
    object-path "0.11.4"
    regex-parser "2.2.10"

-adm-zip@0.4.11:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
-  integrity sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==
+adm-zip@0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
+  integrity sha1-ph7VrmkFw66lizplfSUDMJEFJzY=

 adm-zip@^0.4.9, adm-zip@~0.4.3, adm-zip@~0.4.x:
  version "0.4.14"
@ -2714,16 +2714,6 @@ ajv@6.12.2, ajv@^6.12.2:
    json-schema-traverse "^0.4.1"
    uri-js "^4.2.2"

-ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 alphanum-sort@^1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@ -3192,7 +3182,7 @@ async@^1.3.0, async@^1.5.2, async@~1.5.2:
  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=

-async@^2.0.0, async@^2.1.2, async@^2.3.0, async@^2.6.2, async@^2.6.3:
+async@^2.0.0, async@^2.0.1, async@^2.1.2, async@^2.3.0, async@^2.6.2, async@^2.6.3:
  version "2.6.3"
  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@ -3249,7 +3239,7 @@ aws-sign2@~0.7.0:
  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=

-aws4@^1.2.1, aws4@^1.6.0, aws4@^1.8.0:
+aws4@^1.2.1, aws4@^1.8.0:
  version "1.9.1"
  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
@ -4218,27 +4208,20 @@ class-utils@^0.3.5:
    isobject "^3.0.0"
    static-extend "^0.1.1"

-cldr-data-downloader@0.3.x:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/cldr-data-downloader/-/cldr-data-downloader-0.3.5.tgz#f5445cb9d222bf7fa8426c62e0ae9d7d4897b243"
-  integrity sha512-uyIMa1K98DAp/PE7dYpq2COIrkWn681Atjng1GgEzeJzYb1jANtugtp9wre6+voE+qzVC8jtWv6E/xZ1GTJdlw==
+cldr-data-downloader@0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cldr-data-downloader/-/cldr-data-downloader-0.3.2.tgz#8d0c98346d16486252fdc9afa36a46542fe4652f"
+  integrity sha1-jQyYNG0WSGJS/cmvo2pGVC/kZS8=
  dependencies:
-    adm-zip "0.4.11"
+    adm-zip "0.4.4"
    mkdirp "0.5.0"
    nopt "3.0.x"
+    npmconf "2.0.9"
    progress "1.1.8"
    q "1.0.1"
-    request "~2.87.0"
+    request "~2.74.0"
    request-progress "0.3.1"

-cldr-data@36.0.0:
-  version "36.0.0"
-  resolved "https://registry.yarnpkg.com/cldr-data/-/cldr-data-36.0.0.tgz#55b3a50b187c28d59203182cb57e98141558c91b"
-  integrity sha512-F3n+9DUs41vhys8eF/hsCgkmYlgXMCiwaE75uGZjUbS/jkszBnLylXj7xW3bBlMU1d2IuAptpoNAb6lTCu/RSg==
-  dependencies:
-    cldr-data-downloader "0.3.x"
-    glob "5.x.x"
-
 cldr@4.10.0:
  version "4.10.0"
  resolved "https://registry.yarnpkg.com/cldr/-/cldr-4.10.0.tgz#5a72a693728eca491bc8ee027d60fa4dc750a24f"
@ -4396,11 +4379,6 @@ cloneable-readable@^1.0.0:
    process-nextick-args "^2.0.0"
    readable-stream "^2.3.5"

-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
 coa@^2.0.2:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
@ -4619,6 +4597,14 @@ concat-stream@^2.0.0:
    readable-stream "^3.0.2"
    typedarray "^0.0.6"

+config-chain@~1.1.8:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 configstore@^3.0.0:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
@ -6399,7 +6385,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
    assign-symbols "^1.0.0"
    is-extendable "^1.0.1"

-extend@3, extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
+extend@3, extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.0, extend@~3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@ -6463,11 +6449,6 @@ fancy-log@^1.1.0, fancy-log@^1.3.2:
    parse-node-version "^1.0.0"
    time-stamp "^1.0.0"

-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
 fast-deep-equal@^3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
@ -6875,6 +6856,15 @@ form-data@^3.0.0:
    combined-stream "^1.0.8"
    mime-types "^2.1.12"

+form-data@~1.0.0-rc4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
+  integrity sha1-rjFduaSQf6BlUCMEpm13M0de43w=
+  dependencies:
+    async "^2.0.1"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.11"
+
 form-data@~2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
@ -6884,7 +6874,7 @@ form-data@~2.0.0:
    combined-stream "^1.0.5"
    mime-types "^2.1.11"

-form-data@~2.3.1, form-data@~2.3.2:
+form-data@~2.3.2:
  version "2.3.3"
  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
@ -7314,17 +7304,6 @@ glob2base@^0.0.12:
  dependencies:
    find-index "^0.1.1"

-glob@5.x.x, glob@~5.0.0:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@7.1.2:
  version "7.1.2"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@ -7368,6 +7347,17 @@ glob@~3.1.21:
    inherits "1"
    minimatch "~0.2.11"

+glob@~5.0.0:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-dirs@^0.1.0:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
@ -7747,14 +7737,6 @@ har-validator@~2.0.6:
    is-my-json-valid "^2.12.4"
    pinkie-promise "^2.0.0"

-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.3:
  version "5.1.3"
  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
@ -8305,7 +8287,7 @@ inherits@2.0.3:
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=

-ini@1.3.5, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0, ini@~1.3.3:
+ini@1.3.5, ini@^1.2.0, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0, ini@~1.3.3:
  version "1.3.5"
  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@ -9180,11 +9162,6 @@ json-parse-helpfulerror@^1.0.3:
  dependencies:
    jju "^1.1.0"

-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
  version "0.4.1"
  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@ -10927,7 +10904,7 @@ nodejs-websocket@^1.7.2:
  resolved "https://registry.yarnpkg.com/nodejs-websocket/-/nodejs-websocket-1.7.2.tgz#94abd1e248f57d4d1c663dec3831015c6dad98a6"
  integrity sha512-PFX6ypJcCNDs7obRellR0DGTebfUhw1SXGKe2zpB+Ng1DQJhdzbzx1ob+AvJCLzy2TJF4r8cCDqMQqei1CZdPQ==

-nopt@3.0.x, nopt@^3.0.1:
+nopt@3.0.x, nopt@^3.0.1, nopt@~3.0.1:
  version "3.0.6"
  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
@ -11060,6 +11037,21 @@ npm-run-path@^2.0.0:
  dependencies:
    path-key "^2.0.0"

+npmconf@2.0.9:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/npmconf/-/npmconf-2.0.9.tgz#5c87e5fb308104eceeca781e3d9115d216351ef2"
+  integrity sha1-XIfl+zCBBOzuyngePZEV0hY1HvI=
+  dependencies:
+    config-chain "~1.1.8"
+    inherits "~2.0.0"
+    ini "^1.2.0"
+    mkdirp "^0.5.0"
+    nopt "~3.0.1"
+    once "~1.3.0"
+    osenv "^0.1.0"
+    semver "2 || 3 || 4"
+    uid-number "0.0.5"
+
 nth-check@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@ -11082,7 +11074,7 @@ number-is-nan@^1.0.0:
  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=

-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+oauth-sign@~0.8.1:
  version "0.8.2"
  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
@ -11414,11 +11406,19 @@ os-shim@^0.1.2:
  resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917"
  integrity sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc=

-os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=

+osenv@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 "over@>= 0.0.5 < 1":
  version "0.0.5"
  resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708"
@ -12413,6 +12413,11 @@ propagate@^2.0.0:
  resolved "https://registry.yarnpkg.com/propagate/-/propagate-2.0.1.tgz#40cdedab18085c792334e64f0ac17256d38f9a45"
  integrity sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==

+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+
 protobufjs@6.8.8:
  version "6.8.8"
  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz#c8b4f1282fd7a90e6f5b109ed11c84af82908e7c"
@ -12628,7 +12633,7 @@ qs@~6.4.0:
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
  integrity sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=

-qs@~6.5.1, qs@~6.5.2:
+qs@~6.5.2:
  version "6.5.2"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
@ -13095,31 +13100,32 @@ request@2.x, request@^2.79.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
    tunnel-agent "^0.6.0"
    uuid "^3.3.2"

-request@~2.87.0:
-  version "2.87.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
+request@~2.74.0:
+  version "2.74.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab"
+  integrity sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=
  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    bl "~1.1.2"
+    caseless "~0.11.0"
    combined-stream "~1.0.5"
-    extend "~3.0.1"
+    extend "~3.0.0"
    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    http-signature "~1.2.0"
+    form-data "~1.0.0-rc4"
+    har-validator "~2.0.6"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
    is-typedarray "~1.0.0"
    isstream "~0.1.2"
    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
+    mime-types "~2.1.7"
+    node-uuid "~1.4.7"
+    oauth-sign "~0.8.1"
+    qs "~6.2.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"

 require-directory@^2.1.1:
  version "2.1.1"
@ -13644,6 +13650,11 @@ semver-regex@^2.0.0:
  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
  integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==

+"semver@2 || 3 || 4", semver@^4.1.0:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
+
 "semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.1:
  version "5.7.1"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@ -13674,11 +13685,6 @@ semver@7.3.2, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2:
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==

-semver@^4.1.0:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
-
 semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
  version "6.3.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@ -15055,7 +15061,7 @@ touch@0.0.3:
  dependencies:
    nopt "~1.0.10"

-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@~2.3.0:
  version "2.3.4"
  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
@ -15346,6 +15352,11 @@ uglify-js@^3.1.4:
    commander "~2.20.3"
    source-map "~0.6.1"

+uid-number@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.5.tgz#5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"
+  integrity sha1-Wj2yPvXb1VuB/ODsmirG/M3ruB4=
+
 ultron@~1.1.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
@ -15688,7 +15699,7 @@ uuid@7.0.2:
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.2.tgz#7ff5c203467e91f5e0d85cfcbaaf7d2ebbca9be6"
  integrity sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw==

-uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.0.0, uuid@^3.3.2, uuid@^3.4.0:
  version "3.4.0"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==