fix: merge existing baseEnvironment data and dataPropertyOrder on import

Author: PhilKes

Diff for: packages/insomnia/src/common/import.ts

@@ -1,4 +1,5 @@
 import { readFile } from 'fs/promises';
+import orderedJSON from "json-order";
 
 import { type ApiSpec, isApiSpec } from '../models/api-spec';
 import { type CookieJar, isCookieJar } from '../models/cookie-jar';
@@ -21,6 +22,7 @@ import type { CurrentPlan } from '../ui/routes/organization';
 import { convert, type InsomniaImporter } from '../utils/importers/convert';
 import { id as postmanEnvImporterId } from '../utils/importers/importers/postman-env';
 import { invariant } from '../utils/invariant';
+import { JSON_ORDER_PREFIX, JSON_ORDER_SEPARATOR } from './constants';
 import { database as db } from './database';
 import { importInsomniaV5Data } from './insomnia-v5';
 import { generateId } from './misc';
@@ -378,7 +380,16 @@ export const importResourcesToWorkspace = async ({ workspaceId }: { workspaceId:
 
     const baseEnvironmentFromResources = resources.filter(isEnvironment).find(env => env.parentId && env.parentId.startsWith('__WORKSPACE_ID__'));
     if (baseEnvironmentFromResources) {
-      await models.environment.update(baseEnvironment, { data: baseEnvironmentFromResources.data });
+      const data = { ...baseEnvironment.data, ...baseEnvironmentFromResources.data }
+      const orderedJson = orderedJSON.parse<Record<string, any>>(
+          JSON.stringify(data || []),
+          JSON_ORDER_PREFIX,
+          JSON_ORDER_SEPARATOR,
+      );
+       await models.environment.update(baseEnvironment, {
+        data: orderedJson.object,
+        dataPropertyOrder: orderedJson.map
+      });
     }
     const subEnvironments = resources.filter(isEnvironment).filter(isSubEnvironmentResource) || [];