Merge branch 'master' into 3.8.0

project/gulpfile.mjs

@@ -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.test.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 });
 });

project/tsconfig.base.json

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

project/tsconfig.json

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

project/tsconfig.test.json

@@ -1,13 +0,0 @@
-{
-    "extends": "./tsconfig.base.json",
-    "compilerOptions": {
-        "outDir": "obj",
-        "declaration": true,
-        "sourceMap": true,
-        "noImplicitAny": false
-    },
-    "include": [
-        "./types/**/*",
-        "./src/**/*"
-    ]
-}

project/tsconfig.typedef.json

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