Cleaned up tsconfig.json a bit ( moved tsnode config to own file ).

Fixed breakpoints for all modules under tsnode

4 files changed, 137 insertions, 129 deletions

diff --git a/bundle/.vscode/launch.json b/bundle/.vscode/launch.json
index 008c9821..4f7c73c9 100644
--- a/bundle/.vscode/launch.json
+++ b/bundle/.vscode/launch.json
@@ -1,33 +1,37 @@
-{
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "ts-node",
-			"type": "node",
-			"request": "launch",
-			"args": [
-				"${workspaceFolder}/src/start.ts"
-			],
-			"runtimeArgs": [
-				"-r",
-				"ts-node/register"
-			],
-			"cwd": "${workspaceRoot}",
-			"protocol": "inspector",
-			"internalConsoleOptions": "openOnSessionStart"
-		},
-		{
-			"sourceMaps": true,
-			"type": "node",
-			"request": "launch",
-			"name": "Launch Server",
-			"program": "${workspaceFolder}/dist/bundle/src/start.js",
-			"preLaunchTask": "tsc: build - tsconfig.json",
-			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
-			"envFile": "${workspaceFolder}/.env"
-		}
-	]
-}
+{

+	// Use IntelliSense to learn about possible attributes.

+	// Hover to view descriptions of existing attributes.

+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387

+	"version": "0.2.0",

+	"configurations": [

+		{

+			"sourceMaps": true,

+			"name": "ts-node",

+			"type": "node",

+			"request": "launch",

+			"args": [

+				"${workspaceFolder}/src/start.ts"

+			],

+			"runtimeArgs": [

+				"-r",

+				"ts-node/register"

+			],

+			"protocol": "inspector",

+			"internalConsoleOptions": "openOnSessionStart",

+			"env": {

+				"TS_NODE_PROJECT": "${workspaceFolder}/tsnode.tsconfig.json",

+			},

+			"resolveSourceMapLocations": null, /* allow breakpoints in modules other than bundle */

+		},

+		{

+			"sourceMaps": true,

+			"type": "node",

+			"request": "launch",

+			"name": "Launch Server",

+			"program": "${workspaceFolder}/dist/bundle/src/start.js",

+			"preLaunchTask": "tsc: build - tsconfig.json",

+			"outFiles": ["${workspaceFolder}/dist/**/*.js"],

+			"envFile": "${workspaceFolder}/.env",

+		}

+	]

+}

diff --git a/bundle/package.json b/bundle/package.json
index 7e41ff9f..301ee18c 100644
--- a/bundle/package.json
+++ b/bundle/package.json
@@ -62,7 +62,6 @@
 		"@babel/preset-typescript": "^7.15.0",
 		"@fosscord/api": "file:../api",
 		"@fosscord/cdn": "file:../cdn",
-		"@fosscord/util": "file:../util",
 		"@fosscord/gateway": "file:../gateway",
 		"@sentry/node": "^6.16.1",
 		"@sentry/tracing": "^6.16.1",
