diff --git a/api/package-lock.json b/api/package-lock.json index f4e7506c..265e70bb 100644 Binary files a/api/package-lock.json and b/api/package-lock.json differ diff --git a/api/package.json b/api/package.json index 3f0315ae..aae31e2d 100644 --- a/api/package.json +++ b/api/package.json @@ -10,7 +10,7 @@ "test": "npm run build && npm run test:only", "test:watch": "jest --watch", "start": "npm run build && node dist/start", - "build": "npx tsc -b .", + "build": "npx tsc -p .", "build-docker": "tsc -p tsconfig-docker.json", "dev": "tsnd --respawn src/start.ts", "patch": "ts-patch install -s && npx patch-package", @@ -38,10 +38,6 @@ "homepage": "https://fosscord.com", "devDependencies": { "@babel/core": "^7.15.5", - "@babel/preset-env": "^7.15.6", - "@babel/preset-typescript": "^7.15.0", - "@swc/cli": "^0.1.51", - "@swc/core": "^1.2.93", "@types/amqplib": "^0.8.1", "@types/bcrypt": "^5.0.0", "@types/express": "^4.17.9", @@ -49,65 +45,46 @@ "@types/jest": "^27.0.1", "@types/jest-expect-message": "^1.0.3", "@types/jsonwebtoken": "^8.5.0", - "@types/mongodb": "^3.6.9", - "@types/mongoose": "^5.10.5", - "@types/mongoose-autopopulate": "^0.10.1", - "@types/mongoose-lean-virtuals": "^0.5.1", "@types/multer": "^1.4.5", "@types/node": "^14.17.9", "@types/node-fetch": "^2.5.7", "@types/supertest": "^2.0.11", "@zerollup/ts-transform-paths": "^1.7.18", - "0x": "^4.10.2", - "babel-jest": "^27.2.0", - "caxa": "^2.1.0", - "image-size": "^1.0.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "jest-runtime": "^27.2.1", - "saslprep": "^1.0.3", "ts-node": "^9.1.1", "ts-node-dev": "^1.1.6", "ts-patch": "^1.4.4", - "tsup": "^5.4.0", "typescript": "^4.4.2", - "typescript-json-schema": "0.50.1" + "typescript-json-schema": "0.50.1", + "@types/morgan": "^1.9.3" }, "dependencies": { "@fosscord/util": "file:../util", - "@types/morgan": "^1.9.3", "ajv": "8.6.2", "ajv-formats": "^2.1.1", "amqplib": "^0.8.0", "assert": "^1.5.0", - "atomically": "^1.7.0", "bcrypt": "^5.0.1", "body-parser": "^1.19.0", - "cheerio": "^1.0.0-rc.9", - "dot-prop": "^6.0.1", + "cheerio": "^1.0.0-rc.10", "dotenv": "^8.2.0", - "env-paths": "^2.2.1", - "esbuild": "^0.13.4", "express": "^4.17.1", - "express-validator": "^6.9.2", "form-data": "^3.0.0", "i18next": "^19.9.2", "i18next-http-middleware": "^3.1.3", "i18next-node-fs-backend": "^2.1.3", + "image-size": "^1.0.0", "jsonwebtoken": "^8.5.1", "lambert-server": "^1.2.11", "missing-native-js-functions": "^1.2.17", - "mongoose": "^5.12.3", - "mongoose-autopopulate": "^0.12.3", - "mongoose-long": "^0.3.2", "morgan": "^1.10.0", "multer": "^1.4.2", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "supertest": "^6.1.6", - "tsconfig-paths": "^3.11.0", - "typeorm": "^0.2.37", - "wsc": "^0.3.0" + "typeorm": "^0.2.37" }, "jest": { "setupFiles": [ diff --git a/api/tsconfig.json b/api/tsconfig.json index 0bbd615a..2cf4e4c1 100644 --- a/api/tsconfig.json +++ b/api/tsconfig.json @@ -1,10 +1,11 @@ { + "exclude": ["node_modules"], "include": ["src/**/*.ts"], "compilerOptions": { /* Visit https://aka.ms/tsconfig.json to read more about this file */ /* Basic Options */ - // "incremental": true, /* Enable incremental compilation */ + "incremental": true /* Enable incremental compilation */, "target": "ESNext" /* 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. */, @@ -69,6 +70,7 @@ "@fosscord/api": ["src/index"], "@fosscord/api/*": ["src/*"] }, - "plugins": [{ "transform": "@zerollup/ts-transform-paths" }] + "plugins": [{ "transform": "@zerollup/ts-transform-paths" }], + "experimentalDecorators": true } } diff --git a/bundle/package-lock.json b/bundle/package-lock.json index cb8078de..a967e97f 100644 Binary files a/bundle/package-lock.json and b/bundle/package-lock.json differ diff --git a/bundle/package.json b/bundle/package.json index a7f5358b..05cefaab 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -4,11 +4,10 @@ "description": "", "main": "src/start.js", "scripts": { - "setup": "cd ../util && npm --production=false i && cd ../api && npm --production=false i && cd ../cdn && npm --production=false i && cd ../gateway && npm --production=false i && cd ../bundle/ && npm --production=false i && npm run build", + "setup": "node scripts/install.js && npm install && ts-patch install -s && patch-package --patch-dir ../api/patches/ && npm run build", "build": "node scripts/build.js", - "build:bundle": "npx tsc -b .", - "start": "node scripts/build.js && node -r tsconfig-paths/register dist/start.js", - "start:bundle": "node -r tsconfig-paths/register dist/start.js", + "start": "node scripts/build.js && node dist/bundle/src/start.js", + "start:bundle": "node dist/bundle/src/start.js", "test": "echo \"Error: no test specified\" && exit 1" }, "repository": { @@ -23,42 +22,76 @@ }, "homepage": "https://fosscord.com", "devDependencies": { - "@swc/cli": "^0.1.51", - "@swc/core": "^1.2.93", + "@babel/core": "^7.15.5", + "@babel/preset-env": "^7.15.6", + "@babel/preset-typescript": "^7.15.0", "@types/amqplib": "^0.8.1", - "@types/async-exit-hook": "^2.0.0", "@types/bcrypt": "^5.0.0", - "@types/express": "^4.17.9", + "@types/body-parser": "^1.19.0", + "@types/btoa": "^1.2.3", + "@types/dotenv": "^8.2.0", + "@types/express": "^4.17.12", + "@types/fs-extra": "^9.0.12", "@types/i18next-node-fs-backend": "^2.1.0", + "@types/jest": "^27.0.1", + "@types/jest-expect-message": "^1.0.3", "@types/jsonwebtoken": "^8.5.0", - "@types/mongodb": "^3.6.9", - "@types/mongoose-autopopulate": "^0.10.1", - "@types/mongoose-lean-virtuals": "^0.5.1", - "@types/multer": "^1.4.5", - "@types/node": "^14.17.20", - "@types/node-fetch": "^2.5.7", + "@types/multer": "^1.4.7", + "@types/node": "^14.17.9", + "@types/node-fetch": "^2.5.12", "@types/node-os-utils": "^1.2.0", - "@types/uuid": "^8.3.0", + "@types/supertest": "^2.0.11", "@types/ws": "^7.4.0", "@zerollup/ts-transform-paths": "^1.7.18", - "esbuild": "^0.13.4", - "esbuild-plugin-tsc": "^0.3.0", - "ts-node": "^10.2.1", + "jest": "^27.0.6", + "jest-expect-message": "^1.0.2", + "jest-runtime": "^27.2.1", + "ts-node": "^9.1.1", + "ts-node-dev": "^1.1.6", "ts-patch": "^1.4.4", - "tsconfig-paths": "^3.11.0", - "typescript": "^4.4.3" + "typescript": "^4.2.3", + "typescript-json-schema": "0.50.1", + "@types/morgan": "^1.9.3" }, "dependencies": { - "@fosscord/api": "file:../api", - "@fosscord/cdn": "file:../cdn", - "@fosscord/gateway": "file:../gateway", - "@fosscord/util": "file:../util", + "ajv": "8.6.2", + "ajv-formats": "^2.1.1", + "amqplib": "^0.8.0", + "assert": "^1.5.0", "async-exit-hook": "^2.0.1", - "dotenv": "^10.0.0", + "bcrypt": "^5.0.1", + "body-parser": "^1.19.0", + "btoa": "^1.2.1", + "dotenv": "^8.2.0", + "exif-be-gone": "^1.2.0", "express": "^4.17.1", + "express-async-errors": "^3.1.1", + "file-type": "^16.5.0", + "form-data": "^3.0.0", + "fs-extra": "^10.0.0", + "i18next": "^19.9.2", + "i18next-http-middleware": "^3.1.3", + "i18next-node-fs-backend": "^2.1.3", + "image-size": "^1.0.0", + "jest": "^27.0.6", + "jsonwebtoken": "^8.5.1", + "lambert-db": "^1.2.3", + "lambert-server": "^1.2.11", "missing-native-js-functions": "^1.2.17", + "morgan": "^1.10.0", + "multer": "^1.4.2", "nanocolors": "^0.2.12", + "node-fetch": "^2.6.1", "node-os-utils": "^1.3.5", - "reflect-metadata": "^0.1.13" + "patch-package": "^6.4.7", + "pg": "^8.7.1", + "reflect-metadata": "^0.1.13", + "sqlite3": "^5.0.2", + "supertest": "^6.1.6", + "typeorm": "^0.2.37", + "typescript": "^4.1.2", + "typescript-json-schema": "^0.50.1", + "ws": "^7.4.2", + "cheerio": "^1.0.0-rc.10" } } diff --git a/cdn/package-lock.json b/cdn/package-lock.json index f0cce0af..a5a81e4f 100644 Binary files a/cdn/package-lock.json and b/cdn/package-lock.json differ diff --git a/cdn/package.json b/cdn/package.json index 5d3f1589..027ba553 100644 --- a/cdn/package.json +++ b/cdn/package.json @@ -7,7 +7,7 @@ "scripts": { "postinstall": "ts-patch install -s", "test": "npm run build && jest --coverage ./tests", - "build": "npx tsc -b .", + "build": "npx tsc -p .", "start": "npm run build && node dist/start.js" }, "repository": { @@ -22,8 +22,6 @@ }, "homepage": "https://github.com/fosscord/fosscord-server#readme", "devDependencies": { - "@swc/cli": "^0.1.51", - "@swc/core": "^1.2.93", "@types/amqplib": "^0.8.1", "@types/body-parser": "^1.19.0", "@types/btoa": "^1.2.3", @@ -31,13 +29,9 @@ "@types/express": "^4.17.12", "@types/fs-extra": "^9.0.12", "@types/jsonwebtoken": "^8.5.0", - "@types/mongodb": "^3.6.9", - "@types/mongoose-autopopulate": "^0.10.1", - "@types/mongoose-lean-virtuals": "^0.5.1", "@types/multer": "^1.4.7", "@types/node": "^14.17.0", "@types/node-fetch": "^2.5.7", - "@types/uuid": "^8.3.0", "@zerollup/ts-transform-paths": "^1.7.18", "ts-patch": "^1.4.4" }, @@ -45,7 +39,6 @@ "@fosscord/util": "file:../util", "body-parser": "^1.19.0", "btoa": "^1.2.1", - "cheerio": "^1.0.0-rc.5", "dotenv": "^10.0.0", "exif-be-gone": "^1.2.0", "express": "^4.17.1", @@ -61,8 +54,7 @@ "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "supertest": "^6.1.6", - "typescript": "^4.1.2", - "uuid": "^8.3.2" + "typescript": "^4.1.2" }, "jest": { "setupFilesAfterEnv": [ diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json new file mode 100644 index 00000000..4d56041e Binary files /dev/null and b/dashboard/package-lock.json differ diff --git a/dashboard/package.json b/dashboard/package.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/dashboard/package.json @@ -0,0 +1 @@ +{} diff --git a/gateway/package-lock.json b/gateway/package-lock.json index 07ae02f9..085e40c0 100644 Binary files a/gateway/package-lock.json and b/gateway/package-lock.json differ diff --git a/gateway/package.json b/gateway/package.json index ddbddeff..d630c56b 100644 --- a/gateway/package.json +++ b/gateway/package.json @@ -8,23 +8,17 @@ "postinstall": "npx ts-patch install -s", "test": "echo \"Error: no test specified\" && exit 1", "start": "npm run build && node dist/start.js", - "build": "npx tsc -b .", + "build": "npx tsc -p .", "dev": "tsnd --respawn src/start.ts" }, "keywords": [], "author": "Fosscord", "license": "ISC", "devDependencies": { - "@swc/cli": "^0.1.51", - "@swc/core": "^1.2.93", "@types/amqplib": "^0.8.1", "@types/jsonwebtoken": "^8.5.0", - "@types/mongodb": "^3.6.9", - "@types/mongoose-autopopulate": "^0.10.1", - "@types/mongoose-lean-virtuals": "^0.5.1", "@types/node": "^14.17.9", "@types/node-fetch": "^2.5.12", - "@types/uuid": "^8.3.0", "@types/ws": "^7.4.0", "@zerollup/ts-transform-paths": "^1.7.18", "ts-node-dev": "^1.1.6", @@ -33,16 +27,13 @@ }, "dependencies": { "@fosscord/util": "file:../util", - "ajv": "^8.5.0", "amqplib": "^0.8.0", "dotenv": "^8.2.0", "jsonwebtoken": "^8.5.1", "lambert-server": "^1.2.11", "missing-native-js-functions": "^1.2.17", - "mongoose-autopopulate": "^0.12.3", "node-fetch": "^2.6.1", "typeorm": "^0.2.37", - "uuid": "^8.3.2", "ws": "^7.4.2" }, "optionalDependencies": { diff --git a/rtc/package-lock.json b/rtc/package-lock.json new file mode 100644 index 00000000..f39aac1c Binary files /dev/null and b/rtc/package-lock.json differ diff --git a/rtc/package.json b/rtc/package.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/rtc/package.json @@ -0,0 +1 @@ +{} diff --git a/util/package-lock.json b/util/package-lock.json index 0ce50636..fa4549c6 100644 Binary files a/util/package-lock.json and b/util/package-lock.json differ diff --git a/util/package.json b/util/package.json index 32204081..5efc16ae 100644 --- a/util/package.json +++ b/util/package.json @@ -8,7 +8,7 @@ "start": "npm run build && node dist/", "test": "npm run build && jest", "postinstall": "npm run build", - "build": "npx tsc -b ." + "build": "npx tsc -p ." }, "repository": { "type": "git", @@ -28,22 +28,15 @@ }, "homepage": "https://docs.fosscord.com/", "devDependencies": { - "@swc/cli": "^0.1.51", - "@swc/core": "^1.2.93", "@types/amqplib": "^0.8.1", "@types/jsonwebtoken": "^8.5.0", - "@types/mongoose-autopopulate": "^0.10.1", "@types/multer": "^1.4.7", "@types/node": "^14.17.9", "@types/node-fetch": "^2.5.12", "jest": "^27.0.6" }, "dependencies": { - "ajv": "^8.6.2", "amqplib": "^0.8.0", - "class-validator": "^0.13.1", - "dot-prop": "^6.0.1", - "env-paths": "^2.2.1", "jsonwebtoken": "^8.5.1", "lambert-server": "^1.2.11", "missing-native-js-functions": "^1.2.17", @@ -54,7 +47,6 @@ "pg": "^8.7.1", "reflect-metadata": "^0.1.13", "sqlite3": "^5.0.2", - "tsconfig-paths": "^3.11.0", "typeorm": "^0.2.37", "typescript": "^4.4.2", "typescript-json-schema": "^0.50.1" diff --git a/util/tsconfig.json b/util/tsconfig.json index cbd5db32..0398ce9a 100644 --- a/util/tsconfig.json +++ b/util/tsconfig.json @@ -1,10 +1,10 @@ { - "include": ["src/**/*.ts", "tests/Test.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { /* Visit https://aka.ms/tsconfig.json to read more about this file */ /* Basic Options */ - "incremental": true, /* Enable incremental compilation */ + "incremental": true /* 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. */, diff --git a/webrtc/package-lock.json b/webrtc/package-lock.json index 8419f0a9..a5db2de1 100644 Binary files a/webrtc/package-lock.json and b/webrtc/package-lock.json differ diff --git a/webrtc/package.json b/webrtc/package.json index 041dbbe3..0f700728 100644 --- a/webrtc/package.json +++ b/webrtc/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "test": "npm run build && node dist/test.js", - "build": "npx tsc -b .", + "build": "npx tsc -p .", "start": "npm run build && node dist/start.js" }, "keywords": [], @@ -17,7 +17,6 @@ "typescript": "^4.3.2" }, "dependencies": { - "../util": "*", "mediasoup": "^3.7.16", "node-turn": "^0.0.6", "ws": "^7.4.6"