Merge branch '3.8.0' into testing-redux

# Conflicts:
#	project/gulpfile.mjs
#	project/tsconfig.json
#	project/tsconfig.profiler.json

Manually resolved by Refringe
This commit is contained in:
Refringe 2023-11-06 15:06:46 -05:00
commit 76b6ee6ae1
No known key found for this signature in database
GPG Key ID: 64E03E5F892C6F9E
4 changed files with 14 additions and 24 deletions

View File

@ -31,11 +31,6 @@ const licenseFile = "../LICENSE.md";
*/
const compile = async () => await exec("swc src -d obj", { stdio });
/**
* Transpiles the src files into javascript with tsc for the profiler run
*/
const compileProfiler = async () => await exec("tsc -p tsconfig.profiler.json", { stdio });
// Packaging
const fetchPackageImage = async () =>
{
@ -290,6 +285,7 @@ gulp.task("run:build", async () => await exec("Aki.Server.exe", { stdio, cwd: bu
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 compileProfiler();
await cleanCompiled();
await compile();
await exec("node --prof --inspect --trace-warnings obj/ide/TestEntry.js", { stdio });
});

View File

@ -8,7 +8,16 @@
"esModuleInterop": true,
"downlevelIteration": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true
"emitDecoratorMetadata": true,
"baseUrl": ".",
"paths": {
"@spt-aki/*": [
"src/*"
],
"@tests/*": [
"tests/*"
]
}
},
"include": [
"src/*",

View File

@ -3,16 +3,7 @@
"compilerOptions": {
"resolveJsonModule": true,
"outDir": "obj",
"declaration": true,
"baseUrl": ".",
"paths": {
"@spt-aki/*": [
"src/*"
],
"@tests/*": [
"tests/*"
]
}
"declaration": true
},
"include": [
"./src/**/*",

View File

@ -3,13 +3,7 @@
"compilerOptions": {
"emitDeclarationOnly": true,
"declaration": true,
"declarationDir": "./types",
"baseUrl": ".",
"paths": {
"@spt-aki/*": [
"src/*"
]
}
"declarationDir": "./types"
},
"exclude": [
"./types/**/*"