Renames tests, simplifies tsconfigs

packages/core/src/components/binding/binding.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { renderWithSvg } from '+test-utils'
+import { renderWithSvg } from '+test'
 import { Binding } from './binding'
 
 jest.spyOn(console, 'error').mockImplementation(() => void null)

packages/core/src/components/bounds/bounds.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { renderWithSvg } from '+test-utils'
+import { renderWithSvg } from '+test'
 import { Bounds } from './bounds'
 
 describe('bounds', () => {

packages/core/src/components/brush/brush.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { renderWithSvg } from '+test-utils'
+import { renderWithSvg } from '+test'
 import { Brush } from './brush'
 
 describe('brush', () => {

packages/core/src/components/canvas/canvas.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mockDocument, renderWithContext } from '+test-utils'
+import { mockDocument, renderWithContext } from '+test'
 import { Canvas } from './canvas'
 
 describe('page', () => {

packages/core/src/components/defs/defs.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { renderWithSvg } from '+test-utils'
+import { renderWithSvg } from '+test'
 import { Defs } from './defs'
 
 describe('defs', () => {

packages/core/src/components/error-fallback/error-fallback.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { renderWithContext } from '+test-utils'
+import { renderWithContext } from '+test'
 import { ErrorFallback } from './error-fallback'
 
 describe('error fallback', () => {

packages/core/src/components/handles/handles.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mockUtils, renderWithContext } from '+test-utils'
+import { mockUtils, renderWithContext } from '+test'
 import { Handles } from './handles'
 
 describe('handles', () => {

packages/core/src/components/page/page.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mockDocument, renderWithContext } from '+test-utils'
+import { mockDocument, renderWithContext } from '+test'
 import { Page } from './page'
 
 describe('page', () => {

packages/core/src/components/renderer/renderer.test.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react'
-import { mockDocument } from '+test-utils/mockDocument'
+import { mockDocument, mockUtils } from '+test'
-import { mockUtils } from '+test-utils/mockUtils'
 import { render } from '@testing-library/react'
 import { Renderer } from './renderer'
 

packages/core/src/components/shape-indicator/shape-indicator.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mockUtils, renderWithSvg } from '+test-utils'
+import { mockUtils, renderWithSvg } from '+test'
 import { ShapeIndicator } from './shape-indicator'
 
 describe('shape indicator', () => {

packages/core/src/components/shape/shape.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mockUtils, renderWithSvg } from '+test-utils'
+import { mockUtils, renderWithSvg } from '+test'
 import { Shape } from './shape'
 
 describe('handles', () => {

packages/core/tsconfig.build.json

@@ -1,22 +1,12 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "./tsconfig.json",
-  "include": ["src"],
   "exclude": [
     "node_modules",
     "**/*.test.tsx",
     "**/*.test.ts",
     "**/*.spec.tsx",
     "**/*.spec.ts",
-    "src/test-utils",
+    "src/test",
     "dist"
-  ],
+  ]
-  "compilerOptions": {
-    "declaration": true,
-    "rootDir": "src",
-    "outDir": "./dist/types",
-    "baseUrl": "src",
-    "paths": {
-      "+*": ["./*"]
-    }
-  }
 }

packages/tldraw/src/components/context-menu/context-menu.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { ContextMenu } from './context-menu'
-import { renderWithContext } from '~test-utils'
+import { renderWithContext } from '~test'
 
 describe('context menu', () => {
   test('mounts component', () => {

packages/tldraw/src/components/style-panel/style-panel.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { renderWithContext } from '~test-utils'
+import { renderWithContext } from '~test'
 import { StylePanel } from './style-panel'
 
 describe('style panel', () => {

packages/tldraw/src/components/tools-panel/tools-panel.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { ToolsPanel } from './tools-panel'
-import { renderWithContext } from '~test-utils'
+import { renderWithContext } from '~test'
 
 describe('tools panel', () => {
   test('mounts component', () => {

packages/tldraw/src/state/command/align/align.command.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { AlignType } from '~types'
 
 describe('Align command', () => {

packages/tldraw/src/state/command/create/create.command.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 
 describe('Create command', () => {
   const tlstate = new TLDrawState()

packages/tldraw/src/state/command/delete/delete.command.spec.ts

@@ -1,6 +1,6 @@
 import { TLDR } from '~state/tldr'
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import type { TLDrawShape } from '~types'
 
 describe('Delete command', () => {

packages/tldraw/src/state/command/distribute/distribute.command.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { DistributeType } from '~types'
 
 describe('Distribute command', () => {

packages/tldraw/src/state/command/duplicate/duplicate.command.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 
 describe('Duplicate command', () => {
   const tlstate = new TLDrawState()

packages/tldraw/src/state/command/flip/flip.command.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import type { RectangleShape } from '~types'
 
 describe('Stretch command', () => {

packages/tldraw/src/state/command/move/move.command.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { Utils } from '@tldraw/core'
 import type { Data } from '~types'
 

packages/tldraw/src/state/command/rotate/rotate.command.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 
 describe('Rotate command', () => {
   const tlstate = new TLDrawState()

packages/tldraw/src/state/command/stretch/stretch.command.spec.ts

@@ -1,6 +1,6 @@
 import { StretchType, RectangleShape } from '~types'
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 
 describe('Stretch command', () => {
   const tlstate = new TLDrawState()

packages/tldraw/src/state/command/style/style.command.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { SizeStyle } from '~types'
 
 describe('Style command', () => {

packages/tldraw/src/state/command/toggle-decoration/toggle-decoration.command.spec.ts

@@ -1,6 +1,6 @@
 import { TLDR } from '~state/tldr'
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { ArrowShape, Decoration, TLDrawShape } from '~types'
 
 describe('Handle command', () => {

packages/tldraw/src/state/command/toggle/toggle.command.spec.ts

@@ -1,6 +1,6 @@
 import type { RectangleShape } from '~types'
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 
 describe('Toggle command', () => {
   const tlstate = new TLDrawState()

packages/tldraw/src/state/command/translate/translate.command.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 
 describe('Translate command', () => {
   const tlstate = new TLDrawState()

packages/tldraw/src/state/session/sessions/arrow/arrow.session.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { TLDR } from '~state/tldr'
 import type { ArrowShape, TLDrawShape } from '~types'
 

packages/tldraw/src/state/session/sessions/brush/brush.session.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 
 describe('Brush session', () => {
   const tlstate = new TLDrawState()

packages/tldraw/src/state/session/sessions/draw/draw.session.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { ColorStyle, DashStyle, SizeStyle, TLDrawShapeType } from '~types'
 
 describe('Transform session', () => {

packages/tldraw/src/state/session/sessions/handle/handle.session.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { TLDR } from '~state/tldr'
 import type { TLDrawShape } from '~types'
 

packages/tldraw/src/state/session/sessions/rotate/rotate.session.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 
 describe('Brush session', () => {
   const tlstate = new TLDrawState()

packages/tldraw/src/state/session/sessions/text/text.session.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { TLDR } from '~state/tldr'
 import { TextShape, TLDrawShape, TLDrawShapeType } from '~types'
 

packages/tldraw/src/state/session/sessions/transform-single/transform-single.session.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { TLBoundsCorner } from '@tldraw/core'
 
 describe('Transform single session', () => {

packages/tldraw/src/state/session/sessions/transform/transform.session.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import { TLBoundsCorner, Utils } from '@tldraw/core'
 import { TLDR } from '~state/tldr'
 

packages/tldraw/src/state/session/sessions/translate/translate.session.spec.ts

@@ -1,6 +1,6 @@
 import { TLDR } from '~state/tldr'
 import { TLDrawState } from '~state'
-import { mockDocument } from '~test-utils'
+import { mockDocument } from '~test'
 import type { TLDrawShape } from '~types'
 
 describe('Brush session', () => {

packages/tldraw/src/state/tlstate.spec.ts

@@ -1,5 +1,5 @@
 import { TLDrawState } from './tlstate'
-import { mockDocument, TLStateUtils } from '~test-utils'
+import { mockDocument, TLStateUtils } from '~test'
 
 describe('TLDrawState', () => {
   const tlstate = new TLDrawState()

packages/tldraw/tsconfig.build.json

@@ -1,21 +1,12 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "./tsconfig.json",
-  "include": ["src"],
   "exclude": [
     "node_modules",
     "**/*.test.tsx",
     "**/*.test.ts",
     "**/*.spec.tsx",
     "**/*.spec.ts",
-    "src/test-utils",
+    "src/test",
     "dist"
-  ],
+  ]
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "./dist/types",
-    "baseUrl": "src",
-    "paths": {
-      "~*": ["./*"]
-    }
-  }
 }