diff --git a/project/Server.code-workspace b/project/Server.code-workspace index f40b2914..50c09999 100644 --- a/project/Server.code-workspace +++ b/project/Server.code-workspace @@ -27,21 +27,20 @@ { "name": "Debug", "type": "node", + "program": "${workspaceFolder}/src/ide/TestEntry.ts", "runtimeVersion": "20.11.1", - "runtimeExecutable": "npm", + "runtimeExecutable": "tsx", "request": "launch", - "sourceMaps": true, "runtimeArgs": [ - "run", - "run:debug" + "watch", + "--clear-screen=false" ], - "outFiles": [ - "!**/node_modules/**" - ], - "cwd": "${workspaceFolder}", - "outputCapture": "std", "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen" + "internalConsoleOptions": "neverOpen", + "skipFiles": [ + "/**", + "${workspaceFolder}/node_modules/**", + ], }, { "name": "Run Vitest Tests", @@ -55,12 +54,10 @@ ], "console": "integratedTerminal", "internalConsoleOptions": "neverOpen", - "cwd": "${workspaceFolder}", - "sourceMaps": true, - "outputCapture": "std", - "outFiles": [ - "!**/node_modules/**" - ] + "skipFiles": [ + "/**", + "${workspaceFolder}/node_modules/**", + ], } ] } diff --git a/project/gulpfile.mjs b/project/gulpfile.mjs index 3f024904..f154660e 100644 --- a/project/gulpfile.mjs +++ b/project/gulpfile.mjs @@ -325,10 +325,6 @@ gulp.task("build:bleeding", build("bleeding")); gulp.task("build:bleedingmods", build("bleedingmods")); gulp.task("run:build", async () => await exec(serverExeName, { stdio, cwd: buildDir })); -gulp.task( - "run:debug", - async () => await exec("ts-node-dev -r tsconfig-paths/register src/ide/TestEntry.ts", { stdio }), -); gulp.task("run:profiler", async () => { await cleanCompiled(); await compile(); diff --git a/project/package.json b/project/package.json index a4600795..e1478cbc 100644 --- a/project/package.json +++ b/project/package.json @@ -26,12 +26,12 @@ "build:bleeding": "cross-env PKG_CACHE_PATH=\"./.pkg-cache\" gulp build:bleeding", "build:bleedingmods": "cross-env PKG_CACHE_PATH=\"./.pkg-cache\" gulp build:bleedingmods", "run:build": "gulp run:build", - "run:debug": "gulp run:debug", + "run:debug": "tsx ./src/ide/TestEntry.ts", "run:profiler": "gulp run:profiler", - "gen:types": "tsc -p tsconfig.typedef.json --resolveJsonModule", + "gen:types": "tsc -p tsconfig.types.json", "gen:docs": "typedoc --options ./typedoc.json --entryPointStrategy expand ./src", - "gen:items": "ts-node -r tsconfig-paths/register ./src/tools/ItemTplGenerator/ItemTplGeneratorProgram.ts", - "gen:productionquests": "ts-node -r tsconfig-paths/register ./src/tools/ProductionQuestsGen/ProductionQuestsGenProgram.ts" + "gen:items": "tsx ./src/tools/ItemTplGenerator/ItemTplGeneratorProgram.ts", + "gen:productionquests": "tsx ./src/tools/ProductionQuestsGen/ProductionQuestsGenProgram.ts" }, "dependencies": { "atomically": "~1.7", @@ -51,7 +51,6 @@ "source-map-support": "~0.5", "string-similarity-js": "~2.1", "tsyringe": "~4.8", - "typescript": "~5.5", "winston": "~3.13", "winston-daily-rotate-file": "~5.0", "ws": "~8.18" @@ -79,9 +78,9 @@ "madge": "~7", "minimist": "~1.2", "resedit": "~2.0", - "ts-node-dev": "~2.0", - "tsconfig-paths": "~4.2", + "tsx": "4.19.2", "typedoc": "~0.26", + "typescript": "~5.5", "vitest": "^2.1.8" }, "targets": { diff --git a/project/tsconfig.base.json b/project/tsconfig.base.json deleted file mode 100644 index 76def2d4..00000000 --- a/project/tsconfig.base.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "compilerOptions": { - "noUncheckedIndexedAccess": true, - "moduleDetection": "force", - "allowJs": false, - "module": "CommonJS", - "target": "ES2022", - "allowSyntheticDefaultImports": true, - "moduleResolution": "Node10", - "esModuleInterop": true, - "downlevelIteration": true, - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "baseUrl": ".", - "paths": { - "@spt/*": ["src/*"], - "@tests/*": ["tests/*"] - } - }, - "include": ["src/*", "src/**/*"] -} diff --git a/project/tsconfig.json b/project/tsconfig.json index 8c20917d..ac0cbc7b 100644 --- a/project/tsconfig.json +++ b/project/tsconfig.json @@ -1,10 +1,27 @@ { - "extends": "./tsconfig.base.json", "compilerOptions": { + "strict": false, + "moduleDetection": "force", + "module": "Preserve", "resolveJsonModule": true, - "outDir": "obj", - "declaration": true + "allowJs": true, + "esModuleInterop": true, + "isolatedModules": true, + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "verbatimModuleSyntax": false, + "baseUrl": ".", + "paths": { + "@spt/*": [ + "./src/*" + ], + "@tests/*": [ + "./tests/*" + ] + }, }, - "include": ["./src/**/*", "./tests/**/*", "./types/**/*", "./user/mods/**/*"], - "exclude": ["./user/mods/**/*"] + "include": [ + "src/*", + "src/**/*" + ] } diff --git a/project/tsconfig.typedef.json b/project/tsconfig.types.json similarity index 63% rename from project/tsconfig.typedef.json rename to project/tsconfig.types.json index 41e90e7b..a6a7d84e 100644 --- a/project/tsconfig.typedef.json +++ b/project/tsconfig.types.json @@ -1,9 +1,11 @@ { - "extends": "./tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "emitDeclarationOnly": true, "declaration": true, "declarationDir": "./types" }, - "exclude": ["./types/**/*"] + "exclude": [ + "./types/**/*" + ] }