From a012e1f0ec95238e4ce953e263925fb07b7ded80 Mon Sep 17 00:00:00 2001 From: Candid Dauth Date: Sat, 23 Dec 2023 21:23:51 +0100 Subject: [PATCH] Attempt to use TypeScript project references --- .gitignore | 4 +- Dockerfile | 4 +- client/tsconfig.json | 13 +- client/tsconfig.node.json | 10 + frontend/build.d.ts | 14 - frontend/build.js | 24 - frontend/build.ts | 24 + frontend/package.json | 9 +- frontend/src/lib/components/about-dialog.vue | 3 +- frontend/src/lib/index.ts | 2 +- frontend/src/shims.d.ts | 4 +- frontend/tsconfig.json | 19 +- frontend/tsconfig.node.json | 12 + frontend/vite-define.ts | 13 + frontend/vite-lib.config.ts | 10 +- frontend/vite.config.ts | 12 +- leaflet/package.json | 6 +- leaflet/src/index.ts | 8 +- leaflet/tsconfig.json | 17 +- leaflet/tsconfig.node.json | 12 + leaflet/vite.config.ts | 2 + package.json | 5 + server/esrun.js | 19 - server/package.json | 13 +- server/{esrun-server.ts => server.ts} | 0 server/src/frontend.ts | 9 +- server/tsconfig.json | 20 +- server/vite.config.ts | 11 +- tsconfig.base.json | 11 + tsconfig.json | 15 +- types/package.json | 2 +- types/tsconfig.json | 10 +- types/tsconfig.node.json | 10 + utils/package.json | 2 +- utils/tsconfig.json | 13 +- utils/tsconfig.node.json | 10 + yarn.lock | 572 ++++++++----------- 37 files changed, 505 insertions(+), 439 deletions(-) create mode 100644 client/tsconfig.node.json delete mode 100644 frontend/build.d.ts delete mode 100644 frontend/build.js create mode 100644 frontend/build.ts create mode 100644 frontend/tsconfig.node.json create mode 100644 frontend/vite-define.ts create mode 100644 leaflet/tsconfig.node.json delete mode 100644 server/esrun.js rename server/{esrun-server.ts => server.ts} (100%) create mode 100644 tsconfig.base.json create mode 100644 types/tsconfig.node.json create mode 100644 utils/tsconfig.node.json diff --git a/.gitignore b/.gitignore index 3843f53e..57696813 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,6 @@ config.env !.yarn/plugins !.yarn/releases !.yarn/sdks -!.yarn/versions \ No newline at end of file +!.yarn/versions +out +out.node \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index c30dec8f..fda9f8a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:21-alpine MAINTAINER Candid Dauth -CMD yarn run server +CMD yarn run prod-server EXPOSE 8080 ENV CACHE_DIR=/opt/facilmap/cache @@ -19,7 +19,7 @@ USER facilmap RUN cd .. && yarn install -RUN cd .. && yarn run build +RUN cd .. && yarn run build:frontend:app && yarn run build:server USER root RUN chown -R root:root /opt/facilmap && mkdir -p "$CACHE_DIR" && chown -R facilmap:facilmap "$CACHE_DIR" diff --git a/client/tsconfig.json b/client/tsconfig.json index 86537a14..1dcd74a7 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -1,4 +1,15 @@ { - "extends": "../tsconfig.json", + "extends": "../tsconfig.base.json", + "compilerOptions": { + "outDir": "./out", + "composite": true, + "paths": { + "facilmap-types": ["../types/src/index.ts"] + } + }, + "references": [ + { "path": "./tsconfig.node.json" }, + { "path": "../types/tsconfig.json" } + ], "include": ["src/**/*"] } \ No newline at end of file diff --git a/client/tsconfig.node.json b/client/tsconfig.node.json new file mode 100644 index 00000000..b547d0a4 --- /dev/null +++ b/client/tsconfig.node.json @@ -0,0 +1,10 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "out.node" + }, + "include": [ + "vite.config.ts" + ] +} \ No newline at end of file diff --git a/frontend/build.d.ts b/frontend/build.d.ts deleted file mode 100644 index b9fe8bcf..00000000 --- a/frontend/build.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { InlineConfig, ViteDevServer } from "vite"; - -export const paths: { - root: string; - dist: string; - base: string; - mapEntry: string; - mapEjs: string; - tableEntry: string; - tableEjs: string; - manifest: string; -}; - -export function serve(inlineConfig?: InlineConfig): Promise; diff --git a/frontend/build.js b/frontend/build.js deleted file mode 100644 index c7e444b6..00000000 --- a/frontend/build.js +++ /dev/null @@ -1,24 +0,0 @@ -import { createServer } from "vite"; -import { dirname } from "path"; -import { fileURLToPath } from "url"; - -const root = dirname(fileURLToPath(import.meta.url)); -const dist = `${root}/dist/app`; - -export const paths = { - root, - dist, - base: '/_app/', - mapEntry: "src/map/map.ts", - mapEjs: `${root}/src/map/map.ejs`, - tableEntry: "src/table/table.ts", - tableEjs: `${root}/src/table/table.ejs`, - manifest: `${dist}/manifest.json`, -}; - -export async function serve(inlineConfig = {}) { - return await createServer({ - root, - ...inlineConfig - }); -} \ No newline at end of file diff --git a/frontend/build.ts b/frontend/build.ts new file mode 100644 index 00000000..a15b12db --- /dev/null +++ b/frontend/build.ts @@ -0,0 +1,24 @@ +import { createServer, type InlineConfig, type ViteDevServer } from "vite"; +import { dirname } from "path"; +import { fileURLToPath } from "url"; + +const root = dirname(fileURLToPath(import.meta.url)); +const dist = `${root}/dist/app`; + +export const paths = { + root, + dist, + base: '/_app/', + mapEntry: "src/map/map.ts", + mapEjs: `${root}/src/map/map.ejs`, + tableEntry: "src/table/table.ts", + tableEjs: `${root}/src/table/table.ejs`, + manifest: `${dist}/manifest.json`, +}; + +export async function serve(inlineConfig: InlineConfig = {}): Promise { + return await createServer({ + root, + ...inlineConfig + }); +} \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index 7285d340..1e238363 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -33,12 +33,12 @@ "scripts": { "build": "yarn build:lib && yarn build:app", "build:lib": "vite --config vite-lib.config.ts build", - "build:app": "vite build", + "build:app": "NODE_OPTIONS='--import tsx' vite build", "clean": "rimraf dist", - "dev-server": "vite", + "dev-server": "NODE_OPTIONS='--import tsx' vite", "test": "vitest run", "test-watch": "vitest", - "check-types": "vue-tsc --noEmit" + "check-types": "vue-tsc -b --emitDeclarationOnly" }, "dependencies": { "@ckpack/vue-color": "^1.5.0", @@ -90,8 +90,9 @@ "rimraf": "^5.0.5", "sass": "^1.69.5", "svgo": "^3.0.3", - "ts-node": "^10.9.1", + "tsx": "^4.7.0", "typescript": "^5.2.2", + "vite-tsconfig-paths": "^4.2.2", "vitest": "^0.34.6", "vue-tsc": "^1.8.22" } diff --git a/frontend/src/lib/components/about-dialog.vue b/frontend/src/lib/components/about-dialog.vue index 4bc20f3d..e791ecd3 100644 --- a/frontend/src/lib/components/about-dialog.vue +++ b/frontend/src/lib/components/about-dialog.vue @@ -1,5 +1,4 @@ diff --git a/frontend/src/lib/index.ts b/frontend/src/lib/index.ts index 54b96f38..01f26576 100644 --- a/frontend/src/lib/index.ts +++ b/frontend/src/lib/index.ts @@ -1,5 +1,5 @@ import "./styles.scss"; -import "./bootstrap.ts"; +import "./bootstrap"; import { registerDeobfuscationHandlers } from "../utils/obfuscate"; diff --git a/frontend/src/shims.d.ts b/frontend/src/shims.d.ts index 29971a74..f5c025f2 100644 --- a/frontend/src/shims.d.ts +++ b/frontend/src/shims.d.ts @@ -9,4 +9,6 @@ declare module "@tmcw/togeojson" { export const gpx: any; export const kml: any; export const tcx: any; -} \ No newline at end of file +} + +declare const __FM_VERSION__: string; diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 8127958c..a1b4f18e 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -1,7 +1,22 @@ { - "extends": "../tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { - "resolveJsonModule": true + "outDir": "./out", + "composite": true, + "paths": { + "facilmap-client": ["../client/src/client.ts"], + "facilmap-leaflet": ["../leaflet/src/index.ts"], + "facilmap-types": ["../types/src/index.ts"], + "facilmap-utils": ["../utils/src/index.ts"] + } }, + "references": [ + { "path": "./tsconfig.node.json" }, + { "path": "../client/tsconfig.json" }, + { "path": "../leaflet/tsconfig.json" }, + { "path": "../types/tsconfig.json" }, + { "path": "../utils/tsconfig.json" }, + { "path": "../tsconfig.json" } + ], "include": ["src/**/*"] } \ No newline at end of file diff --git a/frontend/tsconfig.node.json b/frontend/tsconfig.node.json new file mode 100644 index 00000000..abac254c --- /dev/null +++ b/frontend/tsconfig.node.json @@ -0,0 +1,12 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "out.node" + }, + "include": [ + "vite.config.ts", + "vite-define.ts", + "build.ts" + ] +} \ No newline at end of file diff --git a/frontend/vite-define.ts b/frontend/vite-define.ts new file mode 100644 index 00000000..7f7c75d0 --- /dev/null +++ b/frontend/vite-define.ts @@ -0,0 +1,13 @@ +import type { Plugin } from "vite"; +import { readFile } from "fs/promises"; + +export default function definePlugin(): Plugin { + return { + name: "FacilMap define", + config: async (config) => { + const packageJson = JSON.parse(await readFile(new URL("./package.json", import.meta.url), "utf8")); + config.define = config.define ?? {}; + config.define["__FM_VERSION__"] = JSON.stringify(packageJson.version); + } + }; +} \ No newline at end of file diff --git a/frontend/vite-lib.config.ts b/frontend/vite-lib.config.ts index 9678555c..446f8225 100644 --- a/frontend/vite-lib.config.ts +++ b/frontend/vite-lib.config.ts @@ -1,13 +1,17 @@ import { defineConfig } from "vite"; -//import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js"; +import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js"; import dtsPlugin from "vite-plugin-dts"; import vuePlugin from "@vitejs/plugin-vue"; +import tsconfigPaths from "vite-tsconfig-paths"; +import definePlugin from "./vite-define"; export default defineConfig(({ mode }) => ({ plugins: [ - //cssInjectedByJsPlugin(), + cssInjectedByJsPlugin(), dtsPlugin({ rollupTypes: true }), - vuePlugin() + vuePlugin(), + tsconfigPaths(), + definePlugin() ], build: { outDir: "./dist/lib", diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index c2c86e28..5068a193 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -1,12 +1,20 @@ +/// + import { defineConfig } from "vite"; import { fileURLToPath } from "url"; -import { paths } from "./build.js"; +import { paths } from "./build"; import vuePlugin from "@vitejs/plugin-vue"; +import tsconfigPaths from "vite-tsconfig-paths"; +import iconsPlugin from "facilmap-leaflet/rollup-icons"; +import definePlugin from "./vite-define"; export default defineConfig({ base: paths.base, plugins: [ - vuePlugin() + vuePlugin(), + tsconfigPaths({ loose: true }), + iconsPlugin(), + definePlugin() ], assetsInclude: [ "**/*.ejs" diff --git a/leaflet/package.json b/leaflet/package.json index 6e585a4b..16b6908b 100644 --- a/leaflet/package.json +++ b/leaflet/package.json @@ -35,8 +35,8 @@ "build": "vite build", "clean": "rimraf dist", "dev-server": "vite", - "download-icons": "ts-node ./download-icons.ts", - "check-types": "tsc --noEmit", + "download-icons": "tsx ./download-icons.ts", + "check-types": "tsc -b --emitDeclarationOnly", "lint": "eslint **/*.ts", "test": "vitest run", "test-watch": "vitest" @@ -71,7 +71,7 @@ "rimraf": "^5.0.5", "rollup": "3", "svgo": "^3.0.3", - "ts-node": "^10.9.1", + "tsx": "^4.7.0", "typescript": "^5.2.2", "vite": "^4.5.0", "vite-plugin-css-injected-by-js": "^3.3.0", diff --git a/leaflet/src/index.ts b/leaflet/src/index.ts index a09f2464..9e592859 100644 --- a/leaflet/src/index.ts +++ b/leaflet/src/index.ts @@ -22,10 +22,4 @@ export * from "./views/hash"; export * from "./views/initialView"; export * from "./views/views"; -declare module "leaflet" { - export interface Map { - fmFilter: string | undefined; - - setFmFilter(filter?: string): void; - } -} \ No newline at end of file +import "./type-extensions"; \ No newline at end of file diff --git a/leaflet/tsconfig.json b/leaflet/tsconfig.json index 86537a14..31722849 100644 --- a/leaflet/tsconfig.json +++ b/leaflet/tsconfig.json @@ -1,4 +1,19 @@ { - "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "./out", + "composite": true, + "paths": { + "facilmap-client": ["../client/src/client.ts"], + "facilmap-types": ["../types/src/index.ts"], + "facilmap-utils": ["../utils/src/index.ts"] + } + }, + "extends": "../tsconfig.base.json", + "references": [ + { "path": "./tsconfig.node.json" }, + { "path": "../client/tsconfig.json" }, + { "path": "../types/tsconfig.json" }, + { "path": "../utils/tsconfig.json" } + ], "include": ["src/**/*"] } \ No newline at end of file diff --git a/leaflet/tsconfig.node.json b/leaflet/tsconfig.node.json new file mode 100644 index 00000000..71a7b2fb --- /dev/null +++ b/leaflet/tsconfig.node.json @@ -0,0 +1,12 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "out.node" + }, + "include": [ + "vite.config.ts", + "rollup-icons.ts", + "download-icons.ts" + ] +} \ No newline at end of file diff --git a/leaflet/vite.config.ts b/leaflet/vite.config.ts index 33313570..28f06085 100644 --- a/leaflet/vite.config.ts +++ b/leaflet/vite.config.ts @@ -1,3 +1,5 @@ +/// + import { defineConfig } from "vite"; import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js"; import dtsPlugin from "vite-plugin-dts"; diff --git a/package.json b/package.json index a4a7745e..e8cdcea1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,11 @@ "lint": "eslint **/*.ts", "clean": "yarn workspaces foreach -v run clean", "build": "yarn workspaces foreach -vt run build", + "build:frontend:app": "yarn workspace facilmap-frontend run build:app", + "build:server": "yarn workspace facilmap-server run build", + "prod-server": "yarn workspace facilmap-server run prod-server", + "server": "yarn workspace facilmap-server run server", + "dev-server": "yarn workspace facilmap-server run dev-server", "check-types": "yarn workspaces foreach -vt run check-types" }, "devDependencies": { diff --git a/server/esrun.js b/server/esrun.js deleted file mode 100644 index 9e1ff837..00000000 --- a/server/esrun.js +++ /dev/null @@ -1,19 +0,0 @@ -import { esrun } from "@digitak/esrun"; - -// esbuild --bundle --platform=node --packages=external --format=esm src/server.ts --loader:.ejs=text --sourcemap=inline --outfile=dist/facilmap-server.mjs - -await esrun("./esrun-server.ts", { - esbuildOptions: { - loader: { - ".ejs": "text" - }, - packages: "external", - sourceRoot: `${process.cwd()}/`, // https://github.com/digital-loukoum/esrun/issues/41 - // sourcemap: false, - }, - sendCodeMode: "temporaryFile", - // Uncomment this to inspect the temporary file: - // afterRun: () => { - // process.exit(); - // } -}); diff --git a/server/package.json b/server/package.json index 2ab17403..ceda2b98 100644 --- a/server/package.json +++ b/server/package.json @@ -27,12 +27,12 @@ "scripts": { "build": "vite build", "clean": "rimraf dist", - "server": "DOTENV_CONFIG_PATH=../config.env node ./bin/facilmap-server.js", - "ts-server": "DOTENV_CONFIG_PATH=../config.env node ./esrun.js", - "dev-server": "FM_DEV=true DOTENV_CONFIG_PATH=../config.env node ./esrun.js", + "prod-server": "DOTENV_CONFIG_PATH=../config.env node ./bin/facilmap-server.js", + "server": "DOTENV_CONFIG_PATH=../config.env NODE_OPTIONS='--import tsx' vite-node ./server.ts", + "dev-server": "FM_DEV=true DOTENV_CONFIG_PATH=../config.env NODE_OPTIONS='--import tsx' vite-node ./server.ts", "test": "vitest run", "test-watch": "vitest", - "check-types": "tsc --noEmit", + "check-types": "tsc -b --emitDeclarationOnly", "lint": "eslint src/**/*.ts" }, "main": "./dist/facilmap-server.mjs", @@ -66,7 +66,6 @@ "unzipper": "^0.10.14" }, "devDependencies": { - "@digitak/esrun": "^3.2.25", "@types/cheerio": "^0.22.34", "@types/compression": "^1.7.5", "@types/debug": "^4.1.12", @@ -82,10 +81,12 @@ "debug": "^4.3.4", "pg": "^8.11.3", "rimraf": "^5.0.5", - "ts-node": "^10.9.1", + "tsx": "^4.7.0", "typescript": "^5.2.2", "vite": "^4.5.0", + "vite-node": "^1.1.0", "vite-plugin-dts": "^3.6.3", + "vite-tsconfig-paths": "^4.2.2", "vitest": "^0.34.6" } } diff --git a/server/esrun-server.ts b/server/server.ts similarity index 100% rename from server/esrun-server.ts rename to server/server.ts diff --git a/server/src/frontend.ts b/server/src/frontend.ts index 1d51aa02..123a2429 100644 --- a/server/src/frontend.ts +++ b/server/src/frontend.ts @@ -1,5 +1,5 @@ import type { Manifest } from "vite"; -import { paths, serve } from "facilmap-frontend/build.js"; +import { paths, serve } from "facilmap-frontend/build"; import { readFile } from "node:fs/promises"; import type { ID, Line, Marker, PadData, Type } from "facilmap-types"; import * as ejs from "ejs"; @@ -104,12 +104,7 @@ export async function getStaticFrontendMiddleware(): Promise { if (isDevMode) { const devServer = await serve({ server: { - middlewareMode: true, - /* hmr: { - protocol: 'ws', - host: '127.0.0.1' - } */ - //origin: "http://localhost:40829" + middlewareMode: true }, appType: "custom" }); diff --git a/server/tsconfig.json b/server/tsconfig.json index 86537a14..ac8b52c5 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -1,4 +1,20 @@ { - "extends": "../tsconfig.json", - "include": ["src/**/*"] + "extends": "../tsconfig.base.json", + "compilerOptions": { + "outDir": "./out", + "composite": true, + "paths": { + "facilmap-types": ["../types/src/index.ts"], + "facilmap-utils": ["../utils/src/index.ts"] + } + }, + "references": [ + { "path": "../types/tsconfig.json" }, + { "path": "../utils/tsconfig.json" } + ], + "include": [ + "src/**/*", + "vite.config.ts", + "server.ts" + ] } \ No newline at end of file diff --git a/server/vite.config.ts b/server/vite.config.ts index 2589aac5..1e132b48 100644 --- a/server/vite.config.ts +++ b/server/vite.config.ts @@ -1,9 +1,11 @@ import { defineConfig } from "vite"; import dtsPlugin from "vite-plugin-dts"; +import tsconfigPaths from "vite-tsconfig-paths"; export default defineConfig({ plugins: [ - dtsPlugin({ rollupTypes: true }) + dtsPlugin({ rollupTypes: true }), + tsconfigPaths({ loose: true }) ], build: { sourcemap: false, @@ -16,7 +18,12 @@ export default defineConfig({ formats: ['es'] }, rollupOptions: { - external: (id) => !id.startsWith("./") && !id.startsWith("../") && /* resolved internal modules */ !id.startsWith("/") + external: (id) => ( + !id.startsWith("./") + && !id.startsWith("../") + && /* resolved internal modules */ !id.startsWith("/") + && !id.startsWith("facilmap-") + ) } } }); diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 00000000..2e79d0b4 --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "target": "esnext", + "module": "esnext", + "esModuleInterop": true, + "strict": true, + "moduleResolution": "node", + "skipLibCheck": true, + "verbatimModuleSyntax": true + } +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 2e79d0b4..9cb925a3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,10 @@ { + "extends": "./tsconfig.base.json", "compilerOptions": { - "target": "esnext", - "module": "esnext", - "esModuleInterop": true, - "strict": true, - "moduleResolution": "node", - "skipLibCheck": true, - "verbatimModuleSyntax": true - } + "outDir": "./out", + "composite": true + }, + "references": [ + ], + "include": ["package.json"] } \ No newline at end of file diff --git a/types/package.json b/types/package.json index 9f1d1d36..be0af910 100644 --- a/types/package.json +++ b/types/package.json @@ -19,7 +19,7 @@ "build": "vite build", "watch": "vite build --watch", "clean": "rimraf dist", - "check-types": "tsc --noEmit" + "check-types": "tsc -b --emitDeclarationOnly" }, "files": [ "dist", diff --git a/types/tsconfig.json b/types/tsconfig.json index 980f59fa..a0452f87 100644 --- a/types/tsconfig.json +++ b/types/tsconfig.json @@ -1,3 +1,11 @@ { - "extends": "../tsconfig.json" + "extends": "../tsconfig.base.json", + "compilerOptions": { + "outDir": "./out", + "composite": true + }, + "references": [ + { "path": "./tsconfig.node.json" } + ], + "include": ["src/**/*"] } \ No newline at end of file diff --git a/types/tsconfig.node.json b/types/tsconfig.node.json new file mode 100644 index 00000000..b547d0a4 --- /dev/null +++ b/types/tsconfig.node.json @@ -0,0 +1,10 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "out.node" + }, + "include": [ + "vite.config.ts" + ] +} \ No newline at end of file diff --git a/utils/package.json b/utils/package.json index a24a1a1b..b2f9fe38 100644 --- a/utils/package.json +++ b/utils/package.json @@ -22,7 +22,7 @@ "build": "vite build", "watch": "vite build --watch", "clean": "rimraf dist", - "check-types": "tsc --noEmit", + "check-types": "tsc -b --emitDeclarationOnly", "test": "vitest run", "test-watch": "vitest" }, diff --git a/utils/tsconfig.json b/utils/tsconfig.json index 86537a14..1dcd74a7 100644 --- a/utils/tsconfig.json +++ b/utils/tsconfig.json @@ -1,4 +1,15 @@ { - "extends": "../tsconfig.json", + "extends": "../tsconfig.base.json", + "compilerOptions": { + "outDir": "./out", + "composite": true, + "paths": { + "facilmap-types": ["../types/src/index.ts"] + } + }, + "references": [ + { "path": "./tsconfig.node.json" }, + { "path": "../types/tsconfig.json" } + ], "include": ["src/**/*"] } \ No newline at end of file diff --git a/utils/tsconfig.node.json b/utils/tsconfig.node.json new file mode 100644 index 00000000..b547d0a4 --- /dev/null +++ b/utils/tsconfig.node.json @@ -0,0 +1,10 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "out.node" + }, + "include": [ + "vite.config.ts" + ] +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 172e4182..cdf8ed1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,15 +58,6 @@ __metadata: languageName: node linkType: hard -"@cspotcode/source-map-support@npm:^0.8.0": - version: 0.8.1 - resolution: "@cspotcode/source-map-support@npm:0.8.1" - dependencies: - "@jridgewell/trace-mapping": 0.3.9 - checksum: 5718f267085ed8edb3e7ef210137241775e607ee18b77d95aa5bd7514f47f5019aa2d82d96b3bf342ef7aa890a346fa1044532ff7cc3009e7d24fce3ce6200fa - languageName: node - linkType: hard - "@ctrl/tinycolor@npm:^3.6.0": version: 3.6.1 resolution: "@ctrl/tinycolor@npm:3.6.1" @@ -74,30 +65,10 @@ __metadata: languageName: node linkType: hard -"@digitak/esrun@npm:^3.2.25": - version: 3.2.25 - resolution: "@digitak/esrun@npm:3.2.25" - dependencies: - "@digitak/grubber": ^3.1.4 - chokidar: ^3.5.1 - esbuild: ^0.17.4 - bin: - esrun: bin.js - checksum: a72556cb36cfff366a855928297f164528fc6f7601cc7bc5102811aaab83c8fcee170f291b14b872f53e9578bd0e29c2d45153d9ecc80ff7e3bf7a97f13d6326 - languageName: node - linkType: hard - -"@digitak/grubber@npm:^3.1.4": - version: 3.1.4 - resolution: "@digitak/grubber@npm:3.1.4" - checksum: 3f21842968b601773b569c3c10aebca82cb62376248170b22c6194c3ab5a3cdbb4530947eae99cbfe87127ceffa9733d29cc60adf59d21af5e359259ee886448 - languageName: node - linkType: hard - -"@esbuild/android-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/android-arm64@npm:0.17.19" - conditions: os=android & cpu=arm64 +"@esbuild/aix-ppc64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/aix-ppc64@npm:0.19.10" + conditions: os=aix & cpu=ppc64 languageName: node linkType: hard @@ -108,10 +79,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/android-arm@npm:0.17.19" - conditions: os=android & cpu=arm +"@esbuild/android-arm64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/android-arm64@npm:0.19.10" + conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -122,10 +93,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/android-x64@npm:0.17.19" - conditions: os=android & cpu=x64 +"@esbuild/android-arm@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/android-arm@npm:0.19.10" + conditions: os=android & cpu=arm languageName: node linkType: hard @@ -136,10 +107,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/darwin-arm64@npm:0.17.19" - conditions: os=darwin & cpu=arm64 +"@esbuild/android-x64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/android-x64@npm:0.19.10" + conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -150,10 +121,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/darwin-x64@npm:0.17.19" - conditions: os=darwin & cpu=x64 +"@esbuild/darwin-arm64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/darwin-arm64@npm:0.19.10" + conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -164,10 +135,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/freebsd-arm64@npm:0.17.19" - conditions: os=freebsd & cpu=arm64 +"@esbuild/darwin-x64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/darwin-x64@npm:0.19.10" + conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -178,10 +149,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/freebsd-x64@npm:0.17.19" - conditions: os=freebsd & cpu=x64 +"@esbuild/freebsd-arm64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/freebsd-arm64@npm:0.19.10" + conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -192,10 +163,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-arm64@npm:0.17.19" - conditions: os=linux & cpu=arm64 +"@esbuild/freebsd-x64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/freebsd-x64@npm:0.19.10" + conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -206,10 +177,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-arm@npm:0.17.19" - conditions: os=linux & cpu=arm +"@esbuild/linux-arm64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/linux-arm64@npm:0.19.10" + conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -220,10 +191,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-ia32@npm:0.17.19" - conditions: os=linux & cpu=ia32 +"@esbuild/linux-arm@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/linux-arm@npm:0.19.10" + conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -234,10 +205,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-loong64@npm:0.17.19" - conditions: os=linux & cpu=loong64 +"@esbuild/linux-ia32@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/linux-ia32@npm:0.19.10" + conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -248,10 +219,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-mips64el@npm:0.17.19" - conditions: os=linux & cpu=mips64el +"@esbuild/linux-loong64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/linux-loong64@npm:0.19.10" + conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -262,10 +233,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-ppc64@npm:0.17.19" - conditions: os=linux & cpu=ppc64 +"@esbuild/linux-mips64el@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/linux-mips64el@npm:0.19.10" + conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -276,10 +247,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-riscv64@npm:0.17.19" - conditions: os=linux & cpu=riscv64 +"@esbuild/linux-ppc64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/linux-ppc64@npm:0.19.10" + conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -290,10 +261,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-s390x@npm:0.17.19" - conditions: os=linux & cpu=s390x +"@esbuild/linux-riscv64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/linux-riscv64@npm:0.19.10" + conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -304,10 +275,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-x64@npm:0.17.19" - conditions: os=linux & cpu=x64 +"@esbuild/linux-s390x@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/linux-s390x@npm:0.19.10" + conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -318,10 +289,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/netbsd-x64@npm:0.17.19" - conditions: os=netbsd & cpu=x64 +"@esbuild/linux-x64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/linux-x64@npm:0.19.10" + conditions: os=linux & cpu=x64 languageName: node linkType: hard @@ -332,10 +303,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/openbsd-x64@npm:0.17.19" - conditions: os=openbsd & cpu=x64 +"@esbuild/netbsd-x64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/netbsd-x64@npm:0.19.10" + conditions: os=netbsd & cpu=x64 languageName: node linkType: hard @@ -346,10 +317,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/sunos-x64@npm:0.17.19" - conditions: os=sunos & cpu=x64 +"@esbuild/openbsd-x64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/openbsd-x64@npm:0.19.10" + conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -360,10 +331,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/win32-arm64@npm:0.17.19" - conditions: os=win32 & cpu=arm64 +"@esbuild/sunos-x64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/sunos-x64@npm:0.19.10" + conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -374,10 +345,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/win32-ia32@npm:0.17.19" - conditions: os=win32 & cpu=ia32 +"@esbuild/win32-arm64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/win32-arm64@npm:0.19.10" + conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -388,10 +359,10 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/win32-x64@npm:0.17.19" - conditions: os=win32 & cpu=x64 +"@esbuild/win32-ia32@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/win32-ia32@npm:0.19.10" + conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -402,6 +373,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-x64@npm:0.19.10": + version: 0.19.10 + resolution: "@esbuild/win32-x64@npm:0.19.10" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" @@ -499,30 +477,13 @@ __metadata: languageName: node linkType: hard -"@jridgewell/resolve-uri@npm:^3.0.3": - version: 3.1.1 - resolution: "@jridgewell/resolve-uri@npm:3.1.1" - checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653 - languageName: node - linkType: hard - -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.15": +"@jridgewell/sourcemap-codec@npm:^1.4.15": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8 languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:0.3.9": - version: 0.3.9 - resolution: "@jridgewell/trace-mapping@npm:0.3.9" - dependencies: - "@jridgewell/resolve-uri": ^3.0.3 - "@jridgewell/sourcemap-codec": ^1.4.10 - checksum: d89597752fd88d3f3480845691a05a44bd21faac18e2185b6f436c3b0fd0c5a859fbbd9aaa92050c4052caf325ad3e10e2e1d1b64327517471b7d51babc0ddef - languageName: node - linkType: hard - "@mapbox/geojson-rewind@npm:0.5.2": version: 0.5.2 resolution: "@mapbox/geojson-rewind@npm:0.5.2" @@ -745,34 +706,6 @@ __metadata: languageName: node linkType: hard -"@tsconfig/node10@npm:^1.0.7": - version: 1.0.9 - resolution: "@tsconfig/node10@npm:1.0.9" - checksum: a33ae4dc2a621c0678ac8ac4bceb8e512ae75dac65417a2ad9b022d9b5411e863c4c198b6ba9ef659e14b9fb609bbec680841a2e84c1172df7a5ffcf076539df - languageName: node - linkType: hard - -"@tsconfig/node12@npm:^1.0.7": - version: 1.0.11 - resolution: "@tsconfig/node12@npm:1.0.11" - checksum: 5ce29a41b13e7897a58b8e2df11269c5395999e588b9a467386f99d1d26f6c77d1af2719e407621412520ea30517d718d5192a32403b8dfcc163bf33e40a338a - languageName: node - linkType: hard - -"@tsconfig/node14@npm:^1.0.0": - version: 1.0.3 - resolution: "@tsconfig/node14@npm:1.0.3" - checksum: 19275fe80c4c8d0ad0abed6a96dbf00642e88b220b090418609c4376e1cef81bf16237bf170ad1b341452feddb8115d8dd2e5acdfdea1b27422071163dc9ba9d - languageName: node - linkType: hard - -"@tsconfig/node16@npm:^1.0.2": - version: 1.0.4 - resolution: "@tsconfig/node16@npm:1.0.4" - checksum: 202319785901f942a6e1e476b872d421baec20cf09f4b266a1854060efbf78cde16a4d256e8bc949d31e6cd9a90f1e8ef8fb06af96a65e98338a2b6b0de0a0ff - languageName: node - linkType: hard - "@types/argparse@npm:1.0.38": version: 1.0.38 resolution: "@types/argparse@npm:1.0.38" @@ -1637,14 +1570,14 @@ __metadata: languageName: node linkType: hard -"acorn-walk@npm:^8.1.1, acorn-walk@npm:^8.2.0": +"acorn-walk@npm:^8.2.0": version: 8.3.0 resolution: "acorn-walk@npm:8.3.0" checksum: 15ea56ab6529135be05e7d018f935ca80a572355dd3f6d3cd717e36df3346e0f635a93ae781b1c7942607693e2e5f3ef81af5c6fc697bbadcc377ebda7b7f5f6 languageName: node linkType: hard -"acorn@npm:^8.10.0, acorn@npm:^8.4.1, acorn@npm:^8.9.0": +"acorn@npm:^8.10.0, acorn@npm:^8.9.0": version: 8.11.2 resolution: "acorn@npm:8.11.2" bin: @@ -1757,13 +1690,6 @@ __metadata: languageName: node linkType: hard -"arg@npm:^4.1.0": - version: 4.1.3 - resolution: "arg@npm:4.1.3" - checksum: 544af8dd3f60546d3e4aff084d451b96961d2267d668670199692f8d054f0415d86fc5497d0e641e91546f0aa920e7c29e5250e99fc89f5552a34b5d93b77f43 - languageName: node - linkType: hard - "argparse@npm:^2.0.1": version: 2.0.1 resolution: "argparse@npm:2.0.1" @@ -2188,7 +2114,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.5.1": +"chokidar@npm:>=3.0.0 <4.0.0": version: 3.5.3 resolution: "chokidar@npm:3.5.3" dependencies: @@ -2456,13 +2382,6 @@ __metadata: languageName: node linkType: hard -"create-require@npm:^1.1.0": - version: 1.1.1 - resolution: "create-require@npm:1.1.1" - checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff - languageName: node - linkType: hard - "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" @@ -2697,13 +2616,6 @@ __metadata: languageName: node linkType: hard -"diff@npm:^4.0.1": - version: 4.0.2 - resolution: "diff@npm:4.0.2" - checksum: f2c09b0ce4e6b301c221addd83bf3f454c0bc00caa3dd837cf6c127d6edf7223aa2bbe3b688feea110b7f262adbfc845b757c44c8a9f8c0c5b15d8fa9ce9d20d - languageName: node - linkType: hard - "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -3035,83 +2947,6 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.17.4": - version: 0.17.19 - resolution: "esbuild@npm:0.17.19" - dependencies: - "@esbuild/android-arm": 0.17.19 - "@esbuild/android-arm64": 0.17.19 - "@esbuild/android-x64": 0.17.19 - "@esbuild/darwin-arm64": 0.17.19 - "@esbuild/darwin-x64": 0.17.19 - "@esbuild/freebsd-arm64": 0.17.19 - "@esbuild/freebsd-x64": 0.17.19 - "@esbuild/linux-arm": 0.17.19 - "@esbuild/linux-arm64": 0.17.19 - "@esbuild/linux-ia32": 0.17.19 - "@esbuild/linux-loong64": 0.17.19 - "@esbuild/linux-mips64el": 0.17.19 - "@esbuild/linux-ppc64": 0.17.19 - "@esbuild/linux-riscv64": 0.17.19 - "@esbuild/linux-s390x": 0.17.19 - "@esbuild/linux-x64": 0.17.19 - "@esbuild/netbsd-x64": 0.17.19 - "@esbuild/openbsd-x64": 0.17.19 - "@esbuild/sunos-x64": 0.17.19 - "@esbuild/win32-arm64": 0.17.19 - "@esbuild/win32-ia32": 0.17.19 - "@esbuild/win32-x64": 0.17.19 - dependenciesMeta: - "@esbuild/android-arm": - optional: true - "@esbuild/android-arm64": - optional: true - "@esbuild/android-x64": - optional: true - "@esbuild/darwin-arm64": - optional: true - "@esbuild/darwin-x64": - optional: true - "@esbuild/freebsd-arm64": - optional: true - "@esbuild/freebsd-x64": - optional: true - "@esbuild/linux-arm": - optional: true - "@esbuild/linux-arm64": - optional: true - "@esbuild/linux-ia32": - optional: true - "@esbuild/linux-loong64": - optional: true - "@esbuild/linux-mips64el": - optional: true - "@esbuild/linux-ppc64": - optional: true - "@esbuild/linux-riscv64": - optional: true - "@esbuild/linux-s390x": - optional: true - "@esbuild/linux-x64": - optional: true - "@esbuild/netbsd-x64": - optional: true - "@esbuild/openbsd-x64": - optional: true - "@esbuild/sunos-x64": - optional: true - "@esbuild/win32-arm64": - optional: true - "@esbuild/win32-ia32": - optional: true - "@esbuild/win32-x64": - optional: true - bin: - esbuild: bin/esbuild - checksum: ac11b1a5a6008e4e37ccffbd6c2c054746fc58d0ed4a2f9ee643bd030cfcea9a33a235087bc777def8420f2eaafb3486e76adb7bdb7241a9143b43a69a10afd8 - languageName: node - linkType: hard - "esbuild@npm:^0.18.10": version: 0.18.20 resolution: "esbuild@npm:0.18.20" @@ -3189,6 +3024,86 @@ __metadata: languageName: node linkType: hard +"esbuild@npm:~0.19.10": + version: 0.19.10 + resolution: "esbuild@npm:0.19.10" + dependencies: + "@esbuild/aix-ppc64": 0.19.10 + "@esbuild/android-arm": 0.19.10 + "@esbuild/android-arm64": 0.19.10 + "@esbuild/android-x64": 0.19.10 + "@esbuild/darwin-arm64": 0.19.10 + "@esbuild/darwin-x64": 0.19.10 + "@esbuild/freebsd-arm64": 0.19.10 + "@esbuild/freebsd-x64": 0.19.10 + "@esbuild/linux-arm": 0.19.10 + "@esbuild/linux-arm64": 0.19.10 + "@esbuild/linux-ia32": 0.19.10 + "@esbuild/linux-loong64": 0.19.10 + "@esbuild/linux-mips64el": 0.19.10 + "@esbuild/linux-ppc64": 0.19.10 + "@esbuild/linux-riscv64": 0.19.10 + "@esbuild/linux-s390x": 0.19.10 + "@esbuild/linux-x64": 0.19.10 + "@esbuild/netbsd-x64": 0.19.10 + "@esbuild/openbsd-x64": 0.19.10 + "@esbuild/sunos-x64": 0.19.10 + "@esbuild/win32-arm64": 0.19.10 + "@esbuild/win32-ia32": 0.19.10 + "@esbuild/win32-x64": 0.19.10 + dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true + "@esbuild/android-arm": + optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": + optional: true + "@esbuild/darwin-arm64": + optional: true + "@esbuild/darwin-x64": + optional: true + "@esbuild/freebsd-arm64": + optional: true + "@esbuild/freebsd-x64": + optional: true + "@esbuild/linux-arm": + optional: true + "@esbuild/linux-arm64": + optional: true + "@esbuild/linux-ia32": + optional: true + "@esbuild/linux-loong64": + optional: true + "@esbuild/linux-mips64el": + optional: true + "@esbuild/linux-ppc64": + optional: true + "@esbuild/linux-riscv64": + optional: true + "@esbuild/linux-s390x": + optional: true + "@esbuild/linux-x64": + optional: true + "@esbuild/netbsd-x64": + optional: true + "@esbuild/openbsd-x64": + optional: true + "@esbuild/sunos-x64": + optional: true + "@esbuild/win32-arm64": + optional: true + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": + optional: true + bin: + esbuild: bin/esbuild + checksum: b97f2f837c931e065839fe9adebba44b80aaa81c6b32dca4e1e77c068a0afb045d08a94d86abdacb29daef783ec092f0db688a31f3d463e2e42ac17e5a478265 + languageName: node + linkType: hard + "escape-html@npm:~1.0.3": version: 1.0.3 resolution: "escape-html@npm:1.0.3" @@ -3537,11 +3452,12 @@ __metadata: sass: ^1.69.5 svgo: ^3.0.3 tablesorter: ^2.31.3 - ts-node: ^10.9.1 + tsx: ^4.7.0 typescript: ^5.2.2 vite: ^4.5.0 vite-plugin-css-injected-by-js: ^3.3.0 vite-plugin-dts: ^3.6.3 + vite-tsconfig-paths: ^4.2.2 vitest: ^0.34.6 vue: ^3.3.8 vue-tsc: ^1.8.22 @@ -3580,7 +3496,7 @@ __metadata: rimraf: ^5.0.5 rollup: 3 svgo: ^3.0.3 - ts-node: ^10.9.1 + tsx: ^4.7.0 typescript: ^5.2.2 vite: ^4.5.0 vite-plugin-css-injected-by-js: ^3.3.0 @@ -3609,7 +3525,6 @@ __metadata: version: 0.0.0-use.local resolution: "facilmap-server@workspace:server" dependencies: - "@digitak/esrun": ^3.2.25 "@types/cheerio": ^0.22.34 "@types/compression": ^1.7.5 "@types/debug": ^4.1.12 @@ -3647,11 +3562,13 @@ __metadata: socket.io: ^4.7.2 string-similarity: ^4.0.4 strip-bom-buf: ^4.0.0 - ts-node: ^10.9.1 + tsx: ^4.7.0 typescript: ^5.2.2 unzipper: ^0.10.14 vite: ^4.5.0 + vite-node: ^1.1.0 vite-plugin-dts: ^3.6.3 + vite-tsconfig-paths: ^4.2.2 vitest: ^0.34.6 languageName: unknown linkType: soft @@ -3951,7 +3868,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:~2.3.2": +"fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": version: 2.3.3 resolution: "fsevents@npm:2.3.3" dependencies: @@ -3961,7 +3878,7 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@~2.3.2#~builtin": +"fsevents@patch:fsevents@~2.3.2#~builtin, fsevents@patch:fsevents@~2.3.3#~builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=df0bf1" dependencies: @@ -4065,7 +3982,7 @@ __metadata: languageName: node linkType: hard -"get-tsconfig@npm:^4.5.0": +"get-tsconfig@npm:^4.5.0, get-tsconfig@npm:^4.7.2": version: 4.7.2 resolution: "get-tsconfig@npm:4.7.2" dependencies: @@ -4166,6 +4083,13 @@ __metadata: languageName: node linkType: hard +"globrex@npm:^0.1.2": + version: 0.1.2 + resolution: "globrex@npm:0.1.2" + checksum: adca162494a176ce9ecf4dd232f7b802956bb1966b37f60c15e49d2e7d961b66c60826366dc2649093cad5a0d69970cfa8875bd1695b5a1a2f33dcd2aa88da3c + languageName: node + linkType: hard + "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -5157,13 +5081,6 @@ __metadata: languageName: node linkType: hard -"make-error@npm:^1.1.1": - version: 1.3.6 - resolution: "make-error@npm:1.3.6" - checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402 - languageName: node - linkType: hard - "make-fetch-happen@npm:^13.0.0": version: 13.0.0 resolution: "make-fetch-happen@npm:13.0.0" @@ -7339,41 +7256,17 @@ __metadata: languageName: node linkType: hard -"ts-node@npm:^10.9.1": - version: 10.9.1 - resolution: "ts-node@npm:10.9.1" - dependencies: - "@cspotcode/source-map-support": ^0.8.0 - "@tsconfig/node10": ^1.0.7 - "@tsconfig/node12": ^1.0.7 - "@tsconfig/node14": ^1.0.0 - "@tsconfig/node16": ^1.0.2 - acorn: ^8.4.1 - acorn-walk: ^8.1.1 - arg: ^4.1.0 - create-require: ^1.1.0 - diff: ^4.0.1 - make-error: ^1.1.1 - v8-compile-cache-lib: ^3.0.1 - yn: 3.1.1 +"tsconfck@npm:^2.1.0": + version: 2.1.2 + resolution: "tsconfck@npm:2.1.2" peerDependencies: - "@swc/core": ">=1.2.50" - "@swc/wasm": ">=1.2.50" - "@types/node": "*" - typescript: ">=2.7" + typescript: ^4.3.5 || ^5.0.0 peerDependenciesMeta: - "@swc/core": - optional: true - "@swc/wasm": + typescript: optional: true bin: - ts-node: dist/bin.js - ts-node-cwd: dist/bin-cwd.js - ts-node-esm: dist/bin-esm.js - ts-node-script: dist/bin-script.js - ts-node-transpile-only: dist/bin-transpile.js - ts-script: dist/bin-script-deprecated.js - checksum: 090adff1302ab20bd3486e6b4799e90f97726ed39e02b39e566f8ab674fd5bd5f727f43615debbfc580d33c6d9d1c6b1b3ce7d8e3cca3e20530a145ffa232c35 + tsconfck: bin/tsconfck.js + checksum: 6fd2f7de012a724f6b4bf48ae76cc7dae2b59dd5cad2dc50bac58d224d4ed7d5c43c6b26e55d3e00636f426f8b5373c996523d73b7830d05f8479a9b83282192 languageName: node linkType: hard @@ -7389,6 +7282,22 @@ __metadata: languageName: node linkType: hard +"tsx@npm:^4.7.0": + version: 4.7.0 + resolution: "tsx@npm:4.7.0" + dependencies: + esbuild: ~0.19.10 + fsevents: ~2.3.3 + get-tsconfig: ^4.7.2 + dependenciesMeta: + fsevents: + optional: true + bin: + tsx: dist/cli.mjs + checksum: a3a17fa8a40dbe0aff26fb2bc71a069e568152e0685b0bd9a31ea1091806274ba14882551433ed01efa7eae16f1aa965e2e47f3075ec1e914c42cf5dfce1f924 + languageName: node + linkType: hard + "type-check@npm:^0.4.0, type-check@npm:~0.4.0": version: 0.4.0 resolution: "type-check@npm:0.4.0" @@ -7648,13 +7557,6 @@ __metadata: languageName: node linkType: hard -"v8-compile-cache-lib@npm:^3.0.1": - version: 3.0.1 - resolution: "v8-compile-cache-lib@npm:3.0.1" - checksum: 78089ad549e21bcdbfca10c08850022b22024cdcc2da9b168bcf5a73a6ed7bf01a9cebb9eac28e03cd23a684d81e0502797e88f3ccd27a32aeab1cfc44c39da0 - languageName: node - linkType: hard - "validator@npm:^13.7.0, validator@npm:^13.9.0": version: 13.11.0 resolution: "validator@npm:13.11.0" @@ -7685,6 +7587,21 @@ __metadata: languageName: node linkType: hard +"vite-node@npm:^1.1.0": + version: 1.1.0 + resolution: "vite-node@npm:1.1.0" + dependencies: + cac: ^6.7.14 + debug: ^4.3.4 + pathe: ^1.1.1 + picocolors: ^1.0.0 + vite: ^5.0.0 + bin: + vite-node: vite-node.mjs + checksum: bf905e701c525df88b54104451f6e994a6e865a242ae77e5d07b0625dc61a0a8bb816f4fabc511921802c8188ee1f531fd9c78c38ef841bbfe61e0c94b536d0d + languageName: node + linkType: hard + "vite-plugin-css-injected-by-js@npm:^3.3.0": version: 3.3.0 resolution: "vite-plugin-css-injected-by-js@npm:3.3.0" @@ -7714,6 +7631,22 @@ __metadata: languageName: node linkType: hard +"vite-tsconfig-paths@npm:^4.2.2": + version: 4.2.2 + resolution: "vite-tsconfig-paths@npm:4.2.2" + dependencies: + debug: ^4.1.1 + globrex: ^0.1.2 + tsconfck: ^2.1.0 + peerDependencies: + vite: "*" + peerDependenciesMeta: + vite: + optional: true + checksum: c28d7941e4280facf12ee06c684957ed2854c6bfbce4675359af43182dc135726a72a4f3d034e0a78afed58debfd38b1600f92fb301b7b267708f17d96484119 + languageName: node + linkType: hard + "vite@npm:4.5.0": version: 4.5.0 resolution: "vite@npm:4.5.0" @@ -8114,13 +8047,6 @@ __metadata: languageName: node linkType: hard -"yn@npm:3.1.1": - version: 3.1.1 - resolution: "yn@npm:3.1.1" - checksum: 2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6 - languageName: node - linkType: hard - "yocto-queue@npm:^0.1.0": version: 0.1.0 resolution: "yocto-queue@npm:0.1.0"