cmd/tsconnect: extract NPM package for reusing in other projects

`src/` is broken up into several subdirectories:
- `lib/` and `types`/ for shared code and type definitions (more code
  will be moved here)
- `app/` for the existing Preact-app
- `pkg/` for the new NPM package

A new `build-pkg` esbuild-based command is added to generate the files
for the NPM package. To generate type definitions (something that esbuild
does not do), we set up `dts-bundle-generator`.

Includes additional cleanups to the Wasm type definitions (we switch to
string literals for enums, since exported const enums are hard to use
via packages).

Also allows the control URL to be set a runtime (in addition to the
current build option), so that we don't have to rebuild the package
for dev vs. prod use.

Updates #5415

Signed-off-by: Mihai Parparita <mihai@tailscale.com>

.github/workflows/cross-wasm.yml

@@ -38,7 +38,9 @@ jobs:
     - name: tsconnect static build
       # Use our custom Go toolchain, we set build tags (to control binary size)
       # that depend on it.
-      run: ./tool/go run ./cmd/tsconnect --fast-compression build
+      run: |
+        ./tool/go run ./cmd/tsconnect --fast-compression build
+        ./tool/go run ./cmd/tsconnect build-pkg
 
     - uses: k0kubun/action-slack@v2.0.0
       with:

cmd/tsconnect/.gitignore

@@ -1,2 +1,3 @@
 node_modules/
-dist/
+/dist
+/pkg

cmd/tsconnect/README.md

