v1.4.0

# Conflicts:
#	package.json

.gitignore

@@ -104,3 +104,4 @@ dist
 .tern-port
 
 lib/
+.DS_Store

cli.json

@@ -106,11 +106,11 @@
           "hasValue": true
         },
         "intermediaDir": {
-          "default": "build/intermedia/${platform}",
+          "default": ".pushy/intermedia/${platform}",
           "hasValue": true
         },
         "output": {
-          "default": "build/output/${platform}.${time}.ppk",
+          "default": ".pushy/output/${platform}.${time}.ppk",
           "hasValue": true
         },
         "verbose": {}
@@ -123,7 +123,7 @@
       "description": "Create diff patch",
       "options": {
         "output": {
-          "default": "build/output/diff",
+          "default": ".pushy/output/diff",
           "hasValue": true
         }
       }
@@ -132,7 +132,7 @@
       "description": "Create diff patch from a Android package(.apk)",
       "options": {
         "output": {
-          "default": "build/output/diff-${time}.apk-patch",
+          "default": ".pushy/output/diff-${time}.apk-patch",
           "hasValue": true
         }
       }
@@ -141,7 +141,34 @@
       "description": "Create diff patch from a iOS package(.ipa)",
       "options": {
         "output": {
-          "default": "build/output/diff-${time}.ipa-patch",
+          "default": ".pushy/output/diff-${time}.ipa-patch",
+          "hasValue": true
+        }
+      }
+    },
+    "hdiff": {
+      "description": "Create hdiff patch",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff",
+          "hasValue": true
+        }
+      }
+    },
+    "hdiffFromApk": {
+      "description": "Create hdiff patch from a Android package(.apk)",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff-${time}.apk-patch",
+          "hasValue": true
+        }
+      }
+    },
+    "hdiffFromIpa": {
+      "description": "Create hdiff patch from a iOS package(.ipa)",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff-${time}.ipa-patch",
           "hasValue": true
         }
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.1.16",
+  "version": "1.4.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -32,18 +32,18 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
   "dependencies": {
-    "app-info-parser": "^0.3.9",
+    "app-info-parser": "^1.0.0",
     "cli-arguments": "^0.2.1",
     "filesize-parser": "^1.5.0",
     "fs-extra": "8",
     "gradle-to-js": "^2.0.0",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "^2.6.1",
     "progress": "^2.0.3",
     "read": "^1.0.7",
     "request": "^2.88.2",
     "tcp-ping": "^0.1.1",
     "tty-table": "4.1",
-    "update-notifier": "^4.1.0",
+    "update-notifier": "^4.1.1",
     "yauzl": "^2.10.0",
     "yazl": "2.5.1"
   },

src/api.js

@@ -3,7 +3,8 @@
  */
 
 const fetch = require('node-fetch');
-let host = process.env.PUSHY_REGISTRY || 'https://update.reactnative.cn/api';
+const defaultEndpoint = 'http://u.reactnative.cn/api';
+let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 const fs = require('fs');
 import request from 'request';
 import ProgressBar from 'progress';