diff --git a/bundle/tsconfig.json b/bundle/tsconfig.json
index c932d39c..cc850b99 100644
--- a/bundle/tsconfig.json
+++ b/bundle/tsconfig.json
@@ -1,95 +1,86 @@
-{
-	"include": ["dist/**/*.ts"],
-	"exclude": [],
-	"ts-node": {
-		"transpileOnly": true,
-		"preferTsExts": true,
-		"compilerOptions": {
-			"rootDir": "../",
-			"baseUrl": ".",
-		},
-		"require": ["tsconfig-paths/register"]
-	},
-	"compilerOptions": {
-		/* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-		/* Basic Options */
-		"incremental": false /* Enable incremental compilation */,
-		"target": "ES6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
-		"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
-		"lib": [
-			"ES2021"
-		] /* Specify library files to be included in the compilation. */,
-		"allowJs": true /* Allow javascript files to be compiled. */,
-		"checkJs": true /* Report errors in .js files. */,
-		// "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-		"declaration": false /* Generates corresponding '.d.ts' file. */,
-		"declarationMap": false /* Generates a sourcemap for each corresponding '.d.ts' file. */,
-		"sourceMap": true /* Generates corresponding '.map' file. */,
-		// "outFile": "./",                       /* Concatenate and emit output to single file. */
-		"outDir": "./dist/" /* Redirect output structure to the directory. */,
-		"rootDir": "./dist/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
-		// "composite": true,                     /* Enable project compilation */
-		// "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
-		// "removeComments": true,                /* Do not emit comments to output. */
-		// "noEmit": true,                        /* Do not emit outputs. */
-		// "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-		// "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-		// "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-		/* Strict Type-Checking Options */
-		"strict": true /* Enable all strict type-checking options. */,
-		"noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
-		"strictNullChecks": true /* Enable strict null checks. */,
-		// "strictFunctionTypes": true,           /* Enable strict checking of function types. */
-		// "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-		"strictPropertyInitialization": false /* Enable strict checking of property initialization in classes. */,
-		// "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-		"alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */,
-
-		/* Additional Checks */
-		// "noUnusedLocals": true,                /* Report errors on unused locals. */
-		// "noUnusedParameters": true,            /* Report errors on unused parameters. */
-		// "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
-		// "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
-
-		/* Module Resolution Options */
-		"moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-		// "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-		// "typeRoots": [],                       /* List of folders to include type definitions from. */
-		"types": [
-			"node"
-		] /* Type declaration files to be included in compilation. */,
-		// "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-		"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
-		// "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
-		// "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
-
-		/* Source Map Options */
-		// "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-		// "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
-		// "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-		// "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-		/* Experimental Options */
-		// "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-		// "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
-
-		/* Advanced Options */
-		"skipLibCheck": true /* Skip type checking of declaration files. */,
-		"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
-		"emitDecoratorMetadata": true,
-		"experimentalDecorators": true,
-		"resolveJsonModule": true,
-		"baseUrl": "./dist/",
-		"paths": {
-			"@fosscord/api": ["api/src/index", "../../api/src/index"],
-			"@fosscord/gateway": ["gateway/src/index", "../../gateway/src/index"],
-			"@fosscord/cdn": ["cdn/src/index", "../../cdn/src/index"],
-			"@fosscord/util": ["util/src/index", "../../util/src/index"]
-		},
-		"plugins": [{ "transform": "@zerollup/ts-transform-paths" }],
-		"noEmitHelpers": true,
-		"importHelpers": true
-	}
-}
+{

+	"include": ["dist/**/*.ts"],

+	"exclude": [],

+	"compilerOptions": {

+		/* Visit https://aka.ms/tsconfig.json to read more about this file */

+

+		/* Basic Options */

+		"incremental": false /* Enable incremental compilation */,

+		"target": "ES6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,

+		"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,

+		"lib": [

+			"ES2021"

+		] /* Specify library files to be included in the compilation. */,

+		"allowJs": true /* Allow javascript files to be compiled. */,

+		"checkJs": true /* Report errors in .js files. */,

+		// "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */

+		"declaration": false /* Generates corresponding '.d.ts' file. */,

+		"declarationMap": false /* Generates a sourcemap for each corresponding '.d.ts' file. */,

+		"sourceMap": true /* Generates corresponding '.map' file. */,

+		// "outFile": "./",                       /* Concatenate and emit output to single file. */

+		"outDir": "./dist/" /* Redirect output structure to the directory. */,

+		"rootDir": "./dist/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,

+		// "composite": true,                     /* Enable project compilation */

+		// "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */

+		// "removeComments": true,                /* Do not emit comments to output. */

+		// "noEmit": true,                        /* Do not emit outputs. */

+		// "importHelpers": true,                 /* Import emit helpers from 'tslib'. */

+		// "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */

+		// "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

+

+		/* Strict Type-Checking Options */

+		"strict": true /* Enable all strict type-checking options. */,

+		"noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,

+		"strictNullChecks": true /* Enable strict null checks. */,

+		// "strictFunctionTypes": true,           /* Enable strict checking of function types. */

+		// "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */

+		"strictPropertyInitialization": false /* Enable strict checking of property initialization in classes. */,

+		// "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */

+		"alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */,

+

+		/* Additional Checks */

+		// "noUnusedLocals": true,                /* Report errors on unused locals. */

+		// "noUnusedParameters": true,            /* Report errors on unused parameters. */

+		// "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */

+		// "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */

+

+		/* Module Resolution Options */

+		"moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */

+		// "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */

+		// "typeRoots": [],                       /* List of folders to include type definitions from. */

+		"types": [

+			"node"

+		] /* Type declaration files to be included in compilation. */,

+		// "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */

+		"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,

+		// "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */

+		// "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */

+

+		/* Source Map Options */

+		// "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */

+		// "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */

+		// "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */

+		// "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

+

+		/* Experimental Options */

+		// "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */

+		// "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */

+

+		/* Advanced Options */

+		"skipLibCheck": true /* Skip type checking of declaration files. */,

+		"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,

+		"emitDecoratorMetadata": true,

+		"experimentalDecorators": true,

+		"resolveJsonModule": true,

+		"baseUrl": "./dist/",

+		"paths": {

+			"@fosscord/api": ["api/src/index"],

+			"@fosscord/gateway": ["gateway/src/index"],

+			"@fosscord/cdn": ["cdn/src/index"],

+			"@fosscord/util": ["util/src/index"]

+		},

+		"plugins": [{ "transform": "@zerollup/ts-transform-paths" }],

+		"noEmitHelpers": true,

+		"importHelpers": true

+	}

+}

diff --git a/bundle/tsnode.tsconfig.json b/bundle/tsnode.tsconfig.json
new file mode 100644
index 00000000..841cc013
--- /dev/null
+++ b/bundle/tsnode.tsconfig.json
@@ -0,0 +1,14 @@
+{

+	"extends": "./tsconfig.json",

+	"ts-node": {

+		"transpileOnly": true,

+		"preferTsExts": true,

+		"require": ["tsconfig-paths/register"]

+	},

+	"compilerOptions": {

+		"rootDir": "../",

+		"baseUrl": "../",

+		"sourceRoot": "../",

+		"sourceMap": true,

+	}

+}
\ No newline at end of file