@@ -28,3 +28,13 @@ To serve them, run:
 ```
 
 By default the build output is placed in the `dist/` directory and embedded in the binary, but this can be controlled by the `-distdir` flag. The `-addr` flag controls the interface and port that the serve listens on.
+
+# Library / NPM Package
+
+The client is also available as an NPM package. To build it, run:
+
+```
+./tool/go run ./cmd/tsconnect build-pkg
+```
+
+That places the output in the `pkg/` directory, which may then be uploaded to a package registry (or installed from the file path directly).

cmd/tsconnect/build-pkg.go

@@ -0,0 +1,44 @@
+// Copyright (c) 2022 Tailscale Inc & AUTHORS All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"log"
+
+	esbuild "github.com/evanw/esbuild/pkg/api"
+)
+
+func runBuildPkg() {
+	buildOptions, err := commonSetup(prodMode)
+	if err != nil {
+		log.Fatalf("Cannot setup: %v", err)
+	}
+
+	log.Printf("Linting...\n")
+	if err := runYarn("lint"); err != nil {
+		log.Fatalf("Linting failed: %v", err)
+	}
+
+	if err := cleanDir(*pkgDir, "package.json"); err != nil {
+		log.Fatalf("Cannot clean %s: %v", *pkgDir, err)
+	}
+
+	buildOptions.EntryPoints = []string{"src/pkg/pkg.ts", "src/pkg/pkg.css"}
+	buildOptions.Outdir = *pkgDir
+	buildOptions.Format = esbuild.FormatESModule
+	buildOptions.AssetNames = "[name]"
+	buildOptions.Write = true
+	buildOptions.MinifyWhitespace = true
+	buildOptions.MinifyIdentifiers = true
+	buildOptions.MinifySyntax = true
+
+	runEsbuild(*buildOptions)
+
+	log.Printf("Generating types...\n")
+	if err := runYarn("pkg-types"); err != nil {
+		log.Fatalf("Type generation failed: %v", err)
+	}
+
+}

cmd/tsconnect/build.go

@@ -13,7 +13,6 @@ import (
 	"path"
 	"path/filepath"
 
-	esbuild "github.com/evanw/esbuild/pkg/api"
 	"tailscale.com/util/precompress"
 )
 
@@ -28,7 +27,7 @@ func runBuild() {
 		log.Fatalf("Linting failed: %v", err)
 	}
 
-	if err := cleanDist(); err != nil {
+	if err := cleanDir(*distDir, "placeholder"); err != nil {
 		log.Fatalf("Cannot clean %s: %v", *distDir, err)
 	}
 
@@ -41,21 +40,7 @@ func runBuild() {
 	buildOptions.AssetNames = "[name]-[hash]"
 	buildOptions.Metafile = true
 
-	log.Printf("Running esbuild...\n")
+	result := runEsbuild(*buildOptions)
-	result := esbuild.Build(*buildOptions)
-	if len(result.Errors) > 0 {
-		log.Printf("ESBuild Error:\n")
-		for _, e := range result.Errors {
-			log.Printf("%v", e)
-		}
-		log.Fatal("Build failed")
-	}
-	if len(result.Warnings) > 0 {
-		log.Printf("ESBuild Warnings:\n")
-		for _, w := range result.Warnings {
-			log.Printf("%v", w)
-		}
-	}
 
 	// Preserve build metadata so we can extract hashed file names for serving.
 	metadataBytes, err := fixEsbuildMetadataPaths(result.Metafile)
@@ -98,8 +83,6 @@ func fixEsbuildMetadataPaths(metadataStr string) ([]byte, error) {
 	return json.Marshal(metadata)
 }
 
-// cleanDist removes files from the dist build directory, except the placeholder
-// one that we keep to make sure Git still creates the directory.
 func cleanDist() error {
 	log.Printf("Cleaning %s...\n", *distDir)
 	files, err := os.ReadDir(*distDir)

cmd/tsconnect/common.go

@@ -17,6 +17,7 @@ import (
 	"time"
 
 	esbuild "github.com/evanw/esbuild/pkg/api"
+	"golang.org/x/exp/slices"
 )
 
 const (
@@ -38,7 +39,7 @@ func commonSetup(dev bool) (*esbuild.BuildOptions, error) {
 	}
 
 	return &esbuild.BuildOptions{
-		EntryPoints: []string{"src/index.ts", "src/index.css"},
+		EntryPoints: []string{"src/app/index.ts", "src/app/index.css"},
 		Outdir:      *distDir,
 		Bundle:      true,
 		Sourcemap:   esbuild.SourceMapLinked,
@@ -67,6 +68,47 @@ func commonSetup(dev bool) (*esbuild.BuildOptions, error) {
 	}, nil
 }
 
+// cleanDir removes files from dirPath, except the ones specified by
+// preserveFiles.
+func cleanDir(dirPath string, preserveFiles ...string) error {
+	log.Printf("Cleaning %s...\n", dirPath)
+	files, err := os.ReadDir(dirPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return os.MkdirAll(dirPath, 0755)
+		}
+		return err
+	}
+
+	for _, file := range files {
+		if !slices.Contains(preserveFiles, file.Name()) {
+			if err := os.Remove(filepath.Join(dirPath, file.Name())); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func runEsbuild(buildOptions esbuild.BuildOptions) esbuild.BuildResult {
+	log.Printf("Running esbuild...\n")
+	result := esbuild.Build(buildOptions)
+	if len(result.Errors) > 0 {
+		log.Printf("ESBuild Error:\n")
+		for _, e := range result.Errors {
+			log.Printf("%v", e)
+		}
+		log.Fatal("Build failed")
+	}
+	if len(result.Warnings) > 0 {
+		log.Printf("ESBuild Warnings:\n")
+		for _, w := range result.Warnings {
+			log.Printf("%v", w)
+		}
+	}
+	return result
+}
+
 // setupEsbuildWasmExecJS generates an esbuild plugin that serves the current
 // wasm_exec.js runtime helper library from the Go toolchain.
 func setupEsbuildWasmExecJS(build esbuild.PluginBuild) {
@@ -167,7 +209,7 @@ type EsbuildMetadata struct {
 
 func setupEsbuildTailwind(build esbuild.PluginBuild, dev bool) {
 	build.OnLoad(esbuild.OnLoadOptions{
-		Filter: "./src/index.css$",
+		Filter: "./src/.*\\.css$",
 	}, func(args esbuild.OnLoadArgs) (esbuild.OnLoadResult, error) {
 		start := time.Now()
 		yarnArgs := []string{"--silent", "tailwind", "-i", args.Path}

cmd/tsconnect/package.json

@@ -5,6 +5,7 @@
   "devDependencies": {
     "@types/golang-wasm-exec": "^1.15.0",
     "@types/qrcode": "^1.4.2",
+    "dts-bundle-generator": "^6.12.0",
     "preact": "^10.10.0",
     "qrcode": "^1.5.0",
     "tailwindcss": "^3.1.6",
@@ -13,7 +14,8 @@
     "xterm-addon-fit": "^0.5.0"
   },
   "scripts": {
-    "lint": "tsc --noEmit"
+    "lint": "tsc --noEmit",
+    "pkg-types": "dts-bundle-generator --inline-declare-global=true --no-banner -o pkg/pkg.d.ts src/pkg/pkg.ts"
   },
   "prettier": {
     "semi": false,

cmd/tsconnect/pkg/package.json

@@ -0,0 +1,10 @@
+{
+  "author": "Tailscale Inc.",
+  "description": "Tailscale Connect SDK",
+  "license": "BSD-3-Clause",
+  "name": "@tailscale/connect",
+  "type": "module",
+  "main": "./pkg.js",
+  "types": "./pkg.d.ts",
+  "version": "0.0.5"
+}

cmd/tsconnect/serve.go

@@ -115,8 +115,8 @@ func generateServeIndex(distFS fs.FS) ([]byte, error) {
 }
 
 var entryPointsToDefaultDistPaths = map[string]string{
-	"src/index.css": "dist/index.css",
+	"src/app/index.css": "dist/index.css",
-	"src/index.ts":  "dist/index.js",
+	"src/app/index.ts":  "dist/index.js",
 }
 
 func handleServeDist(w http.ResponseWriter, r *http.Request, distFS fs.FS) {

cmd/tsconnect/src/app/app.tsx

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 import { render, Component } from "preact"
-import { IPNState } from "./wasm_js"
 import { URLDisplay } from "./url-display"
 import { Header } from "./header"
 import { GoPanicDisplay } from "./go-panic-display"
@@ -18,7 +17,7 @@ type AppState = {
 }
 
 class App extends Component<{}, AppState> {
-  state: AppState = { ipnState: IPNState.NoState }
+  state: AppState = { ipnState: "NoState" }
   #goPanicTimeout?: number
 
   render() {
@@ -37,7 +36,7 @@ class App extends Component<{}, AppState> {
     }
 
     let machineAuthInstructions
-    if (ipnState === IPNState.NeedsMachineAuth) {
+    if (ipnState === "NeedsMachineAuth") {
       machineAuthInstructions = (
         <div class="container mx-auto px-4 text-center">
           An administrator needs to authorize this device.
@@ -46,7 +45,7 @@ class App extends Component<{}, AppState> {
     }
 
     let ssh
-    if (ipn && ipnState === IPNState.Running && netMap) {
+    if (ipn && ipnState === "Running" && netMap) {
       ssh = <SSH netMap={netMap} ipn={ipn} />
     }
 
@@ -77,9 +76,9 @@ class App extends Component<{}, AppState> {
   handleIPNState = (state: IPNState) => {
     const { ipn } = this.state
     this.setState({ ipnState: state })
-    if (state == IPNState.NeedsLogin) {
+    if (state === "NeedsLogin") {
       ipn?.login()
-    } else if ([IPNState.Running, IPNState.NeedsMachineAuth].includes(state)) {
+    } else if (["Running", "NeedsMachineAuth"].includes(state)) {
       this.setState({ browseToURL: undefined })
     }
   }

cmd/tsconnect/src/app/header.tsx

@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-import { IPNState } from "./wasm_js"
-
 export function Header({ state, ipn }: { state: IPNState; ipn?: IPN }) {
   const stateText = STATE_LABELS[state]
 
   let logoutButton
-  if (state === IPNState.Running) {
+  if (state === "Running") {
     logoutButton = (
       <button
         class="button bg-gray-500 border-gray-500 text-white hover:bg-gray-600 hover:border-gray-600 ml-2 font-bold"
@@ -30,11 +28,11 @@ export function Header({ state, ipn }: { state: IPNState; ipn?: IPN }) {
 }
 
 const STATE_LABELS = {
-  [IPNState.NoState]: "Initializing…",
+  NoState: "Initializing…",
-  [IPNState.InUseOtherUser]: "In-use by another user",
+  InUseOtherUser: "In-use by another user",
-  [IPNState.NeedsLogin]: "Needs login",
+  NeedsLogin: "Needs login",
-  [IPNState.NeedsMachineAuth]: "Needs authorization",
+  NeedsMachineAuth: "Needs authorization",
-  [IPNState.Stopped]: "Stopped",
+  Stopped: "Stopped",
-  [IPNState.Starting]: "Starting…",
+  Starting: "Starting…",
-  [IPNState.Running]: "Running",
+  Running: "Running",
 } as const

cmd/tsconnect/src/app/index.ts

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-import "./wasm_exec"
+import "../wasm_exec"
 import wasmUrl from "./main.wasm"
-import { sessionStateStorage } from "./js-state-store"
+import { sessionStateStorage } from "../lib/js-state-store"
 import { renderApp } from "./app"
 
 async function main() {

cmd/tsconnect/src/pkg/pkg.css

@@ -0,0 +1,9 @@
+/* Copyright (c) 2022 Tailscale Inc & AUTHORS All rights reserved. */
+/* Use of this source code is governed by a BSD-style */
+/* license that can be found in the LICENSE file. */
+
+@import "xterm/css/xterm.css";
+
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

cmd/tsconnect/src/pkg/pkg.ts

@@ -0,0 +1,39 @@
+// Copyright (c) 2022 Tailscale Inc & AUTHORS All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Type definitions need to be manually imported for dts-bundle-generator to
+// discover them.
+/// <reference path="../types/esbuild.d.ts" />
+/// <reference path="../types/wasm_js.d.ts" />
+
+import "../wasm_exec"
+import wasmURL from "./main.wasm"
+
+/**
+ * Superset of the IPNConfig type, with additional configuration that is
+ * needed for the package to function.
+ */
+type IPNPackageConfig = IPNConfig & {
+  // Auth key used to intitialize the Tailscale client (required)
+  authKey: string
+  // URL of the main.wasm file that is included in the page, if it is not
+  // accessible via a relative URL.
+  wasmURL?: string
+  // Funtion invoked if the Go process panics or unexpectedly exits.
+  panicHandler: (err: string) => void
+}
+
+export async function createIPN(config: IPNPackageConfig): Promise<IPN> {
+  const go = new Go()
+  const wasmInstance = await WebAssembly.instantiateStreaming(
+    fetch(config.wasmURL ?? wasmURL),
+    go.importObject
+  )
+  // The Go process should never exit, if it does then it's an unhandled panic.
+  go.run(wasmInstance.instance).then(() =>
+    config.panicHandler("Unexpected shutdown")
+  )
+
+  return newIPN(config)
+}

cmd/tsconnect/src/types/wasm_js.d.ts

@@ -4,8 +4,7 @@
 
 /**
  * @fileoverview Type definitions for types exported by the wasm_js.go Go
- * module. Not actually a .d.ts file so that we can use enums from it in
+ * module.
- * esbuild's simplified TypeScript compiler (see https://github.com/evanw/esbuild/issues/2298#issuecomment-1146378367)
  */
 
 declare global {
@@ -26,9 +25,7 @@ declare global {
         onDone: () => void
       }
     ): IPNSSHSession
-    fetch(
+    fetch(url: string): Promise<{
-      url: string
-    ): Promise<{
       status: number
       statusText: string
       text: () => Promise<string>
@@ -48,6 +45,7 @@ declare global {
   type IPNConfig = {
     stateStorage?: IPNStateStorage
     authKey?: string
+    controlURL?: string
   }
 
   type IPNCallbacks = {
@@ -77,23 +75,23 @@ declare global {
     online?: boolean
     tailscaleSSHEnabled: boolean
   }
-}
 
-/** Mirrors values from ipn/backend.go */
+  /** Mirrors values from ipn/backend.go */
-export const enum IPNState {
+  type IPNState =
-  NoState = 0,
+    | "NoState"
-  InUseOtherUser = 1,
+    | "InUseOtherUser"
-  NeedsLogin = 2,
+    | "NeedsLogin"
-  NeedsMachineAuth = 3,
+    | "NeedsMachineAuth"
-  Stopped = 4,
+    | "Stopped"
-  Starting = 5,
+    | "Starting"
-  Running = 6,
+    | "Running"
-}
 
-/** Mirrors values from MachineStatus in tailcfg.go */
+  /** Mirrors values from MachineStatus in tailcfg.go */
-export const enum IPNMachineStatus {
+  type IPNMachineStatus =
-  MachineUnknown = 0,
+    | "MachineUnknown"
-  MachineUnauthorized = 1,
+    | "MachineUnauthorized"
-  MachineAuthorized = 2,
+    | "MachineAuthorized"
-  MachineInvalid = 3,
+    | "MachineInvalid"
 }
+
+export {}

cmd/tsconnect/tsconnect.go

@@ -20,6 +20,7 @@ import (
 var (
 	addr            = flag.String("addr", ":9090", "address to listen on")
 	distDir         = flag.String("distdir", "./dist", "path of directory to place build output in")
+	pkgDir          = flag.String("pkgdir", "./pkg", "path of directory to place NPM package build output in")
 	yarnPath        = flag.String("yarnpath", "../../tool/yarn", "path yarn executable used to install JavaScript dependencies")
 	fastCompression = flag.Bool("fast-compression", false, "Use faster compression when building, to speed up build time. Meant to iterative/debugging use only.")
 	devControl      = flag.String("dev-control", "", "URL of a development control server to be used with dev. If provided without specifying dev, an error will be returned.")
@@ -37,6 +38,8 @@ func main() {
 		runDev()
 	case "build":
 		runBuild()
+	case "build-pkg":
+		runBuildPkg()
 	case "serve":
 		runServe()
 	default:

cmd/tsconnect/wasm/wasm_js.go

@@ -69,6 +69,12 @@ func newIPN(jsConfig js.Value) map[string]any {
 		store = &jsStateStore{jsStateStorage}
 	}
 
+	jsControlURL := jsConfig.Get("controlURL")
+	controlURL := ControlURL
+	if jsControlURL.Type() == js.TypeString {
+		controlURL = jsControlURL.String()
+	}
+
 	jsAuthKey := jsConfig.Get("authKey")
 	var authKey string
 	if jsAuthKey.Type() == js.TypeString {
@@ -125,9 +131,11 @@ func newIPN(jsConfig js.Value) map[string]any {
 	ns.SetLocalBackend(lb)
 
 	jsIPN := &jsIPN{
-		dialer: dialer,
+		dialer:     dialer,
-		srv:    srv,
+		srv:        srv,
-		lb:     lb,
+		lb:         lb,
+		controlURL: controlURL,
+		authKey:    authKey,
 	}
 
 	return map[string]any{
@@ -141,7 +149,7 @@ func newIPN(jsConfig js.Value) map[string]any {
 				})`)
 				return nil
 			}
