Migrate custom v3 config to local plugins if needed

2026-01-12 20:18:41 -09:00 · 2023-01-07 11:09:33 +05:30 · 2023-01-07 11:09:33 +05:30 · 2981853e88
commit 2981853e88
parent f494781ff2
8 changed files with 403 additions and 77 deletions
--- a/app/config/import.ts
+++ b/app/config/import.ts
@ -1,64 +1,13 @@
-import {copySync, existsSync, writeFileSync, readFileSync, copy} from 'fs-extra';
+import {readFileSync} from 'fs-extra';
 import {sync as mkdirpSync} from 'mkdirp';
-import {
-  defaultCfg,
-  cfgPath,
-  legacyCfgPath,
-  plugs,
-  defaultPlatformKeyPath,
-  schemaPath,
-  cfgDir,
-  schemaFile
-} from './paths';
-import {_init, _extractDefault} from './init';
+import {defaultCfg, cfgPath, plugs, defaultPlatformKeyPath} from './paths';
+import {_init} from './init';
 import notify from '../notify';
 import {rawConfig} from '../../lib/config';
-import _ from 'lodash';
-import {resolve} from 'path';
+import {migrateHyper3Config} from './migrate';

 let defaultConfig: rawConfig;

-const _write = (path: string, data: string) => {
-  // This method will take text formatted as Unix line endings and transform it
-  // to text formatted with DOS line endings. We do this because the default
-  // text editor on Windows (notepad) doesn't Deal with LF files. Still. In 2017.
-  const crlfify = (str: string) => {
-    return str.replace(/\r?\n/g, '\r\n');
-  };
-  const format = process.platform === 'win32' ? crlfify(data.toString()) : data;
-  writeFileSync(path, format, 'utf8');
-};
-
-// Migrate Hyper3 config to Hyper4 but only if the user hasn't manually
-// touched the new config and if the old config is not a symlink
-const migrateHyper3Config = () => {
-  copy(schemaPath, resolve(cfgDir, schemaFile), (err) => {
-    if (err) {
-      console.error(err);
-    }
-  });
-
-  if (existsSync(cfgPath)) {
-    return;
-  }
-
-  if (!existsSync(legacyCfgPath)) {
-    copySync(defaultCfg, cfgPath);
-    return;
-  }
-
-  // Migrate
-  const defaultCfgData = JSON.parse(readFileSync(defaultCfg, 'utf8'));
-  const legacyCfgData = _extractDefault(readFileSync(legacyCfgPath, 'utf8'));
-  const newCfgData = _.merge(defaultCfgData, legacyCfgData);
-  _write(cfgPath, JSON.stringify(newCfgData, null, 2));
-
-  notify(
-    'Hyper 4',
-    `Settings location and format has changed.\nWe've automatically migrated your existing config to ${cfgPath}`
-  );
-};
-
 const _importConf = () => {
  // init plugin directories if not present
  mkdirpSync(plugs.base);
--- a/app/config/init.ts
+++ b/app/config/init.ts
@ -32,7 +32,7 @@ const _init = (userCfg: rawConfig, defaultCfg: rawConfig): parsedConfig => {
  return {
    config: (() => {
      if (userCfg?.config) {
-        return _.merge(defaultCfg.config, userCfg.config);
+        return _.merge({}, defaultCfg.config, userCfg.config);
      } else {
        notify('Error reading configuration: `config` key is missing');
        return defaultCfg.config || ({} as configOptions);
--- a/app/config/migrate.ts
+++ b/app/config/migrate.ts
@ -0,0 +1,187 @@
+import {parse, prettyPrint} from 'recast';
+import {builders, namedTypes} from 'ast-types';
+import * as babelParser from 'recast/parsers/babel';
+import {copy, copySync, existsSync, readFileSync, writeFileSync} from 'fs-extra';
+import {dirname, resolve} from 'path';
+import _ from 'lodash';
+
+import notify from '../notify';
+import {_extractDefault} from './init';
+import {cfgDir, cfgPath, defaultCfg, legacyCfgPath, plugs, schemaFile, schemaPath} from './paths';
+
+// function to remove all json serializable entries from an array expression
+function removeElements(node: namedTypes.ArrayExpression): namedTypes.ArrayExpression {
+  const newElements = node.elements.filter((element) => {
+    if (namedTypes.ObjectExpression.check(element)) {
+      const newElement = removeProperties(element);
+      if (newElement.properties.length === 0) {
+        return false;
+      }
+    } else if (namedTypes.ArrayExpression.check(element)) {
+      const newElement = removeElements(element);
+      if (newElement.elements.length === 0) {
+        return false;
+      }
+    } else if (namedTypes.Literal.check(element)) {
+      return false;
+    }
+    return true;
+  });
+  return {...node, elements: newElements};
+}
+
+// function to remove all json serializable properties from an object expression
+function removeProperties(node: namedTypes.ObjectExpression): namedTypes.ObjectExpression {
+  const newProperties = node.properties.filter((property) => {
+    if (
+      namedTypes.ObjectProperty.check(property) &&
+      (namedTypes.Literal.check(property.key) || namedTypes.Identifier.check(property.key)) &&
+      !property.computed
+    ) {
+      if (namedTypes.ObjectExpression.check(property.value)) {
+        const newValue = removeProperties(property.value);
+        if (newValue.properties.length === 0) {
+          return false;
+        }
+      } else if (namedTypes.ArrayExpression.check(property.value)) {
+        const newValue = removeElements(property.value);
+        if (newValue.elements.length === 0) {
+          return false;
+        }
+      } else if (namedTypes.Literal.check(property.value)) {
+        return false;
+      }
+    }
+    return true;
+  });
+  return {...node, properties: newProperties};
+}
+
+export function configToPlugin(code: string): string {
+  const ast: namedTypes.File = parse(code, {
+    parser: babelParser
+  });
+  const statements = ast.program.body;
+  let moduleExportsNode: namedTypes.AssignmentExpression | null = null;
+  let configNode: any = null;
+
+  for (const statement of statements) {
+    if (namedTypes.ExpressionStatement.check(statement)) {
+      const expression = statement.expression;
+      if (
+        namedTypes.AssignmentExpression.check(expression) &&
+        expression.operator === '=' &&
+        namedTypes.MemberExpression.check(expression.left) &&
+        namedTypes.Identifier.check(expression.left.object) &&
+        expression.left.object.name === 'module' &&
+        namedTypes.Identifier.check(expression.left.property) &&
+        expression.left.property.name === 'exports'
+      ) {
+        moduleExportsNode = expression;
+        if (namedTypes.ObjectExpression.check(expression.right)) {
+          const properties = expression.right.properties;
+          for (const property of properties) {
+            if (
+              namedTypes.ObjectProperty.check(property) &&
+              namedTypes.Identifier.check(property.key) &&
+              property.key.name === 'config'
+            ) {
+              configNode = property.value;
+              if (namedTypes.ObjectExpression.check(property.value)) {
+                configNode = removeProperties(property.value);
+              }
+            }
+          }
+        } else {
+          configNode = builders.memberExpression(moduleExportsNode.right, builders.identifier('config'));
+        }
+      }
+    }
+  }
+
+  if (!moduleExportsNode) {
+    console.log('No module.exports found in config');
+    return '';
+  }
+  if (!configNode) {
+    console.log('No config field found in module.exports');
+    return '';
+  }
+  if (namedTypes.ObjectExpression.check(configNode) && configNode.properties.length === 0) {
+    return '';
+  }
+
+  moduleExportsNode.right = builders.objectExpression([
+    builders.property(
+      'init',
+      builders.identifier('decorateConfig'),
+      builders.arrowFunctionExpression(
+        [builders.identifier('_config')],
+        builders.callExpression(
+          builders.memberExpression(builders.identifier('Object'), builders.identifier('assign')),
+          [builders.objectExpression([]), builders.identifier('_config'), configNode]
+        )
+      )
+    )
+  ]);
+
+  return prettyPrint(ast, {tabWidth: 2}).code;
+}
+
+export const _write = (path: string, data: string) => {
+  // This method will take text formatted as Unix line endings and transform it
+  // to text formatted with DOS line endings. We do this because the default
+  // text editor on Windows (notepad) doesn't Deal with LF files. Still. In 2017.
+  const crlfify = (str: string) => {
+    return str.replace(/\r?\n/g, '\r\n');
+  };
+  const format = process.platform === 'win32' ? crlfify(data.toString()) : data;
+  writeFileSync(path, format, 'utf8');
+};
+
+// Migrate Hyper3 config to Hyper4 but only if the user hasn't manually
+// touched the new config and if the old config is not a symlink
+export const migrateHyper3Config = () => {
+  copy(schemaPath, resolve(cfgDir, schemaFile), (err) => {
+    if (err) {
+      console.error(err);
+    }
+  });
+
+  if (existsSync(cfgPath)) {
+    return;
+  }
+
+  if (!existsSync(legacyCfgPath)) {
+    copySync(defaultCfg, cfgPath);
+    return;
+  }
+
+  // Migrate
+  copySync(resolve(dirname(legacyCfgPath), '.hyper_plugins', 'local'), plugs.local);
+
+  const defaultCfgData = JSON.parse(readFileSync(defaultCfg, 'utf8'));
+  let newCfgData;
+  try {
+    const legacyCfgRaw = readFileSync(legacyCfgPath, 'utf8');
+    const legacyCfgData = _extractDefault(legacyCfgRaw);
+    newCfgData = _.merge({}, defaultCfgData, legacyCfgData);
+
+    const pluginCode = configToPlugin(legacyCfgRaw);
+    if (pluginCode) {
+      const pluginPath = resolve(plugs.local, 'migrated-hyper3-config.js');
+      newCfgData.localPlugins = ['migrated-hyper3-config', ...(newCfgData.localPlugins || [])];
+      _write(pluginPath, pluginCode);
+    }
+  } catch (e) {
+    console.error(e);
+    notify(
+      'Hyper 4',
+      `Failed to migrate your config from Hyper 3.\nDefault config will be created instead at ${cfgPath}`
+    );
+    newCfgData = defaultCfgData;
+  }
+  _write(cfgPath, JSON.stringify(newCfgData, null, 2));
+
+  notify('Hyper 4', `Settings location and format has changed to ${cfgPath}`);
+};
--- a/app/package.json
+++ b/app/package.json
@ -10,6 +10,7 @@
  },
  "repository": "zeit/hyper",
  "dependencies": {
+    "@babel/parser": "7.20.7",
    "@electron/remote": "2.0.9",
    "async-retry": "1.3.3",
    "chokidar": "^3.5.3",
@ -31,6 +32,7 @@
    "queue": "6.0.2",
    "react": "17.0.2",
    "react-dom": "17.0.2",
+    "recast": "0.22.0",
    "semver": "7.3.8",
    "shell-env": "3.0.1",
    "sudo-prompt": "^9.2.1",
--- a/app/plugins.ts
+++ b/app/plugins.ts
@ -306,9 +306,12 @@ function requirePlugins(): any[] {
    }
  };

-  return plugins_
+  return [
+    ...localPlugins.filter((p) => basename(p) === 'migrated-hyper3-config'),
+    ...plugins_,
+    ...localPlugins.filter((p) => basename(p) !== 'migrated-hyper3-config')
+  ]
    .map(load)
-    .concat(localPlugins.map(load))
    .filter((v) => Boolean(v));
 }

--- a/app/yarn.lock
+++ b/app/yarn.lock
@ -2,6 +2,11 @@
 # yarn lockfile v1


+"@babel/parser@7.20.7":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
+  integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
+
 "@electron/remote@2.0.9":
  version "2.0.9"
  resolved "https://registry.npmjs.org/@electron/remote/-/remote-2.0.9.tgz#092ff085407bc907f45b89a72c36faa773ccf2d9"
@ -42,6 +47,23 @@ anymatch@~3.1.2:
    normalize-path "^3.0.0"
    picomatch "^2.0.4"

+assert@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
+  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
+  dependencies:
+    es6-object-assign "^1.1.0"
+    is-nan "^1.2.1"
+    object-is "^1.0.1"
+    util "^0.12.0"
+
+ast-types@0.15.2:
+  version "0.15.2"
+  resolved "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d"
+  integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==
+  dependencies:
+    tslib "^2.0.1"
+
 async-retry@1.3.3:
  version "1.3.3"
  resolved "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
@ -54,6 +76,11 @@ atomically@^1.7.0:
  resolved "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe"
  integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==

+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
 binary-extensions@^2.0.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
@ -66,6 +93,14 @@ braces@~3.0.2:
  dependencies:
    fill-range "^7.0.1"

+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 chokidar@^3.5.3:
  version "3.5.3"
  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@ -157,6 +192,14 @@ default-shell@1.0.1, default-shell@^1.0.1:
  resolved "https://registry.npmjs.org/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc"
  integrity sha1-dSMEvdxhdPSespy5iP7qC4gTyLw=

+define-properties@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
+  dependencies:
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
 dot-prop@^6.0.1:
  version "6.0.1"
  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
@ -203,6 +246,16 @@ env-paths@^2.2.1:
  resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==

+es6-object-assign@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
+  integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==
+
+esprima@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
 execa@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@ -250,6 +303,13 @@ find-up@^3.0.0:
  dependencies:
    locate-path "^3.0.0"

+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
+
 fs-extra@11.1.0:
  version "11.1.0"
  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
@ -264,6 +324,20 @@ fsevents@~2.3.2:
  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==

+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+
 get-stream@^4.0.0:
  version "4.1.0"
  resolved "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@ -295,11 +369,44 @@ glob-parent@~5.1.2:
  dependencies:
    is-glob "^4.0.1"

+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
 graceful-fs@^4.1.6, graceful-fs@^4.2.0:
  version "4.2.4"
  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==

+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
+has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
 human-signals@^1.1.1:
  version "1.1.1"
  resolved "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@ -312,7 +419,7 @@ iconv-lite@^0.6.2:
  dependencies:
    safer-buffer ">= 2.1.2 < 3.0.0"

-inherits@~2.0.3:
+inherits@^2.0.3, inherits@~2.0.3:
  version "2.0.4"
  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@ -322,6 +429,14 @@ invert-kv@^3.0.0:
  resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-3.0.1.tgz#a93c7a3d4386a1dc8325b97da9bb1620c0282523"
  integrity sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==

+is-arguments@^1.0.4:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-arrayish@^0.3.1:
  version "0.3.2"
  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
@ -334,11 +449,23 @@ is-binary-path@~2.1.0:
  dependencies:
    binary-extensions "^2.0.0"

+is-callable@^1.1.3:
+  version "1.2.7"
+  resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+
 is-extglob@^2.1.1:
  version "2.1.1"
  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=

+is-generator-function@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-glob@^4.0.1, is-glob@~4.0.1:
  version "4.0.1"
  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@ -346,6 +473,14 @@ is-glob@^4.0.1, is-glob@~4.0.1:
  dependencies:
    is-extglob "^2.1.1"

+is-nan@^1.2.1:
+  version "1.3.2"
+  resolved "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
 is-number@^7.0.0:
  version "7.0.0"
  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@ -366,6 +501,17 @@ is-stream@^2.0.0:
  resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==

+is-typed-array@^1.1.10, is-typed-array@^1.1.3:
+  version "1.1.10"
+  resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
+  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 isexe@^2.0.0:
  version "2.0.0"
  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@ -535,6 +681,19 @@ object-assign@^4.1.1:
  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

+object-is@^1.0.1:
+  version "1.1.5"
+  resolved "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
 once@^1.3.1, once@^1.4.0:
  version "1.4.0"
  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@ -687,6 +846,17 @@ readdirp@~3.6.0:
  dependencies:
    picomatch "^2.2.1"

+recast@0.22.0:
+  version "0.22.0"
+  resolved "https://registry.npmjs.org/recast/-/recast-0.22.0.tgz#1dd3bf1b86e5eb810b044221a1a734234ed3e9c0"
+  integrity sha512-5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ==
+  dependencies:
+    assert "^2.0.0"
+    ast-types "0.15.2"
+    esprima "~4.0.0"
+    source-map "~0.6.1"
+    tslib "^2.0.1"
+
 require-from-string@^2.0.2:
  version "2.0.2"
  resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
@ -772,6 +942,11 @@ simple-swizzle@^0.2.2:
  dependencies:
    is-arrayish "^0.3.1"

+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
 strip-ansi@^5.2.0:
  version "5.2.0"
  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@ -801,6 +976,11 @@ to-regex-range@^5.0.1:
  dependencies:
    is-number "^7.0.0"

+tslib@^2.0.1:
+  version "2.4.1"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+
 type-fest@^2.17.0:
  version "2.18.0"
  resolved "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz#fdef3a74e0a9e68ebe46054836650fb91ac3881e"
@ -818,11 +998,34 @@ uri-js@^4.2.2:
  dependencies:
    punycode "^2.1.0"

+util@^0.12.0:
+  version "0.12.5"
+  resolved "https://registry.npmjs.org/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
+  integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    is-typed-array "^1.1.3"
+    which-typed-array "^1.1.2"
+
 uuid@9.0.0:
  version "9.0.0"
  resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==

+which-typed-array@^1.1.2:
+  version "1.1.9"
+  resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
+  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+    is-typed-array "^1.1.10"
+
 which@^1.2.9:
  version "1.3.1"
  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
--- a/package.json
+++ b/package.json
@ -48,7 +48,6 @@
    "react-deep-force-update": "2.1.3",
    "react-dom": "17.0.2",
    "react-redux": "7.2.8",
-    "recast": "0.21.5",
    "redux": "4.2.0",
    "redux-thunk": "2.4.2",
    "registry-url": "^6.0.1",
--- a/yarn.lock
+++ b/yarn.lock
@ -1729,13 +1729,6 @@ ast-types@0.14.2:
  dependencies:
    tslib "^2.0.1"

-ast-types@0.15.2:
-  version "0.15.2"
-  resolved "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d"
-  integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==
-  dependencies:
-    tslib "^2.0.1"
-
 ast-util-plus@^0.7.1:
  version "0.7.1"
  resolved "https://registry.npmjs.org/ast-util-plus/-/ast-util-plus-0.7.1.tgz#5612e2f2af2ee127a8f6ac846520856f517c7c51"
@ -6869,16 +6862,6 @@ readdirp@~3.6.0:
  dependencies:
    picomatch "^2.2.1"

-recast@0.21.5:
-  version "0.21.5"
-  resolved "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495"
-  integrity sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==
-  dependencies:
-    ast-types "0.15.2"
-    esprima "~4.0.0"
-    source-map "~0.6.1"
-    tslib "^2.0.1"
-
 recast@^0.20.4:
  version "0.20.5"
  resolved "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz#8e2c6c96827a1b339c634dd232957d230553ceae"