@@ -21,7 +22,7 @@ let savedSession = undefined;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
-exports.loadSession = async function() {
+exports.loadSession = async function () {
   if (fs.existsSync('.update')) {
     try {
       exports.replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
@@ -35,15 +36,15 @@ exports.loadSession = async function() {
   }
 };
 
-exports.getSession = function() {
+exports.getSession = function () {
   return session;
 };
 
-exports.replaceSession = function(newSession) {
+exports.replaceSession = function (newSession) {
   session = newSession;
 };
 
-exports.saveSession = function() {
+exports.saveSession = function () {
   // Only save on change.
   if (session !== savedSession) {
     const current = session;
@@ -53,13 +54,13 @@ exports.saveSession = function() {
   }
 };
 
-exports.closeSession = function() {
+exports.closeSession = function () {
   if (fs.existsSync('.update')) {
     fs.unlinkSync('.update');
     savedSession = undefined;
   }
   session = undefined;
-  host = process.env.PUSHY_REGISTRY || 'https://update.reactnative.cn/api';
+  host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 };
 
 async function query(url, options) {
@@ -74,7 +75,7 @@ async function query(url, options) {
 }
 
 function queryWithoutBody(method) {
-  return function(api) {
+  return function (api) {
     return query(host + api, {
       method,
       headers: {
@@ -86,7 +87,7 @@ function queryWithoutBody(method) {
 }
 
 function queryWithBody(method) {
-  return function(api, body) {
+  return function (api, body) {
     return query(host + api, {
       method,
       headers: {
@@ -106,7 +107,7 @@ exports.doDelete = queryWithBody('DELETE');
 
 async function uploadFile(fn, key) {
   const { url, backupUrl, formData, maxSize } = await exports.post('/upload', {
-    ext: path.extname(fn)
+    ext: path.extname(fn),
   });
   let realUrl = url;
 
@@ -125,7 +126,11 @@ async function uploadFile(fn, key) {
 
   const fileSize = fs.statSync(fn).size;
   if (maxSize && fileSize > filesizeParser(maxSize)) {
-    throw new Error(`此文件大小超出上限${maxSize}。您可以考虑升级付费业务以提升此限制。详情请访问：${pricingPageUrl}`)
+    throw new Error(
+      `此文件大小${(fileSize / 1048576).toFixed(
+        1,
+      )}m, 超出当前额度${maxSize}。您可以考虑升级付费业务以提升此额度。详情请访问：${pricingPageUrl}`,
+    );
   }
 
   const bar = new ProgressBar('  Uploading [:bar] :percent :etas', {
@@ -140,13 +145,17 @@ async function uploadFile(fn, key) {
     }
     formData.file = fs.createReadStream(fn);
 
-    formData.file.on('data', function(data) {
+    formData.file.on('data', function (data) {
       bar.tick(data.length);
     });
     request.post(
       realUrl,
       {
         formData,
+        headers: {
+          'User-Agent': userAgent,
+          'X-AccessToken': session ? session.token : '',
+        },
       },
       (err, resp, body) => {
         if (err) {

src/app.js

@@ -2,14 +2,11 @@
  * Created by tdzl2003 on 2/13/16.
  */
 
-import {question} from './utils';
+import { question } from './utils';
 import fs from 'fs';
+const Table = require('tty-table');
 
-const {
-  post,
-  get,
-  doDelete,
-} = require('./api');
+const { post, get, doDelete } = require('./api');
 
 const validPlatforms = {
   ios: 1,
@@ -20,28 +17,42 @@ export function checkPlatform(platform) {
   if (!validPlatforms[platform]) {
     throw new Error(`Invalid platform '${platform}'`);
   }
-  return platform
+  return platform;
 }
 
 export function getSelectedApp(platform) {
   checkPlatform(platform);
 
-  if (!fs.existsSync('update.json')){
-    throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
+  if (!fs.existsSync('update.json')) {
+    throw new Error(
+      `App not selected. run 'pushy selectApp --platform ${platform}' first!`,
+    );
   }
   const updateInfo = JSON.parse(fs.readFileSync('update.json', 'utf8'));
   if (!updateInfo[platform]) {
-    throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
+    throw new Error(
+      `App not selected. run 'pushy selectApp --platform ${platform}' first!`,
+    );
   }
   return updateInfo[platform];
 }
 
-export async function listApp(platform){
-  const {data} = await get('/app/list');
-  const list = platform?data.filter(v=>v.platform===platform):data;
+export async function listApp(platform) {
+  const { data } = await get('/app/list');
+  const list = platform ? data.filter((v) => v.platform === platform) : data;
+
+  const header = [
+    { value: 'App Id' },
+    { value: 'App Name' },
+    { value: 'Platform' },
+  ];
+  const rows = [];
   for (const app of list) {
-    console.log(`${app.id}) ${app.name}(${app.platform})`);
+    rows.push([app.id, app.name, app.platform]);
   }
+
+  console.log(Table(header, rows).render());
+
   if (platform) {
     console.log(`\nTotal ${list.length} ${platform} apps`);
   } else {
@@ -55,7 +66,7 @@ export async function chooseApp(platform) {
 
   while (true) {
     const id = await question('Enter appId:');
-    const app = list.find(v=>v.id === (id|0));
+    const app = list.find((v) => v.id === (id | 0));
     if (app) {
       return app;
     }
@@ -63,19 +74,21 @@ export async function chooseApp(platform) {
 }
 
 export const commands = {
-  createApp: async function ({options}) {
-    const name = options.name || await question('App Name:');
-    const {downloadUrl} = options;
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
-    const {id} = await post('/app/create', {name, platform});
+  createApp: async function ({ options }) {
+    const name = options.name || (await question('App Name:'));
+    const { downloadUrl } = options;
+    const platform = checkPlatform(
+      options.platform || (await question('Platform(ios/android):')),
+    );
+    const { id } = await post('/app/create', { name, platform });
     console.log(`Created app ${id}`);
     await this.selectApp({
       args: [id],
-      options: {platform, downloadUrl},
+      options: { platform, downloadUrl },
     });
   },
-  deleteApp: async function ({args, options}) {
-    const {platform} = options;
+  deleteApp: async function ({ args, options }) {
+    const { platform } = options;
     const id = args[0] || chooseApp(platform);
     if (!id) {
       console.log('Canceled');
@@ -83,12 +96,14 @@ export const commands = {
     await doDelete(`/app/${id}`);
     console.log('Ok.');
   },
-  apps: async function ({options}){
-    const {platform} = options;
+  apps: async function ({ options }) {
+    const { platform } = options;
     listApp(platform);
   },
-  selectApp: async function({args, options}) {
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
+  selectApp: async function ({ args, options }) {
+    const platform = checkPlatform(
+      options.platform || (await question('Platform(ios/android):')),
+    );
     const id = args[0] || (await chooseApp(platform)).id;
 
     let updateInfo = {};
@@ -96,15 +111,21 @@ export const commands = {
       try {
         updateInfo = JSON.parse(fs.readFileSync('update.json', 'utf8'));
       } catch (e) {
-        console.error('Failed to parse file `update.json`. Try to remove it manually.');
+        console.error(
+          'Failed to parse file `update.json`. Try to remove it manually.',
+        );
         throw e;
       }
     }
-    const {appKey} = await get(`/app/${id}`);
+    const { appKey } = await get(`/app/${id}`);
     updateInfo[platform] = {
       appId: id,
       appKey,
     };
-    fs.writeFileSync('update.json', JSON.stringify(updateInfo, null, 4), 'utf8');
+    fs.writeFileSync(
+      'update.json',
+      JSON.stringify(updateInfo, null, 4),
+      'utf8',
+    );
   },
-}
+};

src/bundle.js

@@ -13,20 +13,14 @@ const { spawn, spawnSync } = require('child_process');
 const g2js = require('gradle-to-js/lib/parser');
 const os = require('os');
 
-var diff;
+var bsdiff, hdiff, diff;
 try {
-  var bsdiff = require('node-bsdiff');
-  diff = typeof bsdiff != 'function' ? bsdiff.diff : bsdiff;
-} catch (e) {
-  diff = function () {
-    console.warn(
-      'This function needs "node-bsdiff". Please run "npm i node-bsdiff" from your project directory first!',
-    );
-    throw new Error(
-      'This function needs module "node-bsdiff". Please install it first.',
-    );
-  };
-}
+  bsdiff = require('node-bsdiff').diff;
+} catch (e) {}
+
+try {
+  hdiff = require('node-hdiffpatch').diff;
+} catch (e) {}
 
 async function runReactNativeBundleCommand(
   bundleName,
@@ -37,6 +31,14 @@ async function runReactNativeBundleCommand(
   sourcemapOutput,
   config,
 ) {
+  let gradleConfig = {};
+  if (platform === 'android') {
+    gradleConfig = await checkGradleConfig();
+    // if (gradleConfig.crunchPngs !== false) {
+    //   throw new Error('请先禁用android的crunchPngs优化，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8android%E7%9A%84crunch%E4%BC%98%E5%8C%96')
+    // }
+  }
+
   let reactNativeBundleArgs = [];
 
   let envArgs = process.env.PUSHY_ENV_ARGS;
@@ -96,7 +98,7 @@ async function runReactNativeBundleCommand(
           ),
         );
       } else {
-        if (platform === 'android') {
+        if (gradleConfig.enableHermes) {
           await compileHermesByteCode(bundleName, outputFolder);
         }
         resolve(null);
@@ -111,11 +113,13 @@ function getHermesOSBin() {
   if (os.platform() === 'linux') return 'linux64-bin';
 }
 
-async function compileHermesByteCode(bundleName, outputFolder) {
+async function checkGradleConfig() {
   let enableHermes = false;
+  let crunchPngs;
   try {
     const gradleConfig = await g2js.parseFile('android/app/build.gradle');
     const projectConfig = gradleConfig['project.ext.react'];
+    crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
     for (const packagerConfig of projectConfig) {
       if (
         packagerConfig.includes('enableHermes') &&
@@ -126,29 +130,34 @@ async function compileHermesByteCode(bundleName, outputFolder) {
       }
     }
   } catch (e) {}
-  if (enableHermes) {
-    console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
-    const hermesPackage = fs.existsSync('node_modules/hermes-engine')
-      ? 'node_modules/hermes-engine' // 0.2+
-      : 'node_modules/hermesvm'; // < 0.2
-    const hermesPath = `${hermesPackage}/${getHermesOSBin()}`;
+  return {
+    enableHermes,
+    crunchPngs,
+  };
+}
 
-    const hermesCommand = fs.existsSync(`${hermesPath}/hermesc`)
-      ? `${hermesPath}/hermesc` // 0.5+
-      : `${hermesPath}/hermes`; // < 0.5
+async function compileHermesByteCode(bundleName, outputFolder) {
+  console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
+  const hermesPackage = fs.existsSync('node_modules/hermes-engine')
+    ? 'node_modules/hermes-engine' // 0.2+
+    : 'node_modules/hermesvm'; // < 0.2
+  const hermesPath = `${hermesPackage}/${getHermesOSBin()}`;
 
-    spawnSync(
-      path.join.apply(null, hermesCommand.split('/')),
-      [
-        '-emit-binary',
-        '-out',
-        path.join(outputFolder, bundleName),
-        path.join(outputFolder, bundleName),
-        '-O',
-      ],
-      { stdio: 'ignore' },
-    );
-  }
+  const hermesCommand = fs.existsSync(`${hermesPath}/hermesc`)
+    ? `${hermesPath}/hermesc` // 0.5+
+    : `${hermesPath}/hermes`; // < 0.5
+
+  spawnSync(
+    path.join.apply(null, hermesCommand.split('/')),
+    [
+      '-emit-binary',
+      '-out',
+      path.join(outputFolder, bundleName),
+      path.join(outputFolder, bundleName),
+      '-O',
+    ],
+    { stdio: 'ignore' },
+  );
 }
 
 async function pack(dir, output) {
@@ -467,6 +476,42 @@ function enumZipEntries(zipFn, callback) {
   });
 }
 
+function diffArgsCheck(args, options, diffFn) {
+  const [origin, next] = args;
+
+  if (!origin || !next) {
+    console.error(`Usage: pushy ${diffFn} <origin> <next>`);
+    process.exit(1);
+  }
+
+  if (diffFn.startsWith('hdiff')) {
+    if (!hdiff) {
+      console.error(
+        `This function needs "node-hdiffpatch". 
+        Please run "npm i node-hdiffpatch" to install`,
+      );
+      process.exit(1);
+    }
+    diff = hdiff;
+  } else {
+    if (!bsdiff) {
+      console.error(
+        `This function needs "node-bsdiff". 
+        Please run "npm i node-bsdiff" to install`,
+      );
+      process.exit(1);
+    }
+    diff = bsdiff;
+  }
+  const { output } = options;
+
+  return {
+    origin,
+    next,
+    realOutput: output.replace(/\$\{time\}/g, '' + Date.now()),
+  };
+}
+
 export const commands = {
   bundle: async function ({ options }) {
     const platform = checkPlatform(
@@ -520,30 +565,41 @@ export const commands = {
   },
 
   async diff({ args, options }) {
-    const [origin, next] = args;
-    const { output } = options;
+    const { origin, next, realOutput } = diffArgsCheck(args, options, 'diff');
 
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
+    await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
+    console.log(`${realOutput} generated.`);
+  },
 
-    if (!origin || !next) {
-      console.error('pushy diff <origin> <next>');
-      process.exit(1);
-    }
+  async hdiff({ args, options }) {
+    const { origin, next, realOutput } = diffArgsCheck(args, options, 'hdiff');
 
     await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
     console.log(`${realOutput} generated.`);
   },
 
   async diffFromApk({ args, options }) {
-    const [origin, next] = args;
-    const { output } = options;
+    const { origin, next, realOutput } = diffArgsCheck(
+      args,
+      options,
+      'diffFromApk',
+    );
 
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
+    await diffFromPackage(
+      origin,
+      next,
+      realOutput,
+      'assets/index.android.bundle',
+    );
+    console.log(`${realOutput} generated.`);
+  },
 
-    if (!origin || !next) {
-      console.error('pushy diffFromApk <origin> <next>');
-      process.exit(1);
-    }
+  async hdiffFromApk({ args, options }) {
+    const { origin, next, realOutput } = diffArgsCheck(
+      args,
+      options,
+      'hdiffFromApk',
+    );
 
     await diffFromPackage(
       origin,
@@ -555,15 +611,26 @@ export const commands = {
   },
 
   async diffFromIpa({ args, options }) {
-    const [origin, next] = args;
-    const { output } = options;
+    const { origin, next, realOutput } = diffArgsCheck(
+      args,
+      options,
+      'diffFromIpa',
+    );
 
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
+    await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
+      const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
+      return m && m[1];
+    });
 
-    if (!origin || !next) {
-      console.error('pushy diffFromIpa <origin> <next>');
-      process.exit(1);
-    }
+    console.log(`${realOutput} generated.`);
+  },
+
+  async hdiffFromIpa({ args, options }) {
+    const { origin, next, realOutput } = diffArgsCheck(
+      args,
+      options,
+      'hdiffFromIpa',
+    );
 
     await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
       const m = /^Payload\/[^/]+\/(.+)$/.exec(v);

src/package.js

@@ -52,8 +52,25 @@ export const commands = {
     if (!fn || !fn.endsWith('.ipa')) {
       throw new Error('Usage: pushy uploadIpa <ipaFile>');
     }
-    const { versionName, buildTime } = await getIpaInfo(fn);
-    const { appId } = await getSelectedApp('ios');
+    const {
+      versionName,
+      buildTime,
+      appId: appIdInPkg,
+      appKey: appKeyInPkg,
+    } = await getIpaInfo(fn);
+    const { appId, appKey } = await getSelectedApp('ios');
+
+    if (appIdInPkg && appIdInPkg !== appId) {
+      throw new Error(
+        `appId不匹配！当前ipa：${appIdInPkg}, 当前update.json：${appId}`,
+      );
+    }
+
+    if (appKeyInPkg && appKeyInPkg !== appKey) {
+      throw new Error(
+        `appKey不匹配！当前ipa：${appKeyInPkg}, 当前update.json：${appKey}`,
+      );
+    }
 
     const { hash } = await uploadFile(fn);
 
@@ -70,8 +87,25 @@ export const commands = {
     if (!fn || !fn.endsWith('.apk')) {
       throw new Error('Usage: pushy uploadApk <apkFile>');
     }
-    const { versionName, buildTime } = await getApkInfo(fn);
-    const { appId } = await getSelectedApp('android');
+    const {
+      versionName,
+      buildTime,
+      appId: appIdInPkg,
+      appKey: appKeyInPkg,
+    } = await getApkInfo(fn);
+    const { appId, appKey } = await getSelectedApp('android');
+
+    if (appIdInPkg && appIdInPkg !== appId) {
+      throw new Error(
+        `appId不匹配！当前apk：${appIdInPkg}, 当前update.json：${appId}`,
+      );
+    }
+
+    if (appKeyInPkg && appKeyInPkg !== appKey) {
+      throw new Error(
+        `appKey不匹配！当前apk：${appKeyInPkg}, 当前update.json：${appKey}`,
+      );
+    }
 
     const { hash } = await uploadFile(fn);
 

src/utils/index.js

@@ -68,10 +68,10 @@ export async function getApkInfo(fn) {
   const updateJsonFile = await appInfoParser.parser.getEntry(
     /res\/raw\/update.json/,
   );
-  if (!updateJsonFile) {
-    throw new Error('找不到update.json文件');
+  let appCredential = {};
+  if (updateJsonFile) {
+    appCredential = JSON.parse(updateJsonFile.toString()).android;
   }
-  const appCredential = JSON.parse(updateJsonFile.toString()).android;
   const { versionName, application } = await appInfoParser.parse();
   let buildTime = 0;
   if (Array.isArray(application.metaData)) {
@@ -102,10 +102,10 @@ export async function getIpaInfo(fn) {
   const updateJsonFile = await appInfoParser.parser.getEntry(
     /payload\/.+?\.app\/assets\/update.json/,
   );
-  if (!updateJsonFile) {
-    throw new Error('找不到update.json文件');
+  let appCredential = {};
+  if (updateJsonFile) {
+    appCredential = JSON.parse(updateJsonFile.toString()).ios;
   }
-  const appCredential = JSON.parse(updateJsonFile.toString()).ios;
   const {
     CFBundleShortVersionString: versionName,
   } = await appInfoParser.parse();

yarn.lock

@@ -72,10 +72,10 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
-app-info-parser@^0.3.9:
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/app-info-parser/-/app-info-parser-0.3.9.tgz#adc60c9d4d4aca4e529f21a6da1279b74ddaf62b"
-  integrity sha512-vIzO1OZSMnEz+OdGkhmSTS0y4PaQmXdF1YmzUBb7wsKR21JF1eXMnciARkUj6T+CLb9caoDSN+w5eSoGatRbcA==
+app-info-parser@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/app-info-parser/-/app-info-parser-1.0.0.tgz#38da83c167b436b485246a2c81ab28833ac12b6e"
+  integrity sha512-l8fNzGZFTNCloUm5imfOQYjlBLQfu3DB9rkKgi7TWAjtCU2s0NMLetOw0TFmHye65NcdenAQawvLNLtyo1L//w==
   dependencies:
     bplist-parser "^0.2.0"
     bytebuffer "^5.0.1"
@@ -1476,9 +1476,9 @@ is-glob@^2.0.0, is-glob@^2.0.1:
     is-extglob "^1.0.0"
 
 is-installed-globally@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.1.tgz#679afef819347a72584617fd19497f010b8ed35f"
-  integrity sha512-oiEcGoQbGc+3/iijAijrK2qFpkNoNjsHOm/5V5iaeydyrS/hnwaRCEgH5cpW0P3T1lSjV5piB7S5b5lEugNLhg==
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
+  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
   dependencies:
     global-dirs "^2.0.1"
     is-path-inside "^3.0.1"
@@ -1885,10 +1885,10 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-node-fetch@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
 normalize-path@^2.0.0, normalize-path@^2.0.1:
   version "2.1.1"
@@ -2116,9 +2116,9 @@ punycode@^2.1.0, punycode@^2.1.1:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 pupa@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz#dbdc9ff48ffbea4a26a069b6f9f7abb051008726"
-  integrity sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
+  integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
   dependencies:
     escape-goat "^2.0.0"
 
@@ -2694,10 +2694,10 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-update-notifier@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3"
-  integrity sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==
+update-notifier@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3"
+  integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==
   dependencies:
     boxen "^4.2.0"
     chalk "^3.0.0"