Update yarn.lock

.circleci/config.yml

@@ -186,14 +186,14 @@ jobs:
       - run: yarn
       - save_yarn_cache
       - restore_workingdir_cache:
-          sdk_version: sdk35
+          sdk_version: sdk32
           platform: ios
       - run:
           name: Run iOS smoke tests
           command: ./scripts/tests/runIOSSmokeTestsCI.sh
       - save_workingdir_cache:
           workingdir: /Users/distiller/project/workingdir
-          sdk_version: sdk35
+          sdk_version: sdk32
           platform: ios
 
   android_smoke_tests:

.gitignore

@@ -1,3 +1,5 @@
+!/src/node_modules
+
 node_modules
 yarn-error.log
 google-cloud-credentials.json
@@ -5,8 +7,6 @@ google-cloud-credentials.json
 /build/
 /workingdir/*
 /artifacts/*
-.history
-
 shell.apk
 .secrets*
 

CHANGELOG.md

@@ -7,63 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-### Added
-
-- Added validation for `--public-url`.
-
-### Changed
-
-- Changed the way of installing NDK - it's installed with `sdkmanager` now.
-- Upgraded NDK to 17.2.4988734.
-
-### Fixed
-
-- A bug where the `platform` field in logs wasn't set correctly when using a shortcut command.
-
-## [0.13.9] - 2020-02-13
-
-### Fixed
-
-- Fixed Notifications.getDevicePushTokenAsync() erroring occasionally on iOS SDK 36.
-
-## [0.13.8] - 2020-01-27
-
-### Fixed
-
-- Fixed `react-native-maps` native module not being properly initialized (https://github.com/expo/expo/pull/6844)
-- Fixed Android standalone apps crashing on startup (https://github.com/expo/expo/pull/6825)
-
-## [0.13.7] - 2020-01-15
-
-### Added
-
-- Bumped `traveling-fastlane` to 1.11.4 to update CA certs
-
-## [0.13.6] - 2019-12-17
-
-### Fixed
-
-- Fixed issue with missing request handler for assets-library urls.
-
-## [0.13.4] - 2019-12-13
-
-### Added
-
-- Support for building iOS apps with a wildcard provisioning profile.
-
-## [0.13.3] - 2019-12-12
-
-### Fixed
-
-- Removed private API usage from iOS SDK 36 tarball
-
-## [0.13.2] - 2019-12-10
-
-### Fixed
-
-- Fixed Android App Bundle builds
-- Fixed issue with Root View Background Color and AppLoading on Android SDK 36 builds
-
 ## [0.13.1] - 2019-12-09
 
 ### Fixed

Dockerfile

@@ -1,5 +1,5 @@
 # see docker-base/Dockerfile to learn what's installed in the turtle-android-base image
-FROM gcr.io/exponentjs/turtle-android-base:0.1.3
+FROM gcr.io/exponentjs/turtle-android-base:0.1.0
 
 ADD . /app/turtle
 

bin/turtle.js

@@ -3,18 +3,7 @@
 
 const subcommand = process.argv[2];
 if (subcommand) {
-  let platform;
-  if (subcommand.length === 2) {
-    const letter = subcommand[1];
-    if (letter === 'a') {
-      platform = 'android';
-    } else if (letter === 'i') {
-      platform = 'ios';
-    }
-  } else {
-    const [, maybePlatform] = subcommand.split(':');
-    platform = maybePlatform;
-  }
+  const [, platform] = subcommand.split(':');
   if (platform === 'ios' || platform === 'android') {
     // so that logs have correct platform set
     process.env.PLATFORM = platform;

docker-base/Dockerfile

@@ -17,7 +17,6 @@ RUN dpkg --add-architecture i386 && \
   build-essential\
   bzip2:i386\
   file\
-  jq\
   lib32ncurses5\
   lib32z1\
   libc6:i386\
@@ -55,33 +54,39 @@ ENV PATH ${ANDROID_HOME}/tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
 ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
 
-ADD configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
+ADD scripts/android/configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
 RUN /tmp/configureAndroidSdk.sh --install-all-platforms
 
+# Install Android NDK
+ENV ANDROID_NDK_VERSION android-ndk-r10e
+ENV ANDROID_NDK_FILE ${ANDROID_NDK_VERSION}-linux-x86_64.bin
+ENV ANDROID_NDK_URL https://dl.google.com/android/ndk/${ANDROID_NDK_FILE}
+ENV ANDROID_NDK /opt/${ANDROID_NDK_VERSION}
+ENV PATH $ANDROID_NDK:$PATH
+
+# i have no clue why some of this is here, but it's working elsewhere
+# it appears to install the NDK version expo needs, so that's cool
+RUN mkdir /ndk_setup && cd /ndk_setup && \
+  curl -L ${ANDROID_NDK_URL} > ${ANDROID_NDK_FILE} && \
+  chmod +x ${ANDROID_NDK_FILE} && \
+  sync && \
+  ./${ANDROID_NDK_FILE} && \
+  mv ./${ANDROID_NDK_VERSION} ${ANDROID_NDK} && \
+  cp -R \
+  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64 \
+  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86 && \
+  cp -R \
+  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86_64 \
+  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86 && \
+  cd && rm -rf /ndk_setup
+
 # Support Gradle
 ENV TERM dumb
 
-# Install gradle 5.6.3
-RUN wget https://services.gradle.org/distributions/gradle-5.6.3-all.zip
-RUN unzip -qq gradle-5.6.3-all.zip
-RUN cp -r gradle-5.6.3 /usr/local
-
-RUN mkdir -p /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
-RUN mv gradle-5.6.3-all.zip /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
-RUN mv gradle-5.6.3 /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
-RUN touch /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3-all.zip.ok
-RUN touch /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3-all.zip.lck
-RUN chmod 755 /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3/bin/gradle
-
-ENV GRADLE_HOME /usr/local/gradle-5.6.3
+# Install gradle
+RUN wget https://services.gradle.org/distributions/gradle-4.4-all.zip
+RUN unzip -qq gradle-4.4-all.zip
+RUN mv gradle-4.4 /usr/local
+RUN rm gradle-4.4-all.zip
+ENV GRADLE_HOME /usr/local/gradle-4.4
 ENV PATH ${GRADLE_HOME}/bin:$PATH
-
-# Install gradle 4.10.2
-RUN wget https://services.gradle.org/distributions/gradle-4.10.2-all.zip
-RUN mkdir -p /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
-RUN unzip -qq gradle-4.10.2-all.zip
-RUN mv gradle-4.10.2-all.zip /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
-RUN mv gradle-4.10.2 /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
-RUN touch /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2-all.zip.ok
-RUN touch /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2-all.zip.lck
-RUN chmod 755 /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2/bin/gradle

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.13.9",
+  "version": "0.13.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -22,9 +22,7 @@
     "test:unit": "yarn test --config jest/unit-config.json",
     "test:smoke": "yarn test --config jest/smoke-config.json --forceExit",
     "test:smoke:android": "PLATFORM=android yarn test:smoke --testNamePattern=android",
-    "test:smoke:android:record": "PLATFORM=android EXPENV_OVERRIDES=local-common,local,local-queue expenv yarn test:smoke --testNamePattern=android",
     "test:smoke:ios": "PLATFORM=ios yarn test:smoke --testNamePattern=iOS",
-    "test:smoke:ios:record": "PLATFORM=ios EXPENV_OVERRIDES=local-common,local,local-queue expenv yarn test:smoke --testNamePattern=iOS",
     "release": "./scripts/release.sh",
     "release:beta": "./scripts/releaseBeta.sh",
     "release:update:turtle-cli-example": "./scripts/updateTurtleCliExampleRepo.sh",
@@ -103,7 +101,7 @@
   },
   "dependencies": {
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "57.4.0",
+    "@expo/xdl": "57.3.0",
     "@google-cloud/logging-bunyan": "^0.9.5",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
@@ -132,9 +130,6 @@
     "which": "^1.3.1"
   },
   "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "1.11.4"
-  },
-  "volta": {
-    "node": "8.15.1"
+    "@expo/traveling-fastlane-darwin": "1.11.0"
   }
 }

scripts/android/buildAndPushAndroidBaseImage.sh

@@ -3,8 +3,6 @@
 set -eo pipefail
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-CONFIGURE_ANDROID_SDK_PATH="$ROOT_DIR/scripts/android/configureAndroidSdk.sh"
-DOCKER_BASE_DIR="$ROOT_DIR/docker-base"
 
 IMAGE_TAG="$1"
 if [[ -z "$IMAGE_TAG" ]]; then
@@ -15,12 +13,10 @@ fi
 IMAGE_VERSION_FULL_NAME="gcr.io/exponentjs/turtle-android-base:$IMAGE_TAG"
 IMAGE_LATEST_FULL_NAME="gcr.io/exponentjs/turtle-android-base:latest"
 
-pushd $DOCKER_BASE_DIR > /dev/null
-cp $CONFIGURE_ANDROID_SDK_PATH .
-docker build -t "$IMAGE_VERSION_FULL_NAME" -t "$IMAGE_LATEST_FULL_NAME" .
+pushd $ROOT_DIR > /dev/null
+echo docker build -f docker-base/Dockerfile -t "$IMAGE_VERSION_FULL_NAME" -t "$IMAGE_LATEST_FULL_NAME" .
 echo "Successfully built $IMAGE_VERSION_FULL_NAME Docker image"
-gcloud docker -- push "$IMAGE_VERSION_FULL_NAME"
-gcloud docker -- push "$IMAGE_LATEST_FULL_NAME"
+echo gcloud docker -- push "$IMAGE_VERSION_FULL_NAME"
+echo gcloud docker -- push "$IMAGE_LATEST_FULL_NAME"
 echo "Successfully pushed $IMAGE_VERSION_FULL_NAME Docker image to GCloud"
-rm -rf `basename $CONFIGURE_ANDROID_SDK_PATH`
 popd  > /dev/null

scripts/android/configureAndroidSdk.sh

@@ -18,5 +18,3 @@ yes | $SDKMANAGER \
   "extras;android;m2repository" \
   "extras;google;m2repository" \
   "extras;google;google_play_services" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-
-yes | $SDKMANAGER "ndk;17.2.4988734" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]

scripts/tests/runIOSSmokeTestsCI.sh

@@ -23,6 +23,6 @@ export DATADOG_DISABLED="true"
 export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-SDK_VERSION=sdk35 $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
+SDK_VERSION=sdk32 $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
 
 yarn test:smoke:ios

shellTarballs/android/sdk36

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-bb08bdc180fccd8f90e99dafb4e0ac456232531b.tar.gz
+s3://exp-artifacts/android-shell-builder-c2d1e0d0ab1ffb73bb4796cb02df5989d68c171f.tar.gz

shellTarballs/ios/sdk36

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-3dc536f8a36af8404c31501e7a7876a8eda634f6.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-45748a5056cc80d26348cfb8a72da74c1664a8fe.tar.gz

src/bin/commands/build/index.ts

@@ -15,7 +15,7 @@ function setCommonCommandOptions(cmd: any) {
     .option('-o --output <output-file-path>', 'output file path')
     .option(
       '--public-url <url>',
-      'the URL of an externally hosted manifest (for self-hosted apps), only HTTPS URLs are supported!',
+      'the URL of an externally hosted manifest (for self-hosted apps).',
     )
     .option(
       '--release-channel <channel-name>',

src/bin/setup/android/index.ts

@@ -5,6 +5,7 @@ import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import _which from 'which';
 
+import ensureAndroidNDKIsPresent from 'turtle/bin/setup/android/ndk';
 import ensureAndroidSDKIsPresent from 'turtle/bin/setup/android/sdk';
 import { checkSystem, ensureShellAppIsPresent } from 'turtle/bin/setup/utils/common';
 import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
@@ -65,8 +66,9 @@ export default async function setup(sdkVersion?: string) {
 async function prepareAndroidEnv() {
   await fs.ensureDir(config.directories.androidDependenciesDir);
   const sdkConfig = await ensureAndroidSDKIsPresent();
-  _setEnvVars(sdkConfig.envVars);
-  _alterPath(sdkConfig.path);
+  const ndkConfig = await ensureAndroidNDKIsPresent();
+  _setEnvVars({ ...sdkConfig.envVars, ...ndkConfig.envVars });
+  _alterPath([...sdkConfig.path, ...sdkConfig.path]);
 }
 
 function formatShellAppTarballUriPath(sdkMajorVersion: string) {

src/bin/setup/android/ndk.ts

@@ -0,0 +1,53 @@
+import os from 'os';
+import path from 'path';
+
+import decompress from 'decompress';
+import fs from 'fs-extra';
+
+import * as utils from 'turtle/bin/setup/utils/common';
+import download from 'turtle/bin/setup/utils/downloader';
+import config from 'turtle/config';
+import logger from 'turtle/logger';
+
+const ANDROID_NDK_URL = `https://dl.google.com/android/repository/android-ndk-r10e-${os.platform()}-x86_64.zip`;
+
+const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
+const l = logger.child(LOGGER_FIELDS);
+
+export default async function ensureAndroidNDKIsPresent() {
+  const androidNdkDir = path.join(config.directories.androidDependenciesDir, 'ndk');
+  await utils.removeDirectoryUnlessReady(androidNdkDir);
+  if (!(await fs.pathExists(androidNdkDir))) {
+    await fs.ensureDir(androidNdkDir);
+    const androidNdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_NDK_URL);
+
+    try {
+      l.info('Downloading Android NDK');
+      await fs.ensureDir(config.directories.artifactsDir);
+      await download(ANDROID_NDK_URL, androidNdkDownloadPath);
+      l.info('Decompressing Android NDK');
+      await decompress(androidNdkDownloadPath, androidNdkDir, { strip: 1 });
+      await utils.markDirectoryAsReady(androidNdkDir);
+      l.info('Android NDK installed successfully');
+    } catch (err) {
+      await fs.remove(androidNdkDir);
+      throw err;
+    } finally {
+      await fs.remove(androidNdkDownloadPath);
+    }
+  }
+  return {
+    envVars: _createEnvVars(androidNdkDir),
+    path: _createPaths(androidNdkDir),
+  };
+}
+
+function _createEnvVars(androidNdkDir: string) {
+  return {
+    ANDROID_NDK: androidNdkDir,
+  };
+}
+
+function _createPaths(androidNdkDir: string) {
+  return [androidNdkDir];
+}

src/bin/utils/builder.ts

@@ -1,5 +1,3 @@
-import _url from 'url';
-
 import { ExponentTools } from '@expo/xdl';
 import _ from 'lodash';
 import uuid from 'uuid';
@@ -56,13 +54,6 @@ export function createBuilderAction({
         );
       }
 
-      if (cmd.publicUrl) {
-        const parsedPublicUrl = _url.parse(cmd.publicUrl);
-        if (parsedPublicUrl.protocol !== 'https:') {
-          throw new ErrorWithCommandHelp('--public-url is invalid - only HTTPS urls are supported');
-        }
-      }
-
       const args = {
         releaseChannel: cmd.releaseChannel || 'default',
         buildType: cmd.type,

yarn.lock

@@ -1364,10 +1364,10 @@
   dependencies:
     cross-spawn "^6.0.5"
 
-"@expo/[email protected].4":
-  version "1.11.4"
-  resolved "https://registry.yarnpkg.com/@expo/traveling-fastlane-darwin/-/traveling-fastlane-darwin-1.11.4.tgz#bc83ea2a3c8fa2cb1c7daedf1514c5839b4f1f45"
-  integrity sha512-1rNq4yMHGfmYhUJuBH5lKpmHVAa5QjgXbv3MoMqsFrlnwzDaq4qHSs6s/RWHw+gmk5lASEhmW32ALArAxX9ceA==
+"@expo/[email protected].0":
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/@expo/traveling-fastlane-darwin/-/traveling-fastlane-darwin-1.11.0.tgz#88f09e2332f2103fafac4759bbbc86832633768a"
+  integrity sha512-owQdOQ0Ag4XE9LtXQ0p1fWwWqa0uhJvEKEmvb5ugPbdkT8BSs92TNfULHPMkGohcHlB0/Q+VXTUbSnP4zczKbQ==
 
 "@expo/webpack-config@^0.10.6":
   version "0.10.6"
@@ -1424,10 +1424,10 @@
     node-fetch "^2.6.0"
     tempy "^0.3.0"
 
-"@expo/xdl@57.4.0":
-  version "57.4.0"
-  resolved "https://registry.yarnpkg.com/@expo/xdl/-/xdl-57.4.0.tgz#a7bf65a487bca372936198ada66e44f6d70a484a"
-  integrity sha512-zjhBn8R3Mj5Hx3mftCN/DIrd0KSktIqQZ2mG1OSkSXtJBN1LBjRtvFI9SIDwR6vGxn9w1GJBKLSqmdc/t4JGLQ==
+"@expo/xdl@57.3.0":
+  version "57.3.0"
+  resolved "https://registry.yarnpkg.com/@expo/xdl/-/xdl-57.3.0.tgz#5a269f96d6704c1f98dfae5fd33c827116ac2924"
+  integrity sha512-Bzip1ZLwSQ+zgcLoLv/LKIgoFXi9qJX7oC1KI+/QG+N703zv1UthaIRJBzjynJR6RdcoCof/RjC50ghfHPkwQw==
   dependencies:
     "@expo/bunyan" "3.0.2"
     "@expo/config" "^2.5.2"
@@ -2709,7 +2709,7 @@ async@^1.5.2, async@~1.5:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.1.4, async@~2.6.0:
+async@^2.1.4, async@^2.5.0, async@~2.6.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
   integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
@@ -4010,7 +4010,7 @@ commander@^2.14.1, commander@^2.19.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
-commander@^2.20.0, commander@~2.20.3:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -6557,11 +6557,11 @@ handle-thing@^2.0.0:
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.0.3:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
-  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
+  integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
   dependencies:
-    neo-async "^2.6.0"
+    async "^2.5.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
@@ -9460,7 +9460,12 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
-neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
+neo-async@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
+
+neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
@@ -13421,7 +13426,7 @@ typescript@^3.4.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.2.tgz#9ed4e6475d906f589200193be056f5913caed481"
   integrity sha512-Og2Vn6Mk7JAuWA1hQdDQN/Ekm/SchX80VzLhjKN9ETYrIepBFAd8PkOdOTK2nKt0FCkmMZKBJvQ1dV1gIxPu/A==
 
-[email protected]:
+[email protected], uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
   integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
@@ -13429,14 +13434,6 @@ [email protected]:
     commander "~2.17.1"
     source-map "~0.6.1"
 
-uglify-js@^3.1.4:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
-  integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg==
-  dependencies:
-    commander "~2.20.3"
-    source-map "~0.6.1"
-
 unbzip2-stream@^1.0.9:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a"