diff options
author | Emma [it/its]@Rory& <root@rory.gay> | 2023-12-10 23:32:12 +0100 |
---|---|---|
committer | Emma [it/its]@Rory& <root@rory.gay> | 2023-12-11 01:04:36 +0100 |
commit | daeb6c35870325e686bbd963fe82c2ea032bf646 (patch) | |
tree | 4f4edabc5cb298b120095cf2f092190f15645590 | |
parent | Add git rev patch for nix (diff) | |
download | server-daeb6c35870325e686bbd963fe82c2ea032bf646.tar.xz |
Prettier: use editorconfig
-rw-r--r-- | .editorconfig | 75 | ||||
-rw-r--r-- | .eslintignore | 3 | ||||
-rw-r--r-- | .eslintrc | 24 | ||||
-rw-r--r-- | .idea/codeStyles/Project.xml | 47 | ||||
-rw-r--r-- | .idea/inspectionProfiles/Project_Default.xml | 1 | ||||
-rw-r--r-- | .idea/jsLinters/eslint.xml | 6 | ||||
-rw-r--r-- | .lintstagedrc | 2 | ||||
-rw-r--r-- | .prettierignore | 3 | ||||
-rw-r--r-- | .prettierrc.json | 11 | ||||
-rw-r--r-- | crowdin.yml | 4 | ||||
-rw-r--r-- | package.json | 264 | ||||
-rw-r--r-- | tsconfig.json | 204 |
12 files changed, 326 insertions, 318 deletions
diff --git a/.editorconfig b/.editorconfig index f1c6e7b5..6a494c5e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -146,25 +146,22 @@ ij_xml_space_inside_empty_tag = false ij_xml_text_wrap = normal [{*.ats,*.cts,*.mts,*.ts}] -indent_size = 2 -tab_width = 2 -ij_continuation_indent_size = 2 -ij_visual_guides = 80 +indent_style = tab ij_typescript_align_imports = false -ij_typescript_align_multiline_array_initializer_expression = false +ij_typescript_align_multiline_array_initializer_expression = true ij_typescript_align_multiline_binary_operation = false ij_typescript_align_multiline_chained_methods = false ij_typescript_align_multiline_extends_list = false ij_typescript_align_multiline_for = true -ij_typescript_align_multiline_parameters = true +ij_typescript_align_multiline_parameters = false ij_typescript_align_multiline_parameters_in_calls = false ij_typescript_align_multiline_ternary_operation = false ij_typescript_align_object_properties = 0 ij_typescript_align_union_types = false ij_typescript_align_var_statements = 0 -ij_typescript_array_initializer_new_line_after_left_brace = false -ij_typescript_array_initializer_right_brace_on_new_line = false -ij_typescript_array_initializer_wrap = off +ij_typescript_array_initializer_new_line_after_left_brace = true +ij_typescript_array_initializer_right_brace_on_new_line = true +ij_typescript_array_initializer_wrap = on_every_item ij_typescript_assignment_wrap = off ij_typescript_binary_operation_sign_on_next_line = false ij_typescript_binary_operation_wrap = off @@ -181,15 +178,15 @@ ij_typescript_block_comment_add_space = false ij_typescript_block_comment_at_first_column = true ij_typescript_call_parameters_new_line_after_left_paren = false ij_typescript_call_parameters_right_paren_on_new_line = false -ij_typescript_call_parameters_wrap = off +ij_typescript_call_parameters_wrap = on_every_item ij_typescript_catch_on_new_line = false ij_typescript_chained_call_dot_on_new_line = true ij_typescript_class_brace_style = end_of_line ij_typescript_comma_on_new_line = false ij_typescript_do_while_brace_force = never ij_typescript_else_on_new_line = false -ij_typescript_enforce_trailing_comma = remove -ij_typescript_enum_constants_wrap = on_every_item +ij_typescript_enforce_trailing_comma = whenmultiline +ij_typescript_enum_constants_wrap = off ij_typescript_extends_keyword_wrap = off ij_typescript_extends_list_wrap = off ij_typescript_field_prefix = _ @@ -223,10 +220,10 @@ ij_typescript_keep_simple_methods_in_one_line = false ij_typescript_line_comment_add_space = true ij_typescript_line_comment_at_first_column = false ij_typescript_method_brace_style = end_of_line -ij_typescript_method_call_chain_wrap = off -ij_typescript_method_parameters_new_line_after_left_paren = false -ij_typescript_method_parameters_right_paren_on_new_line = false -ij_typescript_method_parameters_wrap = off +ij_typescript_method_call_chain_wrap = on_every_item +ij_typescript_method_parameters_new_line_after_left_paren = true +ij_typescript_method_parameters_right_paren_on_new_line = true +ij_typescript_method_parameters_wrap = on_every_item ij_typescript_object_literal_wrap = on_every_item ij_typescript_object_types_wrap = on_every_item ij_typescript_parentheses_expression_new_line_after_left_paren = false @@ -290,7 +287,7 @@ ij_typescript_spaces_around_multiplicative_operators = true ij_typescript_spaces_around_relational_operators = true ij_typescript_spaces_around_shift_operators = true ij_typescript_spaces_around_unary_operator = false -ij_typescript_spaces_within_array_initializer_brackets = false +ij_typescript_spaces_within_array_initializer_brackets = true ij_typescript_spaces_within_brackets = false ij_typescript_spaces_within_catch_parentheses = false ij_typescript_spaces_within_for_parentheses = false @@ -303,12 +300,12 @@ ij_typescript_spaces_within_object_literal_braces = true ij_typescript_spaces_within_object_type_braces = true ij_typescript_spaces_within_parentheses = false ij_typescript_spaces_within_switch_parentheses = false -ij_typescript_spaces_within_type_assertion = false +ij_typescript_spaces_within_type_assertion = true ij_typescript_spaces_within_union_types = true ij_typescript_spaces_within_while_parentheses = false ij_typescript_special_else_if_treatment = true -ij_typescript_ternary_operation_signs_on_next_line = false -ij_typescript_ternary_operation_wrap = off +ij_typescript_ternary_operation_signs_on_next_line = true +ij_typescript_ternary_operation_wrap = on_every_item ij_typescript_union_types_wrap = on_every_item ij_typescript_use_chained_calls_group_indents = false ij_typescript_use_double_quotes = true @@ -332,25 +329,23 @@ ij_shell_switch_cases_indented = false ij_shell_use_unix_line_separator = true [{*.cjs,*.js}] -indent_size = 2 -tab_width = 2 -ij_continuation_indent_size = 2 -ij_visual_guides = 80 +indent_style = tab +ij_continuation_indent_size = 4 ij_javascript_align_imports = false -ij_javascript_align_multiline_array_initializer_expression = false +ij_javascript_align_multiline_array_initializer_expression = true ij_javascript_align_multiline_binary_operation = false ij_javascript_align_multiline_chained_methods = false ij_javascript_align_multiline_extends_list = false ij_javascript_align_multiline_for = true -ij_javascript_align_multiline_parameters = true +ij_javascript_align_multiline_parameters = false ij_javascript_align_multiline_parameters_in_calls = false ij_javascript_align_multiline_ternary_operation = false ij_javascript_align_object_properties = 0 ij_javascript_align_union_types = false ij_javascript_align_var_statements = 0 -ij_javascript_array_initializer_new_line_after_left_brace = false -ij_javascript_array_initializer_right_brace_on_new_line = false -ij_javascript_array_initializer_wrap = off +ij_javascript_array_initializer_new_line_after_left_brace = true +ij_javascript_array_initializer_right_brace_on_new_line = true +ij_javascript_array_initializer_wrap = on_every_item ij_javascript_assignment_wrap = off ij_javascript_binary_operation_sign_on_next_line = false ij_javascript_binary_operation_wrap = off @@ -365,14 +360,14 @@ ij_javascript_block_comment_add_space = false ij_javascript_block_comment_at_first_column = true ij_javascript_call_parameters_new_line_after_left_paren = false ij_javascript_call_parameters_right_paren_on_new_line = false -ij_javascript_call_parameters_wrap = off +ij_javascript_call_parameters_wrap = on_every_item ij_javascript_catch_on_new_line = false ij_javascript_chained_call_dot_on_new_line = true ij_javascript_class_brace_style = end_of_line ij_javascript_comma_on_new_line = false ij_javascript_do_while_brace_force = never ij_javascript_else_on_new_line = false -ij_javascript_enforce_trailing_comma = remove +ij_javascript_enforce_trailing_comma = whenmultiline ij_javascript_extends_keyword_wrap = off ij_javascript_extends_list_wrap = off ij_javascript_field_prefix = _ @@ -388,7 +383,7 @@ ij_javascript_function_expression_brace_style = end_of_line ij_javascript_if_brace_force = never ij_javascript_import_merge_members = global ij_javascript_import_prefer_absolute_path = global -ij_javascript_import_sort_members = true +ij_javascript_import_sort_members = false ij_javascript_import_sort_module_name = false ij_javascript_import_use_node_resolution = true ij_javascript_imports_wrap = on_every_item @@ -405,10 +400,10 @@ ij_javascript_keep_simple_methods_in_one_line = false ij_javascript_line_comment_add_space = true ij_javascript_line_comment_at_first_column = false ij_javascript_method_brace_style = end_of_line -ij_javascript_method_call_chain_wrap = off -ij_javascript_method_parameters_new_line_after_left_paren = false -ij_javascript_method_parameters_right_paren_on_new_line = false -ij_javascript_method_parameters_wrap = off +ij_javascript_method_call_chain_wrap = on_every_item +ij_javascript_method_parameters_new_line_after_left_paren = true +ij_javascript_method_parameters_right_paren_on_new_line = true +ij_javascript_method_parameters_wrap = on_every_item ij_javascript_object_literal_wrap = on_every_item ij_javascript_object_types_wrap = on_every_item ij_javascript_parentheses_expression_new_line_after_left_paren = false @@ -472,7 +467,7 @@ ij_javascript_spaces_around_multiplicative_operators = true ij_javascript_spaces_around_relational_operators = true ij_javascript_spaces_around_shift_operators = true ij_javascript_spaces_around_unary_operator = false -ij_javascript_spaces_within_array_initializer_brackets = false +ij_javascript_spaces_within_array_initializer_brackets = true ij_javascript_spaces_within_brackets = false ij_javascript_spaces_within_catch_parentheses = false ij_javascript_spaces_within_for_parentheses = false @@ -489,8 +484,8 @@ ij_javascript_spaces_within_type_assertion = false ij_javascript_spaces_within_union_types = true ij_javascript_spaces_within_while_parentheses = false ij_javascript_special_else_if_treatment = true -ij_javascript_ternary_operation_signs_on_next_line = false -ij_javascript_ternary_operation_wrap = off +ij_javascript_ternary_operation_signs_on_next_line = true +ij_javascript_ternary_operation_wrap = on_every_item ij_javascript_union_types_wrap = on_every_item ij_javascript_use_chained_calls_group_indents = false ij_javascript_use_double_quotes = true @@ -508,7 +503,7 @@ ij_json_array_wrapping = split_into_lines ij_json_keep_blank_lines_in_code = 0 ij_json_keep_indents_on_empty_lines = false ij_json_keep_line_breaks = true -ij_json_keep_trailing_comma = false +ij_json_keep_trailing_comma = true ij_json_object_wrapping = split_into_lines ij_json_property_alignment = do_not_align ij_json_space_after_colon = true diff --git a/.eslintignore b/.eslintignore index 15a75b0e..0b90b8d2 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,4 +4,5 @@ README.md COPYING src/webrtc scripts/ -assets \ No newline at end of file +assets +package-lock.json \ No newline at end of file diff --git a/.eslintrc b/.eslintrc index 40eac134..8c73fdc6 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,14 +1,14 @@ { - "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"], - "parser": "@typescript-eslint/parser", - "plugins": ["@typescript-eslint"], - "root": true, - "rules": { - "no-mixed-spaces-and-tabs": "off", - "@typescript-eslint/no-inferrable-types": "off", // Required by typeorm - "@typescript-eslint/no-var-requires": "off" // Sometimes requred by typeorm to resolve circular deps - }, - "env": { - "node": true - } + "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"], + "parser": "@typescript-eslint/parser", + "plugins": ["@typescript-eslint"], + "root": true, + "rules": { + "no-mixed-spaces-and-tabs": "off", + "@typescript-eslint/no-inferrable-types": "off", // Required by typeorm + "@typescript-eslint/no-var-requires": "off" // Sometimes requred by typeorm to resolve circular deps + }, + "env": { + "node": true + } } diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 4ce35b7a..cd7e9138 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -6,19 +6,26 @@ </HTMLCodeStyleSettings> <JSCodeStyleSettings version="0"> <option name="FORCE_SEMICOLON_STYLE" value="true" /> + <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" /> <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" /> <option name="FORCE_QUOTE_STYlE" value="true" /> - <option name="ENFORCE_TRAILING_COMMA" value="Remove" /> + <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" /> <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" /> <option name="SPACES_WITHIN_IMPORTS" value="true" /> + <option name="IMPORT_SORT_MEMBERS" value="false" /> </JSCodeStyleSettings> + <JSON> + <option name="KEEP_TRAILING_COMMA" value="true" /> + </JSON> <TypeScriptCodeStyleSettings version="0"> <option name="FORCE_SEMICOLON_STYLE" value="true" /> + <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" /> <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" /> <option name="FORCE_QUOTE_STYlE" value="true" /> - <option name="ENFORCE_TRAILING_COMMA" value="Remove" /> + <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" /> <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" /> <option name="SPACES_WITHIN_IMPORTS" value="true" /> + <option name="SPACE_WITHIN_TYPE_ASSERTION" value="true" /> <option name="IMPORT_SORT_MEMBERS" value="false" /> </TypeScriptCodeStyleSettings> <VueCodeStyleSettings> @@ -42,11 +49,20 @@ </indentOptions> </codeStyleSettings> <codeStyleSettings language="JavaScript"> - <option name="SOFT_MARGINS" value="80" /> + <option name="ALIGN_MULTILINE_PARAMETERS" value="false" /> + <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" /> + <option name="CALL_PARAMETERS_WRAP" value="5" /> + <option name="METHOD_PARAMETERS_WRAP" value="5" /> + <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" /> + <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" /> + <option name="METHOD_CALL_CHAIN_WRAP" value="5" /> + <option name="TERNARY_OPERATION_WRAP" value="5" /> + <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" /> + <option name="ARRAY_INITIALIZER_WRAP" value="5" /> + <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" /> + <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" /> <indentOptions> - <option name="INDENT_SIZE" value="2" /> - <option name="CONTINUATION_INDENT_SIZE" value="2" /> - <option name="TAB_SIZE" value="2" /> + <option name="USE_TAB_CHARACTER" value="true" /> </indentOptions> <arrangement> <groups> @@ -132,11 +148,22 @@ </arrangement> </codeStyleSettings> <codeStyleSettings language="TypeScript"> - <option name="SOFT_MARGINS" value="80" /> + <option name="ALIGN_MULTILINE_PARAMETERS" value="false" /> + <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" /> + <option name="CALL_PARAMETERS_WRAP" value="5" /> + <option name="METHOD_PARAMETERS_WRAP" value="5" /> + <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" /> + <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" /> + <option name="METHOD_CALL_CHAIN_WRAP" value="5" /> + <option name="TERNARY_OPERATION_WRAP" value="5" /> + <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" /> + <option name="ARRAY_INITIALIZER_WRAP" value="5" /> + <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" /> + <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" /> + <option name="ENUM_CONSTANTS_WRAP" value="0" /> <indentOptions> - <option name="INDENT_SIZE" value="2" /> - <option name="CONTINUATION_INDENT_SIZE" value="2" /> - <option name="TAB_SIZE" value="2" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="USE_TAB_CHARACTER" value="true" /> </indentOptions> </codeStyleSettings> <codeStyleSettings language="Vue"> diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 22cdf9bd..f986a929 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -7,5 +7,6 @@ <option name="processLiterals" value="true" /> <option name="processComments" value="true" /> </inspection_tool> + <inspection_tool class="TypeScriptExplicitMemberType" enabled="true" level="WEAK WARNING" enabled_by_default="true" editorAttributes="INFO_ATTRIBUTES" /> </profile> </component> \ No newline at end of file diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml deleted file mode 100644 index 541945bb..00000000 --- a/.idea/jsLinters/eslint.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="EslintConfiguration"> - <option name="fix-on-save" value="true" /> - </component> -</project> \ No newline at end of file diff --git a/.lintstagedrc b/.lintstagedrc index 9bfb3172..57e403c0 100644 --- a/.lintstagedrc +++ b/.lintstagedrc @@ -1,3 +1,3 @@ { - "*.{j,t}s": ["eslint", "prettier --write"] + "*.{j,t}s": ["eslint", "prettier --write"] } diff --git a/.prettierignore b/.prettierignore index 51116757..b00eb49f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,4 +2,5 @@ assets dist node_modules .github -.vscode \ No newline at end of file +.vscode +package-lock.json \ No newline at end of file diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index 7f0d7f20..00000000 --- a/.prettierrc.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "trailingComma": "all", - "tabWidth": 4, - "semi": true, - "arrowParens": "always", - "bracketSameLine": false, - "bracketSpacing": true, - "quoteProps": "as-needed", - "useTabs": true, - "singleQuote": false -} diff --git a/crowdin.yml b/crowdin.yml index a72a2eb7..7cae8457 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,3 @@ files: - - source: /assets/locales/en/*.json - translation: /assets/locales/%two_letters_code%/%original_file_name% + - source: /assets/locales/en/*.json + translation: /assets/locales/%two_letters_code%/%original_file_name% diff --git a/package.json b/package.json index 7e48f745..3d2ac2ba 100644 --- a/package.json +++ b/package.json @@ -1,134 +1,134 @@ { - "name": "spacebar-server", - "version": "1.0.0", - "description": "A Spacebar server written in Node.js", - "scripts": { - "prepare": "husky install", - "postinstall": "npx patch-package", - "start": "node dist/bundle/start.js", - "start:api": "node dist/api/start.js", - "start:cdn": "node dist/cdn/start.js", - "start:gateway": "node dist/gateway/start.js", - "build": "tsc -p .", - "test": "node scripts/test.js", - "lint": "eslint .", - "setup": "npm run build && npm run generate:schema", - "sync:db": "npm run build && node scripts/syncronise.js", - "generate:rights": "node scripts/rights.js", - "generate:schema": "node scripts/schema.js", - "generate:migration": "node -r dotenv/config -r module-alias/register node_modules/typeorm/cli.js migration:generate -d dist/util/util/Database.js", - "generate:openapi": "node scripts/openapi.js", - "add:license": "node scripts/license.js", - "migrate-from-staging": "node -r dotenv/config -r module-alias/register scripts/stagingMigration/index.js" - }, - "main": "dist/bundle/index.js", - "types": "src/bundle/index.ts", - "repository": { - "type": "git", - "url": "git+https://github.com/spacebarchat/server.git" - }, - "author": "Spacebar", - "license": "AGPL-3.0-only", - "bugs": { - "url": "https://github.com/spacebarchat/server/issues" - }, - "imports": { - "#*": "./dist/*/index.js" - }, - "files": [ - "dist", - "assets" - ], - "bin": { - "start-bundle": "dist/bundle/start.js", - "start-api": "dist/api/start.js", - "start-cdn": "dist/cdn/start.js", - "start-gateway": "dist/gateway/start.js" - }, - "homepage": "https://spacebar.chat", - "devDependencies": { - "@types/amqplib": "^0.8.2", - "@types/bcrypt": "^5.0.0", - "@types/body-parser": "^1.19.2", - "@types/cookie-parser": "^1.4.3", - "@types/express": "^4.17.17", - "@types/i18next-node-fs-backend": "^2.1.2", - "@types/json-bigint": "^1.0.1", - "@types/jsonwebtoken": "^9.0.2", - "@types/morgan": "^1.9.4", - "@types/multer": "^1.4.7", - "@types/murmurhash-js": "^1.0.4", - "@types/node": "^18.17.3", - "@types/node-fetch": "^2.6.4", - "@types/node-os-utils": "^1.3.1", - "@types/nodemailer": "^6.4.9", - "@types/probe-image-size": "^7.2.0", - "@types/sharp": "^0.31.1", - "@types/ws": "^8.5.5", - "@typescript-eslint/eslint-plugin": "^5.62.0", - "@typescript-eslint/parser": "^5.62.0", - "eslint": "^8.46.0", - "express": "^4.18.2", - "husky": "^8.0.3", - "prettier": "^2.8.8", - "pretty-quick": "^3.1.3", - "typescript": "^4.9.5" - }, - "dependencies": { - "@aws-sdk/client-s3": "^3.385.0", - "@sentry/integrations": "^7.66.0", - "@sentry/node": "^7.66.0", - "ajv": "8.6.2", - "ajv-formats": "2.1.1", - "amqplib": "^0.10.3", - "bcrypt": "^5.1.0", - "body-parser": "1.20.1", - "cheerio": "^1.0.0-rc.12", - "cookie-parser": "^1.4.6", - "dotenv": "^16.3.1", - "exif-be-gone": "^1.3.2", - "fast-zlib": "^2.0.1", - "fido2-lib": "^3.4.1", - "file-type": "~16.5.4", - "form-data": "^4.0.0", - "i18next": "^21.10.0", - "i18next-fs-backend": "^2.1.5", - "i18next-http-middleware": "^3.3.2", - "image-size": "^1.0.2", - "json-bigint": "^1.0.0", - "jsonwebtoken": "^9.0.1", - "lambert-server": "^1.2.12", - "missing-native-js-functions": "^1.4.3", - "module-alias": "^2.2.3", - "morgan": "^1.10.0", - "multer": "^1.4.5-lts.1", - "murmurhash-js": "^1.0.0", - "node-2fa": "^2.0.3", - "node-fetch": "^2.6.12", - "node-os-utils": "^1.3.7", - "nodemailer": "^6.9.4", - "picocolors": "^1.0.0", - "probe-image-size": "^7.2.3", - "proxy-agent": "^6.3.0", - "reflect-metadata": "^0.1.13", - "ts-node": "^10.9.1", - "tslib": "^2.6.1", - "typeorm": "^0.3.17", - "typescript-json-schema": "^0.50.1", - "wretch": "^2.6.0", - "ws": "^8.13.0" - }, - "_moduleAliases": { - "@spacebar/api": "dist/api", - "@spacebar/cdn": "dist/cdn", - "@spacebar/gateway": "dist/gateway", - "@spacebar/util": "dist/util" - }, - "optionalDependencies": { - "erlpack": "^0.1.4", - "nodemailer-mailgun-transport": "^2.1.5", - "nodemailer-mailjet-transport": "github:n0script22/nodemailer-mailjet-transport", - "nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport", - "sqlite3": "^5.1.6" - } + "name": "spacebar-server", + "version": "1.0.0", + "description": "A Spacebar server written in Node.js", + "scripts": { + "prepare": "husky install", + "postinstall": "npx patch-package", + "start": "node dist/bundle/start.js", + "start:api": "node dist/api/start.js", + "start:cdn": "node dist/cdn/start.js", + "start:gateway": "node dist/gateway/start.js", + "build": "tsc -p .", + "test": "node scripts/test.js", + "lint": "eslint .", + "setup": "npm run build && npm run generate:schema", + "sync:db": "npm run build && node scripts/syncronise.js", + "generate:rights": "node scripts/rights.js", + "generate:schema": "node scripts/schema.js", + "generate:migration": "node -r dotenv/config -r module-alias/register node_modules/typeorm/cli.js migration:generate -d dist/util/util/Database.js", + "generate:openapi": "node scripts/openapi.js", + "add:license": "node scripts/license.js", + "migrate-from-staging": "node -r dotenv/config -r module-alias/register scripts/stagingMigration/index.js" + }, + "main": "dist/bundle/index.js", + "types": "src/bundle/index.ts", + "repository": { + "type": "git", + "url": "git+https://github.com/spacebarchat/server.git" + }, + "author": "Spacebar", + "license": "AGPL-3.0-only", + "bugs": { + "url": "https://github.com/spacebarchat/server/issues" + }, + "imports": { + "#*": "./dist/*/index.js" + }, + "files": [ + "dist", + "assets" + ], + "bin": { + "start-bundle": "dist/bundle/start.js", + "start-api": "dist/api/start.js", + "start-cdn": "dist/cdn/start.js", + "start-gateway": "dist/gateway/start.js" + }, + "homepage": "https://spacebar.chat", + "devDependencies": { + "@types/amqplib": "^0.8.2", + "@types/bcrypt": "^5.0.0", + "@types/body-parser": "^1.19.2", + "@types/cookie-parser": "^1.4.3", + "@types/express": "^4.17.17", + "@types/i18next-node-fs-backend": "^2.1.2", + "@types/json-bigint": "^1.0.1", + "@types/jsonwebtoken": "^9.0.2", + "@types/morgan": "^1.9.4", + "@types/multer": "^1.4.7", + "@types/murmurhash-js": "^1.0.4", + "@types/node": "^18.17.3", + "@types/node-fetch": "^2.6.4", + "@types/node-os-utils": "^1.3.1", + "@types/nodemailer": "^6.4.9", + "@types/probe-image-size": "^7.2.0", + "@types/sharp": "^0.31.1", + "@types/ws": "^8.5.5", + "@typescript-eslint/eslint-plugin": "^5.62.0", + "@typescript-eslint/parser": "^5.62.0", + "eslint": "^8.46.0", + "express": "^4.18.2", + "husky": "^8.0.3", + "prettier": "^2.8.8", + "pretty-quick": "^3.1.3", + "typescript": "^4.9.5" + }, + "dependencies": { + "@aws-sdk/client-s3": "^3.385.0", + "@sentry/integrations": "^7.66.0", + "@sentry/node": "^7.66.0", + "ajv": "8.6.2", + "ajv-formats": "2.1.1", + "amqplib": "^0.10.3", + "bcrypt": "^5.1.0", + "body-parser": "1.20.1", + "cheerio": "^1.0.0-rc.12", + "cookie-parser": "^1.4.6", + "dotenv": "^16.3.1", + "exif-be-gone": "^1.3.2", + "fast-zlib": "^2.0.1", + "fido2-lib": "^3.4.1", + "file-type": "~16.5.4", + "form-data": "^4.0.0", + "i18next": "^21.10.0", + "i18next-fs-backend": "^2.1.5", + "i18next-http-middleware": "^3.3.2", + "image-size": "^1.0.2", + "json-bigint": "^1.0.0", + "jsonwebtoken": "^9.0.1", + "lambert-server": "^1.2.12", + "missing-native-js-functions": "^1.4.3", + "module-alias": "^2.2.3", + "morgan": "^1.10.0", + "multer": "^1.4.5-lts.1", + "murmurhash-js": "^1.0.0", + "node-2fa": "^2.0.3", + "node-fetch": "^2.6.12", + "node-os-utils": "^1.3.7", + "nodemailer": "^6.9.4", + "picocolors": "^1.0.0", + "probe-image-size": "^7.2.3", + "proxy-agent": "^6.3.0", + "reflect-metadata": "^0.1.13", + "ts-node": "^10.9.1", + "tslib": "^2.6.1", + "typeorm": "^0.3.17", + "typescript-json-schema": "^0.50.1", + "wretch": "^2.6.0", + "ws": "^8.13.0" + }, + "_moduleAliases": { + "@spacebar/api": "dist/api", + "@spacebar/cdn": "dist/cdn", + "@spacebar/gateway": "dist/gateway", + "@spacebar/util": "dist/util" + }, + "optionalDependencies": { + "erlpack": "^0.1.4", + "nodemailer-mailgun-transport": "^2.1.5", + "nodemailer-mailjet-transport": "github:n0script22/nodemailer-mailjet-transport", + "nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport", + "sqlite3": "^5.1.6" + } } diff --git a/tsconfig.json b/tsconfig.json index 1e3e9d59..9b4051e0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,112 +1,112 @@ { - "exclude": ["./src/webrtc"], - "include": ["./src"], - "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ + "exclude": ["./src/webrtc"], + "include": ["./src"], + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ - /* Projects */ - "incremental": true /* Save .tsbuildinfo files to allow for incremental compilation of projects. */, - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + /* Projects */ + "incremental": true /* Save .tsbuildinfo files to allow for incremental compilation of projects. */, + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - /* Language and Environment */ - "target": "ESNext" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, - "lib": [ - "ESNext" - ] /* Specify a set of bundled library declaration files that describe the target runtime environment. */, - // "jsx": "preserve", /* Specify what JSX code is generated. */ - "experimentalDecorators": true /* Enable experimental support for TC39 stage 2 draft decorators. */, - "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */, - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + /* Language and Environment */ + "target": "ESNext" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, + "lib": [ + "ESNext" + ] /* Specify a set of bundled library declaration files that describe the target runtime environment. */, + // "jsx": "preserve", /* Specify what JSX code is generated. */ + "experimentalDecorators": true /* Enable experimental support for TC39 stage 2 draft decorators. */, + "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */, + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - /* Modules */ - "module": "commonjs" /* Specify what module code is generated. */, - // "rootDir": "./src", /* Specify the root folder within your source files. */ - "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */, - "baseUrl": "./src/", - "paths": { - "@spacebar/api*": ["./api"], - "@spacebar/gateway*": ["./gateway"], - "@spacebar/cdn*": ["./cdn"], - "@spacebar/util*": ["./util"] - } /* Specify a set of entries that re-map imports to additional lookup locations. */, - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - "types": ["node"] /* Specify type package names to be included without being referenced in a source file. */, - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - "resolveJsonModule": true /* Enable importing .json files. */, - // "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */ + /* Modules */ + "module": "commonjs" /* Specify what module code is generated. */, + // "rootDir": "./src", /* Specify the root folder within your source files. */ + "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */, + "baseUrl": "./src/", + "paths": { + "@spacebar/api*": ["./api"], + "@spacebar/gateway*": ["./gateway"], + "@spacebar/cdn*": ["./cdn"], + "@spacebar/util*": ["./util"] + } /* Specify a set of entries that re-map imports to additional lookup locations. */, + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + "types": ["node"] /* Specify type package names to be included without being referenced in a source file. */, + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + "resolveJsonModule": true /* Enable importing .json files. */, + // "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */ - /* JavaScript Support */ - "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */, - "checkJs": true /* Enable error reporting in type-checked JavaScript files. */, - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + /* JavaScript Support */ + "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */, + "checkJs": true /* Enable error reporting in type-checked JavaScript files. */, + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - /* Emit */ - "declaration": false /* Generate .d.ts files from TypeScript and JavaScript files in your project. */, - "declarationMap": false /* Create sourcemaps for d.ts files. */, - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - "sourceMap": true /* Create source map files for emitted JavaScript files. */, - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist/" /* Specify an output folder for all emitted files. */, - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - "importHelpers": true /* Allow importing helper functions from tslib once per project, instead of including them per-file. */, - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - "noEmitHelpers": true /* Disable generating custom helper functions like '__extends' in compiled output. */, - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + /* Emit */ + "declaration": false /* Generate .d.ts files from TypeScript and JavaScript files in your project. */, + "declarationMap": false /* Create sourcemaps for d.ts files. */, + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + "sourceMap": true /* Create source map files for emitted JavaScript files. */, + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + "outDir": "./dist/" /* Specify an output folder for all emitted files. */, + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + "importHelpers": true /* Allow importing helper functions from tslib once per project, instead of including them per-file. */, + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + "noEmitHelpers": true /* Disable generating custom helper functions like '__extends' in compiled output. */, + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, - /* Type Checking */ - "strict": true /* Enable all strict type-checking options. */, - "noImplicitAny": true /* Enable error reporting for expressions and declarations with an implied 'any' type. */, - "strictNullChecks": true /* When type checking, take into account 'null' and 'undefined'. */, - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - "strictPropertyInitialization": false /* Check for class properties that are declared but not set in the constructor. */, - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - "alwaysStrict": true /* Ensure 'use strict' is always emitted. */, - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + /* Type Checking */ + "strict": true /* Enable all strict type-checking options. */, + "noImplicitAny": true /* Enable error reporting for expressions and declarations with an implied 'any' type. */, + "strictNullChecks": true /* When type checking, take into account 'null' and 'undefined'. */, + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + "strictPropertyInitialization": false /* Check for class properties that are declared but not set in the constructor. */, + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + "alwaysStrict": true /* Ensure 'use strict' is always emitted. */, + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ - } + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + } } |