Merge branch 'main' into dev

# Conflicts:
#	src/ntqqapi/external/cpmodule.ts
#	src/ntqqapi/external/crychic/index.ts
#	src/ntqqapi/external/moehook/hook.ts
#	src/onebot11/action/msg/SendMsg.ts
#	tsconfig.json
This commit is contained in:
linyuchen
2024-05-10 20:28:44 +08:00
22 changed files with 425 additions and 385 deletions

View File

@@ -8,7 +8,6 @@
"allowJs": true,
"allowSyntheticDefaultImports": true,
"moduleResolution": "node",
// "sourceMap": true
"paths": {
"@/common/*": [
"./src/common/*"
@@ -19,15 +18,9 @@
"@/ntqqapi/*": [
"./src/ntqqapi/*"
]
}
},
"noEmit": true
},
"include": [
"src/*",
"src/**/*",
"scripts/*"
],
"exclude": [
"node_modules"
],
"include": ["src/*", "src/**/*", "scripts/*"],
"exclude": ["node_modules"]
}