-			jsIPN.run(args[0], authKey)
+			jsIPN.run(args[0])
 			return nil
 		}),
 		"login": js.FuncOf(func(this js.Value, args []js.Value) interface{} {
@@ -183,14 +191,33 @@ func newIPN(jsConfig js.Value) map[string]any {
 }
 
 type jsIPN struct {
-	dialer *tsdial.Dialer
+	dialer     *tsdial.Dialer
-	srv    *ipnserver.Server
+	srv        *ipnserver.Server
-	lb     *ipnlocal.LocalBackend
+	lb         *ipnlocal.LocalBackend
+	controlURL string
+	authKey    string
+}
+
+var jsIPNState = map[ipn.State]string{
+	ipn.NoState:          "NoState",
+	ipn.InUseOtherUser:   "InUseOtherUser",
+	ipn.NeedsLogin:       "NeedsLogin",
+	ipn.NeedsMachineAuth: "NeedsMachineAuth",
+	ipn.Stopped:          "Stopped",
+	ipn.Starting:         "Starting",
+	ipn.Running:          "Running",
+}
+
+var jsMachineStatus = map[tailcfg.MachineStatus]string{
+	tailcfg.MachineUnknown:      "MachineUnknown",
+	tailcfg.MachineUnauthorized: "MachineUnauthorized",
+	tailcfg.MachineAuthorized:   "MachineAuthorized",
+	tailcfg.MachineInvalid:      "MachineInvalid",
 }
 
-func (i *jsIPN) run(jsCallbacks js.Value, authKey string) {
+func (i *jsIPN) run(jsCallbacks js.Value) {
 	notifyState := func(state ipn.State) {
-		jsCallbacks.Call("notifyState", int(state))
+		jsCallbacks.Call("notifyState", jsIPNState[state])
 	}
 	notifyState(ipn.NoState)
 
@@ -218,7 +245,7 @@ func (i *jsIPN) run(jsCallbacks js.Value, authKey string) {
 						NodeKey:    nm.NodeKey.String(),
 						MachineKey: nm.MachineKey.String(),
 					},
-					MachineStatus: int(nm.MachineStatus),
+					MachineStatus: jsMachineStatus[nm.MachineStatus],
 				},
 				Peers: mapSlice(nm.Peers, func(p *tailcfg.Node) jsNetMapPeerNode {
 					name := p.Name
@@ -253,13 +280,13 @@ func (i *jsIPN) run(jsCallbacks js.Value, authKey string) {
 		err := i.lb.Start(ipn.Options{
 			StateKey: "wasm",
 			UpdatePrefs: &ipn.Prefs{
-				ControlURL:       ControlURL,
+				ControlURL:       i.controlURL,
 				RouteAll:         false,
 				AllowSingleHosts: true,
 				WantRunning:      true,
 				Hostname:         generateHostname(),
 			},
-			AuthKey: authKey,
+			AuthKey: i.authKey,
 		})
 		if err != nil {
 			log.Printf("Start error: %v", err)
@@ -467,7 +494,7 @@ type jsNetMapNode struct {
 
 type jsNetMapSelfNode struct {
 	jsNetMapNode
-	MachineStatus int `json:"machineStatus"`
+	MachineStatus string `json:"machineStatus"`
 }
 
 type jsNetMapPeerNode struct {

cmd/tsconnect/yarn.lock

@@ -130,6 +130,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 color-convert@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
@@ -181,6 +190,14 @@ dlv@^1.1.3:
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
+dts-bundle-generator@^6.12.0:
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/dts-bundle-generator/-/dts-bundle-generator-6.12.0.tgz#0a221bdce5fdd309a56c8556e645f16ed87ab07d"
+  integrity sha512-k/QAvuVaLIdyWRUHduDrWBe4j8PcE6TDt06+f32KHbW7/SmUPbX1O23fFtQgKwUyTBkbIjJFOFtNrF97tJcKug==
+  dependencies:
+    typescript ">=3.0.1"
+    yargs "^17.2.1"
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -191,6 +208,11 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 fast-glob@^3.2.11:
   version "3.2.11"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
@@ -234,7 +256,7 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -523,7 +545,7 @@ source-map-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
-string-width@^4.1.0, string-width@^4.2.0:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -579,7 +601,7 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-typescript@^4.7.4:
+typescript@>=3.0.1, typescript@^4.7.4:
   version "4.7.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
   integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
@@ -603,6 +625,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 xtend@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -623,6 +654,11 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
 yaml@^1.10.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
@@ -636,6 +672,11 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^21.0.0:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -652,3 +693,16 @@ yargs@^15.3.1:
     which-module "^2.0.0"
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
+
+yargs@^17.2.1:
+  version "17.5.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e"
+  integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.0.0"