BC-5828 - feathersJs upgrade (#4568)

Co-authored-by: SevenWaysDP <[email protected]>
hpi-schul-cloud · Dec 6, 2023 · 092c2f9 · 092c2f9
1 parent 1df15ec
commit 092c2f9
Show file tree

Hide file tree

Showing 48 changed files with 995 additions and 500 deletions.
diff --git a/apps/server/src/apps/server.app.ts b/apps/server/src/apps/server.app.ts
@@ -49,7 +49,7 @@ async function bootstrap() {
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 	const feathersExpress = await legacyAppPromise(orm);
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-	feathersExpress.setup();
+	await feathersExpress.setup();
 
 	// set reference to legacy app as an express setting so we can
 	// access it over the current request within FeathersServiceProvider

diff --git a/config/default.json b/config/default.json
@@ -2,12 +2,9 @@
 	"$schema": "./default.schema.json",
 	"host": "localhost",
 	"port": 3030,
-	"public": "../public/",
+	"public": "./public/",
 	"services": {
-		"calendar": "http://localhost:3000",
-		"content": "https://content.schul-cloud.org",
-		"hydra": "http://localhost:9001",
-		"web": "http://localhost:3100"
+		"hydra": "http://localhost:9001"
 	},
 	"I18N": {
 		"AVAILABLE_LANGUAGES": "de,en,es,uk",

diff --git a/config/production.json b/config/production.json
@@ -3,11 +3,8 @@
 	"host": "localhost",
 	"port": "PORT",
 	"mongodb": "MONGO_URI",
-	"public": "../public/",
+	"public": "./public/",
 	"services": {
-		"calendar": "CALENDAR_URI",
-		"content": "CONTENT_URI",
-		"hydra": "HYDRA_URI",
-		"web": "HOST"
+		"hydra": "HYDRA_URI"
 	}
 }
diff --git a/config/test.json b/config/test.json
@@ -5,11 +5,7 @@
 	"SC_DOMAIN": "localhost",
 	"PUBLIC_BACKEND_URL": "http://localhost:3030/api",
 	"DB_URL": "mongodb://127.0.0.1:27017/schulcloud-test",
-	"public": "../public/",
-	"services": {
-		"calendar": "https://schul.tech:3000",
-		"content": "https://content.schul-cloud.org"
-	},
+	"public": "./public/",
 	"FORCE_SEND_EMAIL": true,
 	"LDAP_PASSWORD_ENCRYPTION_KEY": "1234567890123456",
 	"AES_KEY": "6543210987654321",

diff --git a/esbuild/esmodules-bundler.js b/esbuild/esmodules-bundler.js
@@ -31,6 +31,9 @@ const options = [
 	{
 		pathToResolutionModeError: 'node_modules/strtok3/lib/types.d.ts',
 	},
+	{
+		noExportedMember: 'node_modules/@feathersjs/express/lib/declarations.d.ts',
+	},
 ];
 
 const globalOptions = {
@@ -41,11 +44,16 @@ const globalOptions = {
 	loader: { '.js': 'jsx' },
 };
 
-function replace(pathToResolutionModeError) {
-	const file = resolve(__dirname, '..', pathToResolutionModeError);
+function replace(type, filePath) {
+	const file = resolve(__dirname, '..', filePath);
 	fs.readFile(file, 'utf8', (err, data) => {
 		if (err) throw err;
-		const result = data.replace(/resolution-mode="require"/g, '');
+		let result = data;
+		if (type === 'pathToResolutionModeError') {
+			result = data.replace(/resolution-mode="require"/g, '');
+		} else if (type === 'noExportedMember') {
+			result = `// @ts-nocheck\n\n${data}`;
+		}
 
 		fs.writeFile(file, result, 'utf8', (err) => {
 			if (err) throw err;
@@ -54,7 +62,7 @@ function replace(pathToResolutionModeError) {
 }
 
 for (const option of options) {
-	const { entryPoint, outdir, pathToResolutionModeError } = option;
+	const { entryPoint, outdir, pathToResolutionModeError, noExportedMember } = option;
 	try {
 		if (entryPoint && outdir) {
 			build({
@@ -71,7 +79,10 @@ for (const option of options) {
 
 		// remove resolution-mode="require" from file because it provokes an error in the commonjs build
 		if (pathToResolutionModeError) {
-			replace(pathToResolutionModeError);
+			replace('pathToResolutionModeError', pathToResolutionModeError);
+		}
+		if (noExportedMember) {
+			replace('noExportedMember', noExportedMember);
 		}
 	} catch (e) {
 		process.exit(1);