fix: initial stuck client if root_url is wrong (#30913)

RocketChat · Dec 8, 2023 · 79029f0 · 79029f0
1 parent 715328b
commit 79029f0
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/apps/meteor/server/startup/initialData.js b/apps/meteor/server/startup/initialData.js
@@ -13,6 +13,36 @@ import { validateEmail } from '../../lib/emailValidator';
 import { addUserRolesAsync } from '../lib/roles/addUserRoles';
 
 Meteor.startup(async () => {
+	const dynamicImport = {
+		'dynamic-import': {
+			useLocationOrigin: true,
+		},
+	};
+
+	if (!Meteor.settings) {
+		Meteor.settings = {
+			public: {
+				packages: {
+					'dynamic-import': dynamicImport,
+				},
+			},
+		};
+	}
+
+	if (!Meteor.settings.public) {
+		Meteor.settings.public = {
+			packages: {
+				'dynamic-import': dynamicImport,
+			},
+		};
+	}
+
+	if (!Meteor.settings.public.packages) {
+		Meteor.settings.public.packages = dynamicImport;
+	}
+
+	Meteor.settings.public.packages['dynamic-import'] = dynamicImport['dynamic-import'];
+
 	if (!settings.get('Initial_Channel_Created')) {
 		const exists = await Rooms.findOneById('GENERAL', { projection: { _id: 1 } });
 		if (!exists) {