Merge branch 'develop' into chore/remove-allowed-routes-for-deprecate…

…d-query-and-fields
RocketChat · Oct 19, 2024 · 544058c · 544058c
2 parents b0cb26e + 5f3ae1c
commit 544058c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/apps/meteor/ee/app/license/server/index.ts b/apps/meteor/ee/app/license/server/index.ts
@@ -1,3 +1,2 @@
 import './settings';
 import './methods';
-import './airGappedRestrictions';
diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts
@@ -115,6 +115,7 @@ export const startLicense = async () => {
 	return new Promise<void>((resolve) => {
 		// When settings are loaded, apply the current license if there is one.
 		settings.onReady(async () => {
+			import('./airGappedRestrictions');
 			if (!(await applyLicense(settings.get<string>('Enterprise_License') ?? '', false))) {
 				// License from the envvar is always treated as new, because it would have been saved on the setting if it was already in use.
 				if (process.env.ROCKETCHAT_LICENSE && !License.hasValidLicense()) {