Dependency updates. ESLint and import sort order style changes.

package.json

@@ -69,7 +69,7 @@
 		"yargs": "^17.7.2"
 	},
 	"devDependencies": {
-		"@kitschpatrol/shared-config": "^4.7.2",
+		"@kitschpatrol/shared-config": "^4.7.5",
 		"@sindresorhus/slugify": "^2.2.1",
 		"@tldraw/assets": "2.4.6",
 		"@types/express": "^4.17.21",

scripts/build-cli.ts

@@ -1,5 +1,5 @@
-import iifePlugin from './plugins/esbuild-plugin-iife'
 import esbuild from 'esbuild'
+import iifePlugin from './plugins/esbuild-plugin-iife'
 
 await esbuild.build({
 	bundle: true,

scripts/build-lib.ts

@@ -1,5 +1,5 @@
-import iifePlugin from './plugins/esbuild-plugin-iife'
 import esbuild from 'esbuild'
+import iifePlugin from './plugins/esbuild-plugin-iife'
 
 await esbuild.build({
 	bundle: true,

scripts/plugins/esbuild-plugin-iife.extensions.d.ts

@@ -1,4 +1,5 @@
 declare module '*?iife' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	const content: string
 	export default content
 }

src/cli/cli.ts

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
-import { version } from '../../package.json'
-import { type TldrawOpenOptions, type TldrawOpenResult, tldrawOpen } from '../lib/tldraw-open'
-import { type TldrawFormat, tldrawToImage } from '../lib/tldraw-to-image'
-import log from '../lib/utilities/log'
 import chalk from 'chalk'
 import plur from 'plur'
 import yargs from 'yargs'
 import { hideBin } from 'yargs/helpers'
+import { version } from '../../package.json'
+import { tldrawOpen, type TldrawOpenOptions, type TldrawOpenResult } from '../lib/tldraw-open'
+import { type TldrawFormat, tldrawToImage } from '../lib/tldraw-to-image'
+import log from '../lib/utilities/log'
 
 const yargsInstance = yargs(hideBin(process.argv))
 

src/lib/index.ts

@@ -1,4 +1,4 @@
-export { type TldrawOpenOptions, type TldrawOpenResult, tldrawOpen } from './tldraw-open'
-export { type TldrawFormat, type TldrawToImageOptions, tldrawToImage } from './tldraw-to-image'
+export { tldrawOpen, type TldrawOpenOptions, type TldrawOpenResult } from './tldraw-open'
+export { type TldrawFormat, tldrawToImage, type TldrawToImageOptions } from './tldraw-to-image'
 export { tldrawToShareUrl } from './tldraw-to-share-url'
 export { default as log } from './utilities/log'

src/lib/local-tldraw-server.ts

@@ -1,17 +1,15 @@
-import log from './utilities/log'
 import express from 'express'
 import getPort from 'get-port'
 import { type Server } from 'node:http'
 import { type AddressInfo } from 'node:net'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import log from './utilities/log'
 
 export default class LocalTldrawServer {
 	private server?: Server
 
-	constructor(private readonly tldrData?: string) {
-		this.tldrData = tldrData
-	}
+	constructor(private readonly tldrData?: string) {}
 
 	close(): void {
 		if (!this.server) throw new Error('Server not started')

src/lib/tldraw-controller.ts

@@ -1,17 +1,17 @@
 // Note special inline IIFE import, see ./plugins/esbuild-plugin-iife.ts
-import getImageInlineScript from './inline/get-image?iife'
-import getTldrInlineScript from './inline/get-tldr?iife'
-import setTldrInlineScript from './inline/set-tldr?iife'
-import type { TldrawToImageOptions } from './tldraw-to-image'
-import log from './utilities/log'
+import type { Browser, Page } from 'puppeteer'
 import slugify from '@sindresorhus/slugify'
 import * as cheerio from 'cheerio'
 import fs from 'node:fs/promises'
 import path from 'node:path'
 import puppeteer from 'puppeteer'
-import type { Browser, Page } from 'puppeteer'
 import { base64ToString, base64ToUint8Array, stringToBase64 } from 'uint8array-extras'
 import untildify from 'untildify'
+import type { TldrawToImageOptions } from './tldraw-to-image'
+import getImageInlineScript from './inline/get-image?iife'
+import getTldrInlineScript from './inline/get-tldr?iife'
+import setTldrInlineScript from './inline/set-tldr?iife'
+import log from './utilities/log'
 
 type TlPage = {
 	frames: TlFrame[]
@@ -32,9 +32,7 @@ export default class TldrawController {
 	private isEmpty?: boolean
 	private browser?: Browser
 
-	constructor(private readonly href: string) {
-		this.href = href
-	}
+	constructor(private readonly href: string) {}
 
 	private get isLocal(): boolean {
 		return this.href.startsWith('http://localhost')

src/lib/tldraw-open.ts

@@ -1,14 +1,14 @@
-import LocalTldrawServer from './local-tldraw-server'
-import { tldrawToImage } from './tldraw-to-image'
-import { tldrawToShareUrl } from './tldraw-to-share-url'
-import log from './utilities/log'
-import { validatePathOrUrl } from './validation'
 import { nanoid } from 'nanoid'
 import { type ChildProcess } from 'node:child_process'
 import fs from 'node:fs/promises'
 import os from 'node:os'
 import { URL } from 'node:url'
 import open from 'open'
+import LocalTldrawServer from './local-tldraw-server'
+import { tldrawToImage } from './tldraw-to-image'
+import { tldrawToShareUrl } from './tldraw-to-share-url'
+import log from './utilities/log'
+import { validatePathOrUrl } from './validation'
 
 const tldrawOpenDefaultOptions = {
 	location: 'remote',

src/lib/tldraw-to-image.ts

@@ -1,10 +1,10 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import prettyMilliseconds from 'pretty-ms'
 import LocalTldrawServer from './local-tldraw-server'
 import TldrawController from './tldraw-controller'
 import log from './utilities/log'
 import { validatePathOrUrl } from './validation'
-import fs from 'node:fs/promises'
-import path from 'node:path'
-import prettyMilliseconds from 'pretty-ms'
 
 // Essentially TLExportType + 'tldr'
 

src/lib/utilities/log.ts

@@ -5,6 +5,7 @@ import chalk from 'chalk'
 
 const isNode = process?.versions?.node !== undefined
 
+// eslint-disable-next-line @typescript-eslint/naming-convention
 const log = {
 	verbose: false,
 

src/lib/validation.ts

@@ -10,7 +10,7 @@ export function validatePathOrUrl(
 		validFileExtensions?: string[]
 		validHostnames?: string[]
 	} = {},
-): URL | string {
+): string | URL {
 	const { requireFileExistence, validFileExtensions, validHostnames } = options
 
 	if (URL.canParse(pathOrUrl)) {

src/tldraw/app.tsx

@@ -1,8 +1,8 @@
-import './index.css'
 /* eslint-disable @typescript-eslint/naming-convention */
 import { getAssetUrls } from '@tldraw/assets/selfHosted'
 import { useState } from 'react'
-import { type Editor, type TLStore, Tldraw, parseTldrawJsonFile } from 'tldraw'
+import { type Editor, parseTldrawJsonFile, Tldraw, type TLStore } from 'tldraw'
+import './index.css'
 
 // Can't get this to work
 // import { getAssetUrlsByImport } from '@tldraw/assets/imports'
@@ -50,7 +50,7 @@ export default function App() {
 						console.error(`Couldn't parse tldr file: ${String(parseFileResult.error.type)}`)
 					}
 				})
-				.catch((error) => {
+				.catch((error: unknown) => {
 					console.error("Couldn't fetch data:", error)
 				})
 		} else {

src/tldraw/main.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import App from './app.tsx'
 import React from 'react'
 import ReactDOM from 'react-dom/client'
+import App from './app.tsx'
 
 ReactDOM.createRoot(document.querySelector('#root')!).render(
 	<React.StrictMode>

test/api-stability.test.ts

@@ -1,7 +1,7 @@
-import { tldrawToImage, tldrawToShareUrl } from '../dist/lib'
-import { expectFileToExist } from './utilities/file'
 import fs from 'node:fs/promises'
 import { describe, expect, it, vi } from 'vitest'
+import { tldrawToImage, tldrawToShareUrl } from '../dist/lib'
+import { expectFileToExist } from './utilities/file'
 
 const cleanUp = true
 

test/tldr-to-image.test.ts

@@ -1,14 +1,14 @@
 // Note this tests the dist build, because of the IIFE inlining from esbuild
-import { log, tldrawToImage } from '../dist/lib'
-import { expectFileToBeValid, getStyleElementCount } from './utilities/file'
-import { expectSingleLine } from './utilities/string'
 import { nanoid } from 'nanoid'
 import { mkdirSync, rmSync } from 'node:fs'
 import fs from 'node:fs/promises'
 import os from 'node:os'
 import path from 'node:path'
 import stripAnsi from 'strip-ansi'
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
+import { log, tldrawToImage } from '../dist/lib'
+import { expectFileToBeValid, getStyleElementCount } from './utilities/file'
+import { expectSingleLine } from './utilities/string'
 
 const cleanUp = true
 const tldrTestFilePath = './test/assets/valid/2024-01-test-sketch-basic.tldr'

test/url-to-image.test.ts

@@ -1,9 +1,9 @@
 // Note this tests the dist build, because of the iife inlining from esbuild
-import { tldrawToImage } from '../dist/lib'
-import { expectFileToBeValid } from './utilities/file'
 import { nanoid } from 'nanoid'
 import { mkdirSync, rmSync } from 'node:fs'
 import { expect, it } from 'vitest'
+import { tldrawToImage } from '../dist/lib'
+import { expectFileToBeValid } from './utilities/file'
 
 const cleanUp = true
 const tldrawTestUrl = 'https://www.tldraw.com/s/v2_c_9nMYBwT8UQ99RGDWfGr8H'

test/validation.test.ts

@@ -1,6 +1,6 @@
 // Note this tests the src implementation, because it's not exported
-import { validatePathOrUrl } from '../src/lib/validation'
 import { expect, it } from 'vitest'
+import { validatePathOrUrl } from '../src/lib/validation'
 
 const validationOptions = {
 	requireFileExistence: true,