fixed module fuckery... i think.

package.json

@@ -15,19 +15,19 @@
   "productName": "ElectronReact",
   "description": "Electron application boilerplate based on React, React Router, Webpack, React Fast Refresh for rapid application development",
   "scripts": {
+    "postinstall": "node -r @babel/register .erb/scripts/CheckNativeDep.js && electron-builder install-app-deps && yarn cross-env NODE_ENV=development webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.babel.js && opencollective-postinstall && yarn-deduplicate yarn.lock",
     "build": "concurrently \"yarn build:main\" \"yarn build:renderer\"",
     "build:main": "cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.main.prod.babel.js",
     "build:renderer": "cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.renderer.prod.babel.js",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir src",
     "lint": "cross-env NODE_ENV=development eslint . --cache --ext .js,.jsx,.ts,.tsx",
     "package": "rm -rf src/dist && yarn build && electron-builder build --publish never",
-    "postinstall": "node -r @babel/register .erb/scripts/CheckNativeDep.js && electron-builder install-app-deps && yarn cross-env NODE_ENV=development webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.babel.js && opencollective-postinstall && yarn-deduplicate yarn.lock",
     "start": "node -r @babel/register ./.erb/scripts/CheckPortInUse.js && cross-env yarn start:renderer",
     "start:main": "cross-env NODE_ENV=development electron -r ./.erb/scripts/BabelRegister ./src/main.dev.ts",
     "start:renderer": "cross-env NODE_ENV=development webpack serve --config ./.erb/configs/webpack.config.renderer.dev.babel.js",
     "test": "jest",
-    "relay": "supervisor -w relay,src -n exit relay/index.js",
+    "relay": "supervisor -w relay,src -n exit relay/index.mjs",
-    "relay:service": "supervisor -- relay/service",
+    "relay:service": "supervisor -- relay/service.mjs",
     "sloc": "find lib -type f | xargs wc -l"
   },
   "build": {
@@ -260,6 +260,7 @@
     "md5": "^2.3.0",
     "menubar": "^9.0.3",
     "nat-upnp": "^1.1.1",
+    "nedb": "^1.8.0",
     "node-ipc": "^9.1.4",
     "node-rsa": "^1.1.1",
     "printable-characters": "^1.0.42",

relay/index.mjs

@@ -1,21 +1,26 @@
 // process.env.DEBUG = 'xyz:valnet:*';
+'use strict';
+
+import { title } from '../src/lib/title.js';
+import { Identity } from '../src/lib/Identity.js';
+import { config } from '../src/lib/config/index.js';
+import appdata from '../src/lib/appdata.js';
+import Node from '../src/lib/node.js';
+
+import Signale from 'signale';
+import { ensureDirSync } from 'fs-extra';
+import express from 'express';
 
-(async () => {
-const { title } = require('../src/lib/title');
-const log = require('signale').scope('RLAY');
-const { Identity } = require('../src/lib/Identity');
 title('relay', false);
-const Node = require('../src/lib/node');
+const log = Signale.scope('RLAY');
-const { config } = require('../src/lib/config');
-const { ensureDirSync } = require('fs-extra');
-const appdata = require('../src/lib/appdata');
-
-ensureDirSync(`${appdata}/valnet/relay`);
 const node = new Node();
 
+(async () => {
+
 // ==================================== [EXPRESS]
-const express = require('express');
+
 const app = express();
+ensureDirSync(`${appdata}/valnet/relay`);
 
 app.get('/', (req, res) => {
 	res.end(`

relay/service.mjs

@@ -1,21 +1,24 @@
+import Signale from 'signale';
+import { execSync, spawn } from 'child_process';
+import Datastore from 'nedb';
+import { config } from '../src/lib/config/index.js';
+import express from 'express';
+
 (async () => {
-const log = require('signale').scope('SRVC');
+
-const { execSync, spawn } = require('child_process');
+const log = Signale.scope('SRVC');
 const branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
 let proc;
-const Datastore = require('nedb');
 const logs = new Datastore({
 	filename: 'svc.log',
 	autoload: true
 });
-const { config } = require('../package.json');
-const express = require('express');
 const app = express();
 
 try {
 	appendLogs('yarn', execSync(`yarn`));
 } catch (e) {
-	appendLogs('failed to yarn install...')
+	logp('failed to yarn install...')
 }
 
 logp('==================================');
@@ -47,7 +50,7 @@ setInterval(function update() {
 }, 5000);
 
 (function keepAlive() {
-	proc = spawn('node', ['relay'], {
+	proc = spawn('node', ['./relay/index.mjs'], {
 		stdio: 'pipe'
 	});
 

src/App.tsx

@@ -2,7 +2,8 @@ import React from 'react';
 import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
 import icon from '../assets/icon.svg';
 import './App.global.css';
-import { IpcClient } from './lib/ipc';
+import { IpcClient } from './lib/ipc.js';
+
 
 class Hello extends React.Component {
   api = new IpcClient('valnet');
@@ -15,6 +16,11 @@ class Hello extends React.Component {
     console.log(await this.api.getClients())
   }
 
+  async killApp() {
+    // alert(this);
+    await this.api.kill(1);
+  }
+
   render() {
     return (
       <div>
@@ -24,20 +30,19 @@ class Hello extends React.Component {
         <h1>electron-react-boilerplate</h1>
         <div className="Hello">
           <a
-            href="https://electron-react-boilerplate.js.org/"
+            href="#"
-            target="_blank"
             rel="noreferrer"
+            onClick={this.killApp.bind(this)}
           >
             <button type="button">
               <span role="img" aria-label="books">
                 📚
               </span>
-              Read our docs
+              Kill App
             </button>
           </a>
           <a
-            href="https://github.com/sponsors/electron-react-boilerplate"
+            target="#"
-            target="_blank"
             rel="noreferrer"
           >
             <button type="button">

src/lib/StreamJsonParser.js

@@ -5,7 +5,6 @@ module.exports.StreamJsonParser = class StreamJsonParser extends EventEmitter {
 	buffer = '';
 
 	data(evt) {
-		console.log(evt)
 		// toString it, in case its a buffer!
 		this.buffer += evt.toString();
 		this.processBuffer();
@@ -15,8 +14,6 @@ module.exports.StreamJsonParser = class StreamJsonParser extends EventEmitter {
 		const parts = this.buffer.split(/(\x02[^\x02\x03]*\x03)/g);
 		this.buffer = '';
 
-		console.log('process', this.buffer);
-
 		for(const message of parts) {
 			if(message.endsWith('\x03')) {
 				const obj = JSON.parse(message.substr(1, message.length - 2));

src/lib/config/defaults.js

@@ -0,0 +1,12 @@
+module.exports = {
+	"ports": {
+		"relay": 5600,
+		"relayEnd": 5699,
+		"http": 5700,
+		"service": 5000
+	},
+	"endpoints": [
+		"valnet.xyz:5500",
+		"35.196.210.135:5600"
+	]
+}

src/lib/config/index.js

@@ -1,9 +1,9 @@
 const { readFileSync, writeFileSync, existsSync } = require('fs');
 const { ensureDirSync } = require('fs-extra');
-const { config } = require('../../package.json');
+const config = require('./defaults.js');
 const deepmerge = require('deepmerge');
 
-const appdata = require('./appdata');
+const appdata = require('../appdata');
 ensureDirSync(`${appdata}/valnet/relay`);
 const filepath = `${appdata}/valnet/relay/config.json`;
 

src/lib/ipc.js

@@ -28,8 +28,6 @@ class IpcServer extends EventEmitter {
 		ipc.server.on('req', (evt, incommingSocket) => {
 			if (incommingSocket !== socket) return;
 
-			console.log('req -', evt);
-
 			const [
 				name,
 				...args
@@ -82,12 +80,8 @@ function IpcClient(name) {
 	return this.proxy;
 
 }
-if(!!module.exports) {
-	module.exports.IpcServer = IpcServer;
-	module.exports.IpcClient = IpcClient;
-}
 
-export {
+module.exports = {
 	IpcServer,
 	IpcClient
-}
+};

src/lib/node.js

@@ -2,8 +2,7 @@ const EventEmitter = require('events')
 const stp = require('./STP');
 const upnp = require('./upnp');
 const md5 = require('md5');
-const pkg = require('./../package.json');
+const { config, write } = require('./config/index.js');
-const { config, write } = require('./config.js');
 const log = require('signale').scope('NODE');
 const bonjour = require('bonjour')();
 const Gateway = require('./Gateway');
@@ -61,7 +60,7 @@ class Node extends EventEmitter {
 			log.info('incomming connection from ' + connection.remoteName);
 		});
 		
-		log.info('advertising node on multicast...')
+		log.info('advertising node on multicast...');
 		this.multicastAd = bonjour.publish({
 			name: this.name,
 			type: 'stp',
@@ -76,6 +75,7 @@ class Node extends EventEmitter {
 
 		const ipcServer = new IpcServer('valnet');
 		ipcServer.registerFunction(this.getClients.bind(this));
+		ipcServer.registerFunction(this.kill.bind(this));
 
 		// log.success('Node successfully registered!');
 	}
@@ -85,6 +85,10 @@ class Node extends EventEmitter {
 		return this.clients;
 	}
 
+	kill(code) {
+		process.exit(code);
+	}
+
 	async serviceUp(device) {
 		this.multicastDevices.push(device);
 	}
@@ -120,8 +124,6 @@ class Node extends EventEmitter {
 				return;
 			}
 		}
-
-		// console.log(mappings, this.hash);
 	}
 
 	static get Node() {

upnp.js

@@ -50,7 +50,6 @@ function searchGateway(timeout, callback) {
   
   var onmessage = function(message, rinfo) {
   
-		console.log('message?')
     message = message.toString();
     
     if (message.substr(0, OK.length) !== OK || 

valnet-webapp/.gitignore

@@ -1,23 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*

valnet-webapp/README.md

@@ -1,70 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `yarn start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
-
-### Analyzing the Bundle Size
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
-
-### Making a Progressive Web App
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
-
-### Advanced Configuration
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
-
-### Deployment
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
-
-### `yarn build` fails to minify
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)

valnet-webapp/package.json

@@ -1,38 +0,0 @@
-{
-  "name": "valnet-webapp",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-scripts": "4.0.2",
-    "web-vitals": "^1.0.1"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
-}

valnet-webapp/public/index.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>Valnet Portal</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>

valnet-webapp/public/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

valnet-webapp/public/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

valnet-webapp/src/ActiveConnections/index.js

@@ -1,45 +0,0 @@
-import React from 'react';
-import styles from './style.module.css';
-import { apiRoot } from '../lib/constants.js';
-
-class ActiveConnections extends React.Component {
-	
-	state = {
-		connections: []
-	}
-
-	constructor(props) {
-		super(props);
-		this.refreshData();
-	}
-
-	async refreshData() {
-		const req = await fetch(`${apiRoot}/clients`);
-		const res = await req.json();
-		console.log(res);
-	}
-
-	render() {
-		return (
-			<div>
-				<div>active connections!</div>
-				{this.state.connections.map(connection => {
-					return (<div>
-						{connection.toLocaleString()};
-					</div>)
-				})}
-				<br />
-				<button onClick={() => this.addConnection.bind(this)()}>
-					Add Connection
-				</button>
-			</div>
-		);
-	}
-
-	addConnection() {
-		this.state.connections.push(new Date());
-		this.forceUpdate();
-	}
-}
-
-export default ActiveConnections;

valnet-webapp/src/ActiveConnections/style.module.css

@@ -1,3 +0,0 @@
-.red {
-	color: red;
-}

valnet-webapp/src/App.js

@@ -1,13 +0,0 @@
-import React from 'react';
-import ActiveConnections from './ActiveConnections/index';
-import './app.css';
-
-function App() {
-  return (
-    <>
-      <ActiveConnections />
-    </>
-  );
-}
-
-export default App;

valnet-webapp/src/app.css

@@ -1,47 +0,0 @@
-@media (prefers-color-scheme: dark) {
-	html {
-		--b1: #001;
-		--b2: #112;
-		--b3: #223;
-		--b4: #334;
-		--t1: #EEF;
-		--t2: #DDE;
-		--t3: #CCD;
-	}
-}
-
-@media (prefers-color-scheme: light) {
-		html {
-			--b1: #EEF;
-			--b2: #DDE;
-			--b3: #CCD;
-			--b4: #BBC;
-			--t1: #001;
-			--t2: #112;
-			--t3: #223;
-	}
-}
-
-
-
-html {
-	background: var(--b1);
-	color: var(--t1);
-}
-td:not(:last-child), th:not(:last-child) {
-	border-right: 1px solid var(--t3);
-}
-td, th {
-	padding-left: 8px;
-}
-th {
-	border-bottom: 3px solid var(--t3);
-}
-table {
-	border-spacing: 0px;
-	font-family: sans-serif;
-	font-size: 13px;
-}
-tr:nth-child(2n) {
-	background: #111;
-}

valnet-webapp/src/index.js

@@ -1,11 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-
-ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById('root')
-);
-

valnet-webapp/src/lib/constants.js

@@ -1 +0,0 @@
-export const apiRoot = '//127.0.0.1:5700';

yarn.lock

@@ -2496,6 +2496,11 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
+async@0.2.10:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
+
 async@0.9.x:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
@@ -2688,6 +2693,13 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
+binary-search-tree@0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/binary-search-tree/-/binary-search-tree-0.2.5.tgz#7dbb3b210fdca082450dad2334c304af39bdc784"
+  integrity sha1-fbs7IQ/coIJFDa0jNMMErzm9x4Q=
+  dependencies:
+    underscore "~1.4.4"
+
 bindings@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -7572,6 +7584,13 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+lie@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
+  dependencies:
+    immediate "~3.0.5"
+
 lie@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
@@ -7690,6 +7709,13 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+localforage@^1.3.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz#f3e4d32a8300b362b4634cc4e066d9d00d2f09d1"
+  integrity sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g==
+  dependencies:
+    lie "3.1.1"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -8249,6 +8275,17 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
+nedb@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/nedb/-/nedb-1.8.0.tgz#0e3502cd82c004d5355a43c9e55577bd7bd91d88"
+  integrity sha1-DjUCzYLABNU1WkPJ5VV3vXvZHYg=
+  dependencies:
+    async "0.2.10"
+    binary-search-tree "0.2.5"
+    localforage "^1.3.0"
+    mkdirp "~0.5.1"
+    underscore "~1.4.4"
+
 needle@^2.2.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.2.tgz#cf1a8fce382b5a280108bba90a14993c00e4010a"
@@ -11546,6 +11583,11 @@ typical@^5.0.0, typical@^5.2.0:
   resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066"
   integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==
 
+underscore@~1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
+  integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"