Merge branch 'main' into dependabot/npm_and_yarn/microsoft/api-extrac…

…tor-7.29.0

project/cultist/action.ts

@@ -1,7 +1,7 @@
-import * as state from 'project/cultist/state';
+import * as state from 'monorepo/project/cultist/state';
 import immutable from 'immutable';
-import * as cultist from 'project/cultist/types';
-import * as iter from 'ts/iter';
+import * as cultist from 'monorepo/project/cultist/types';
+import * as iter from 'monorepo/ts/iter';
 
 export enum Kind {
 	PassTime = 0,

project/cultist/action_test.ts

@@ -1,6 +1,6 @@
-import * as state from 'project/cultist/state';
-import * as action from 'project/cultist/action';
-import * as element from 'project/cultist/element';
+import * as state from 'monorepo/project/cultist/state';
+import * as action from 'monorepo/project/cultist/action';
+import * as element from 'monorepo/project/cultist/element';
 import immutable from 'immutable';
 
 const cultist = {

project/cultist/aspects.ts

@@ -1,4 +1,4 @@
-import * as Aspects from 'project/cultist/types';
+import * as Aspects from 'monorepo/project/cultist/types';
 
 function aspectsOf(item: Pick<Aspects.Element, 'id' | 'aspects'>) {
 	return Object.entries({ ...item.aspects, [item.id]: 1 });

project/cultist/element.ts

@@ -1,5 +1,5 @@
-import * as state from 'project/cultist/state';
-import * as Iter from 'ts/iter';
+import * as state from 'monorepo/project/cultist/state';
+import * as Iter from 'monorepo/ts/iter';
 
 export function count(id: string, elements: state.State['elementStacks']) {
 	return Iter.reduce(

project/cultist/history.ts

@@ -1,4 +1,4 @@
-import * as cultist from 'project/cultist/types';
+import * as cultist from 'monorepo/project/cultist/types';
 
 export enum Kind {
 	PassTime,

project/cultist/index.ts

@@ -1,10 +1,10 @@
-export * from 'project/cultist/types';
-export * as aspects from 'project/cultist/aspects';
-export * as action from 'project/cultist/action';
-export * as save from 'project/cultist/save';
-export * as state from 'project/cultist/state';
-export { Action } from 'project/cultist/action';
-export * as slots from 'project/cultist/slots';
-export * as recipes from 'project/cultist/recipe';
-export * as verb from 'project/cultist/verb';
-export * as element from 'project/cultist/element';
+export * from 'monorepo/project/cultist/types';
+export * as aspects from 'monorepo/project/cultist/aspects';
+export * as action from 'monorepo/project/cultist/action';
+export * as save from 'monorepo/project/cultist/save';
+export * as state from 'monorepo/project/cultist/state';
+export { Action } from 'monorepo/project/cultist/action';
+export * as slots from 'monorepo/project/cultist/slots';
+export * as recipes from 'monorepo/project/cultist/recipe';
+export * as verb from 'monorepo/project/cultist/verb';
+export * as element from 'monorepo/project/cultist/element';

project/cultist/multiplayer/index.tsx

@@ -1,5 +1,5 @@
 import ReactDOM from 'react-dom';
 import React from 'react';
-import Home from 'project/cultist/multiplayer/pages';
+import Home from 'monorepo/project/cultist/multiplayer/pages';
 
 ReactDOM.render(<Home />, document.querySelector('main'));

project/cultist/multiplayer/pages/index.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
-import exampleSave from 'project/cultist/example/savestate';
+import exampleSave from 'monorepo/project/cultist/example/savestate';
 
-import * as State from 'project/cultist/state';
-import * as Save from 'project/cultist/save';
-import * as Board from 'project/cultist/react/table';
+import * as State from 'monorepo/project/cultist/state';
+import * as Save from 'monorepo/project/cultist/save';
+import * as Board from 'monorepo/project/cultist/react/table';
 
 const Home = (): React.ReactElement => {
 	const [state, setState] = React.useState(

project/cultist/react/table.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import * as State from 'project/cultist/state';
+import * as State from 'monorepo/project/cultist/state';
 // stubbed out because IDK how to fix style issues right now.
 //import style from './table.module.css';
 

project/cultist/recipe.ts

@@ -1,6 +1,6 @@
-import * as cultist from 'project/cultist/types';
-import * as aspects from 'project/cultist/aspects';
-import * as Verb from 'project/cultist/verb';
+import * as cultist from 'monorepo/project/cultist/types';
+import * as aspects from 'monorepo/project/cultist/aspects';
+import * as Verb from 'monorepo/project/cultist/verb';
 
 /**
  * Given a set of verbs, recipes and elements, return an iterable subset

project/cultist/save_test.ts

@@ -1,5 +1,5 @@
-import SaveStateExample from 'project/cultist/example/savestate';
-import * as save from 'project/cultist/save';
+import SaveStateExample from 'monorepo/project/cultist/example/savestate';
+import * as save from 'monorepo/project/cultist/save';
 
 test('savestate', () => {
 	const test: save.State = SaveStateExample;

project/cultist/slots.ts

@@ -1,5 +1,5 @@
-import * as cultist from 'project/cultist/types';
-import * as Aspects from 'project/cultist/aspects';
+import * as cultist from 'monorepo/project/cultist/types';
+import * as Aspects from 'monorepo/project/cultist/aspects';
 
 export function* of(
 	i: Iterable<{ slot?: cultist.Slot } | { slots?: cultist.Slot[] }>

project/cultist/state/deserialize.ts

@@ -2,10 +2,10 @@
  * @fileoverview like save state, but more sane.
  */
 
-import * as Save from 'project/cultist/save';
-import * as State from 'project/cultist/state/state';
-import * as Iter from 'ts/iter';
-import { maybe } from 'ts/util';
+import * as Save from 'monorepo/project/cultist/save';
+import * as State from 'monorepo/project/cultist/state/state';
+import * as Iter from 'monorepo/ts/iter';
+import { maybe } from 'monorepo/ts/util';
 import Immutable from 'immutable';
 
 function intoMap<I, O>(

project/cultist/state/index.ts

@@ -1,7 +1,7 @@
-export * from 'project/cultist/state/state';
-export * from 'project/cultist/state/op';
-export * as deserialize from 'project/cultist/state/deserialize';
-export * as serialize from 'project/cultist/state/serialize';
+export * from 'monorepo/project/cultist/state/state';
+export * from 'monorepo/project/cultist/state/op';
+export * as deserialize from 'monorepo/project/cultist/state/deserialize';
+export * as serialize from 'monorepo/project/cultist/state/serialize';
 
 // taken from a save from the game.
 

project/cultist/state/op.ts

@@ -6,7 +6,7 @@ import {
 	MutableElementInstance,
 	NewElementInstance,
 	ElementInstance,
-} from 'project/cultist/state/state';
+} from 'monorepo/project/cultist/state/state';
 import Immutable from 'immutable';
 import { v4 as v4uuid } from 'uuid';
 

project/cultist/state/serialize.ts

@@ -2,10 +2,10 @@
  * @fileoverview like save state, but more sane.
  */
 
-import * as Save from 'project/cultist/save';
-import * as State from 'project/cultist/state/state';
-import * as Iter from 'ts/iter';
-import { maybe } from 'ts/util';
+import * as Save from 'monorepo/project/cultist/save';
+import * as State from 'monorepo/project/cultist/state/state';
+import * as Iter from 'monorepo/ts/iter';
+import { maybe } from 'monorepo/ts/util';
 
 export function elements(
 	s: State.State['elementStacks'] | State.Situation['situationStoredElements']

project/cultist/state/state_test.ts

@@ -1,7 +1,7 @@
-import * as Save from 'project/cultist/save';
-import * as serialize from 'project/cultist/state/serialize';
-import * as deserialize from 'project/cultist/state/deserialize';
-import { maybe } from 'ts/util';
+import * as Save from 'monorepo/project/cultist/save';
+import * as serialize from 'monorepo/project/cultist/state/serialize';
+import * as deserialize from 'monorepo/project/cultist/state/deserialize';
+import { maybe } from 'monorepo/ts/util';
 
 test('maybe', () => {
 	expect(maybe(serialize.number)(10)).toEqual('10');

project/cultist/verb.ts

@@ -1,7 +1,7 @@
-import * as cultist from 'project/cultist/types';
-import * as Slots from 'project/cultist/slots';
-import { filter, remove } from 'ts/iter';
-import { isDefined } from 'ts/guard';
+import * as cultist from 'monorepo/project/cultist/types';
+import * as Slots from 'monorepo/project/cultist/slots';
+import { filter, remove } from 'monorepo/ts/iter';
+import { isDefined } from 'monorepo/ts/guard';
 
 function* elementCombosForVerb(
 	verb: cultist.Verb,

project/zemn.me/bio/bio.ts

@@ -1,5 +1,5 @@
-import * as lang from 'ts/react/lang';
-import * as time from 'ts/time';
+import * as lang from 'monorepo/ts/react/lang';
+import * as time from 'monorepo/ts/time';
 
 type Text = lang.Text;
 

project/zemn.me/elements/DarkModeSwitcher/DarkModeSwitcher.tsx

@@ -1,4 +1,4 @@
-import SliderCheckbox from 'project/zemn.me/elements/SliderCheckbox';
+import SliderCheckbox from 'monorepo/project/zemn.me/elements/SliderCheckbox';
 import React from 'react';
 
 export const DarkModeSwitcher: React.FC = () => <SliderCheckbox />;

project/zemn.me/elements/NavBar/NavBar.tsx

@@ -1,13 +1,13 @@
-import ZemnmezLogo from 'project/zemn.me/elements/ZemnmezLogo';
-import useHoverMenu from 'project/zemn.me/hooks/useHoverMenu';
+import ZemnmezLogo from 'monorepo/project/zemn.me/elements/ZemnmezLogo';
+import useHoverMenu from 'monorepo/project/zemn.me/hooks/useHoverMenu';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faBars } from '@fortawesome/free-solid-svg-icons';
 import React from 'react';
 import style from './NavBar.module.css';
 import classes from 'classnames';
 import { Link } from 'react-router-dom';
 import { useSpring, animated } from 'react-spring';
-import { isNotNull } from 'ts/guard';
+import { isNotNull } from 'monorepo/ts/guard';
 
 export const NavBarIcons: React.FC<
 	React.DetailedHTMLProps<

project/zemn.me/elements/TitlePage/TitlePage.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import style from './TitlePage.module.css';
 import classes from 'classnames';
-import TimeEye from 'project/zemn.me/elements/TimeEye';
+import TimeEye from 'monorepo/project/zemn.me/elements/TimeEye';
 
 export const Self: React.FC<
 	React.DetailedHTMLProps<

project/zemn.me/hooks/useClickedOff.ts

@@ -1,4 +1,4 @@
-import { walk, some } from 'ts/iter';
+import { walk, some } from 'monorepo/ts/iter';
 import React from 'react';
 
 /**

project/zemn.me/pages/art/logo.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import ZemnmezLogo from 'project/zemn.me/elements/ZemnmezLogo';
+import ZemnmezLogo from 'monorepo/project/zemn.me/elements/ZemnmezLogo';
 
 const rect = (
 	[x, y]: [number, number],

project/zemn.me/pages/pages.tsx

@@ -1,6 +1,6 @@
 import { Route, Outlet } from 'react-router-dom';
 import React from 'react';
-import Art from 'project/zemn.me/pages/art';
+import Art from 'monorepo/project/zemn.me/pages/art';
 
 export const Home: React.FC = () => <>Hello, world!</>;
 

project/zemn.me/root.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { BrowserRouter, Routes } from 'react-router-dom';
-import Pages from 'project/zemn.me/pages';
-import NavBar, { Hamburger } from 'project/zemn.me/elements/NavBar';
-import TitlePage from 'project/zemn.me/elements/TitlePage';
-import DarkModeSwitcher from 'project/zemn.me/elements/DarkModeSwitcher';
+import Pages from 'monorepo/project/zemn.me/pages';
+import NavBar, { Hamburger } from 'monorepo/project/zemn.me/elements/NavBar';
+import TitlePage from 'monorepo/project/zemn.me/elements/TitlePage';
+import DarkModeSwitcher from 'monorepo/project/zemn.me/elements/DarkModeSwitcher';
 
 // side-effects only.
 import './root.module.css';

ts/do-sync/testing/doSync_test.ts

@@ -1,4 +1,4 @@
-import { doSync, JSONObject } from 'ts/do-sync/npm_pkg';
+import { doSync, JSONObject } from 'monorepo/ts/do-sync/npm_pkg';
 import sharpT from 'sharp';
 
 const pixel =

ts/iter/iter_test.ts

@@ -1,4 +1,4 @@
-import * as iter from 'ts/iter';
+import * as iter from 'monorepo/ts/iter';
 
 describe('reduce', () => {
 	test('sum', () => {

ts/math/canvas/element.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import * as Homog from 'ts/math/homog';
+import * as Homog from 'monorepo/ts/math/homog';
 import * as Cnv from '.';
 
 export interface CanvasProps {

ts/math/canvas/index.ts

@@ -1,4 +1,4 @@
-import * as Homog from 'ts/math/homog';
+import * as Homog from 'monorepo/ts/math/homog';
 
 export type Drawable2D = LineDrawable2D;
 

ts/math/shape/index.ts

@@ -1,8 +1,8 @@
-import * as Homog from 'ts/math/homog';
-import * as Camera from 'ts/math/camera';
-import * as Matrix from 'ts/math/matrix';
-import * as Canvas from 'ts/math/canvas';
-import * as Quaternion from 'ts/math/quaternion';
+import * as Homog from 'monorepo/ts/math/homog';
+import * as Camera from 'monorepo/ts/math/camera';
+import * as Matrix from 'monorepo/ts/math/matrix';
+import * as Canvas from 'monorepo/ts/math/canvas';
+import * as Quaternion from 'monorepo/ts/math/quaternion';
 
 export class Square implements Canvas.Drawable2D {
 	public readonly r: number;

ts/math/shape/shape_test.tsx

@@ -4,7 +4,7 @@
 
 import { unmountComponentAtNode } from 'react-dom';
 import * as Shape from 'ts/math/shape';
-import { Canvas } from 'ts/math/canvas/element';
+import { Canvas } from 'monorepo/ts/math/canvas/element';
 import { act } from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
 import React from 'react';

ts/react/element/index.tsx

@@ -1,3 +1,3 @@
-import Link from 'ts/react/element/link';
+import Link from 'monorepo/ts/react/element/link';
 
 export { Link };

ts/react/element/link/index.tsx

@@ -1,4 +1,4 @@
-import * as Url from 'ts/url';
+import * as Url from 'monorepo/ts/url';
 import React from 'react';
 
 type AElement = React.ReactElement<

ts/react/element/link/link_test.tsx

@@ -2,7 +2,7 @@
 import { unmountComponentAtNode } from 'react-dom';
 import { Link } from '.';
 import { act } from 'react-dom/test-utils';
-import * as Url from 'ts/url';
+import * as Url from 'monorepo/ts/url';
 import ReactDOM from 'react-dom';
 import React from 'react';
 

ts/svg/index.tsx

@@ -1,4 +1,4 @@
-import * as vector from 'ts/math/vec';
+import * as vector from 'monorepo/ts/math/vec';
 import React from 'react';
 
 type PropsOf<T extends keyof JSX.IntrinsicElements> = JSX.IntrinsicElements[T];

ts/svg/scale.tsx

@@ -1,9 +1,9 @@
-import * as matrix from 'ts/math/matrix';
+import * as matrix from 'monorepo/ts/math/matrix';
 import React from 'react';
 import * as d3Scale from 'd3-scale';
 import * as svg from './index';
-import * as vec from 'ts/math/vec';
-import { isDefined as defined, must } from 'ts/guard';
+import * as vec from 'monorepo/ts/math/vec';
+import { isDefined as defined, must } from 'monorepo/ts/guard';
 
 export type Num = number | { valueOf(): number };
 

ts/testing/import_test/a.ts

@@ -1,4 +1,4 @@
-import * as b from 'ts/testing/import_test/b';
+import * as b from 'monorepo/ts/testing/import_test/b';
 
 const copy: string = b.MyString;
 

ts/testing/import_test/import_test.ts

@@ -1,4 +1,4 @@
-import * as a from 'ts/testing/import_test/a';
+import * as a from 'monorepo/ts/testing/import_test/a';
 
 test('import', () => {
 	expect(a.MyString).toEqual('Hello world!');

tsconfig.json

@@ -23,7 +23,7 @@
 		"baseUrl": "./",
 		"rootDirs": ["bazel-out/k8-fastbuild/bin"],
 		"paths": {
-			"*": ["./*", "bazel-out/k8-fastbuild/bin/*"]
+			"monorepo/*": ["./monorepo/*", "bazel-out/k8-fastbuild/bin/monorepo/*"]
 		}
 	},
 	"exclude": ["node_modules", "dist", "external"]