:bug: fix (pre) install scripts

8 files changed, 28 insertions, 14 deletions

diff --git a/api/package.json b/api/package.json
index a1d3b5b2..580cfa2a 100644
--- a/api/package.json
+++ b/api/package.json
@@ -5,7 +5,7 @@
 	"main": "dist/Server.js",
 	"types": "dist/Server.d.ts",
 	"scripts": {
-		"prepare": "ts-patch install -s",
+		"prepare": "",
 		"test:only": "jest --coverage --verbose --forceExit ./tests",
 		"test": "npm run build && npm run test:only",
 		"test:watch": "jest --watch",
@@ -13,7 +13,7 @@
 		"build": "npx tsc -b .",
 		"build-docker": "tsc -p tsconfig-docker.json",
 		"dev": "tsnd --respawn src/start.ts",
-		"patch": "npx patch-package",
+		"patch": "ts-patch install -s && npx patch-package",
 		"postinstall": "npm run patch",
 		"generate:docs": "node scripts/generate_openapi.ts",
 		"generate:schema": "node scripts/generate_schema.ts"
diff --git a/bundle/package-lock.json b/bundle/package-lock.json
index 0ed6b03a..aaa0c1ee 100644
--- a/bundle/package-lock.json
+++ b/bundle/package-lock.json
@@ -64,7 +64,7 @@
 				"express": "^4.17.1",
 				"express-validator": "^6.9.2",
 				"form-data": "^3.0.0",
-				"i18next": "^19.8.5",
+				"i18next": "^19.9.2",
 				"i18next-http-middleware": "^3.1.3",
 				"i18next-node-fs-backend": "^2.1.3",
 				"jsonwebtoken": "^8.5.1",
@@ -90,6 +90,7 @@
 				"@types/express": "^4.17.9",
 				"@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": "^5.10.5",
@@ -105,6 +106,8 @@
 				"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",
@@ -116,6 +119,7 @@
 		"../cdn": {
 			"name": "@fosscord/cdn",
 			"version": "1.0.0",
+			"hasInstallScript": true,
 			"license": "ISC",
 			"dependencies": {
 				"@fosscord/util": "file:../util",
@@ -154,12 +158,14 @@
 				"@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"
 			}
 		},
 		"../gateway": {
 			"name": "@fosscord/gateway",
 			"version": "1.0.0",
+			"hasInstallScript": true,
 			"license": "ISC",
 			"dependencies": {
 				"@fosscord/util": "file:../util",
@@ -185,6 +191,7 @@
 				"@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",
 				"ts-patch": "^1.4.4",
 				"typescript": "^4.2.3"
@@ -1692,6 +1699,7 @@
 				"@types/express": "^4.17.9",
 				"@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": "^5.10.5",
@@ -1720,11 +1728,13 @@
 				"express": "^4.17.1",
 				"express-validator": "^6.9.2",
 				"form-data": "^3.0.0",
-				"i18next": "^19.8.5",
+				"i18next": "^19.9.2",
 				"i18next-http-middleware": "^3.1.3",
 				"i18next-node-fs-backend": "^2.1.3",
 				"image-size": "^1.0.0",
 				"jest": "^26.6.3",
+				"jest-expect-message": "^1.0.2",
+				"jest-runtime": "^27.2.1",
 				"jsonwebtoken": "^8.5.1",
 				"lambert-server": "^1.2.10",
 				"missing-native-js-functions": "^1.2.15",
@@ -1764,6 +1774,7 @@
 				"@types/node": "^14.17.0",
 				"@types/node-fetch": "^2.5.7",
 				"@types/uuid": "^8.3.0",
+				"@zerollup/ts-transform-paths": "^1.7.18",
 				"body-parser": "^1.19.0",
 				"btoa": "^1.2.1",
 				"cheerio": "^1.0.0-rc.5",
@@ -1799,6 +1810,7 @@
 				"@types/node-fetch": "^2.5.12",
 				"@types/uuid": "^8.3.0",
 				"@types/ws": "^7.4.0",
+				"@zerollup/ts-transform-paths": "^1.7.18",
 				"ajv": "^8.5.0",
 				"amqplib": "^0.8.0",
 				"dotenv": "^8.2.0",
diff --git a/bundle/package.json b/bundle/package.json
index 4b4e8286..c2b6851e 100644
--- a/bundle/package.json
+++ b/bundle/package.json
@@ -5,7 +5,7 @@
 	"main": "src/start.js",
 	"scripts": {
 		"prepare": "ts-patch install -s",
-		"preinstall": "cd ../util && npm i && cd ../api && npm i && cd ../cdn && npm i && cd ../gateway && npm i",
+		"preinstall": "cd ../util && npm --production=false i && cd ../api && npm --production=false i && cd ../cdn && npm --production=false i && cd ../gateway && npm --production=false i",
 		"build": "npm run build:util && npm run build:api && npm run build:cdn && npm run build:gateway && npm run build:bundle",
 		"build:bundle": "npx tsc -b .",
 		"build:util": "cd ../util/ && npm run build",
diff --git a/cdn/package-lock.json b/cdn/package-lock.json
index b6faa0e4..d0b2c50e 100644
--- a/cdn/package-lock.json
+++ b/cdn/package-lock.json
@@ -7,6 +7,7 @@
 		"": {
 			"name": "@fosscord/cdn",
 			"version": "1.0.0",
+			"hasInstallScript": true,
 			"license": "ISC",
 			"dependencies": {
 				"@fosscord/util": "file:../util",
diff --git a/cdn/package.json b/cdn/package.json
index 9d4fa942..bb4603be 100644
--- a/cdn/package.json
+++ b/cdn/package.json
@@ -1,26 +1,26 @@
 {
 	"name": "@fosscord/cdn",
 	"version": "1.0.0",
-	"description": "cdn for discord clone",
+	"description": "cdn for fosscord",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"scripts": {
-		"prepare": "ts-patch install -s",
+		"postinstall": "ts-patch install -s",
 		"test": "npm run build && jest --coverage ./tests",
 		"build": "npx tsc -b .",
 		"start": "npm run build && node dist/start.js"
 	},
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discord-open-source/discord-cdn.git"
+		"url": "git+https://github.com/fosscord/fosscord-server.git"
 	},
 	"keywords": [],
 	"author": "",
 	"license": "ISC",
 	"bugs": {
-		"url": "https://github.com/discord-open-source/discord-cdn/issues"
+		"url": "https://github.com/fosscord/fosscord-server/issues"
 	},
-	"homepage": "https://github.com/discord-open-source/discord-cdn#readme",
+	"homepage": "https://github.com/fosscord/fosscord-server#readme",
 	"devDependencies": {
 		"@types/amqplib": "^0.8.1",
 		"@types/body-parser": "^1.19.0",
diff --git a/gateway/package-lock.json b/gateway/package-lock.json
index 7b9c8d3a..22401915 100644
--- a/gateway/package-lock.json
+++ b/gateway/package-lock.json
@@ -7,6 +7,7 @@
 		"": {
 			"name": "@fosscord/gateway",
 			"version": "1.0.0",
+			"hasInstallScript": true,
 			"license": "ISC",
 			"dependencies": {
 				"@fosscord/util": "file:../util",
diff --git a/gateway/package.json b/gateway/package.json
index 595d0205..a845f907 100644
--- a/gateway/package.json
+++ b/gateway/package.json
@@ -4,7 +4,7 @@
 	"description": "",
 	"main": "dist/index.js",
 	"scripts": {
-		"prepare": "ts-patch install -s",
+		"postinstall": "ts-patch install -s",
 		"test": "echo \"Error: no test specified\" && exit 1",
 		"start": "npm run build && node dist/start.js",
 		"build": "npx tsc -b .",
diff --git a/util/package.json b/util/package.json
index 2fa93f9b..0e81a544 100644
--- a/util/package.json
+++ b/util/package.json
@@ -12,19 +12,19 @@
 	},
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/fosscord/fosscord-server-util.git"
+		"url": "git+https://github.com/fosscord/fosscord-server.git"
 	},
 	"keywords": [
 		"discord",
 		"fosscord",
-		"fosscord-server-util",
+		"fosscord-server",
 		"discord open source",
 		"discord-open-source"
 	],
 	"author": "Fosscord",
 	"license": "GPLV3",
 	"bugs": {
-		"url": "https://github.com/fosscord/fosscord-server-util/issues"
+		"url": "https://github.com/fosscord/fosscord-server/issues"
 	},
 	"homepage": "https://docs.fosscord.com/",
 	"devDependencies": {