Merge branch 'feature/cli-optimise' of github.com:contentstack/migration-v2-node-server into feature/cli-optimise

Author: AishDani

api/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "build": "npx tsc",
     "start": "NODE_ENV=production node dist/server.js",
-    "dev": "NODE_ENV=production tsx watch ./src/server.ts",
+    "dev": "NODE_ENV=production tsx ./src/server.ts",
     "prettify": "prettier --write .",
     "windev": "SET NODE_ENV=production&& tsx watch ./src/server.ts",
     "winstart": "SET NODE_ENV=production&& node dist/server.js",
@@ -45,7 +45,6 @@
     "jsonwebtoken": "^9.0.2",
     "lowdb": "^7.0.1",
     "mkdirp": "^3.0.1",
-    "nodemon": "^3.1.9",
     "p-limit": "^6.2.0",
     "path-to-regexp": "^8.2.0",
     "router": "^2.0.0",

api/src/services/migration.service.ts

@@ -369,13 +369,46 @@ const startTestMigration = async (req: Request): Promise<any> => {
       }
       case CMS.CONTENTFUL: {
         const cleanLocalPath = file_path?.replace?.(/\/$/, '');
-        await contentfulService?.createLocale(cleanLocalPath, project?.current_test_stack_id, projectId, project);
-        await contentfulService?.createRefrence(cleanLocalPath, project?.current_test_stack_id, projectId);
-        await contentfulService?.createWebhooks(cleanLocalPath, project?.current_test_stack_id, projectId);
-        await contentfulService?.createEnvironment(cleanLocalPath, project?.current_test_stack_id, projectId);
-        await contentfulService?.createAssets(cleanLocalPath, project?.current_test_stack_id, projectId, true);
-        await contentfulService?.createEntry(cleanLocalPath, project?.current_test_stack_id, projectId, contentTypes, project?.mapperKeys, project?.stackDetails?.master_locale, project);
-        await contentfulService?.createVersionFile(project?.current_test_stack_id, projectId);
+        await contentfulService?.createLocale(
+          cleanLocalPath,
+          project?.current_test_stack_id,
+          projectId,
+          project
+        );
+        await contentfulService?.createRefrence(
+          cleanLocalPath,
+          project?.current_test_stack_id,
+          projectId
+        );
+        await contentfulService?.createWebhooks(
+          cleanLocalPath,
+          project?.current_test_stack_id,
+          projectId
+        );
+        await contentfulService?.createEnvironment(
+          cleanLocalPath,
+          project?.current_test_stack_id,
+          projectId
+        );
+        await contentfulService?.createAssets(
+          cleanLocalPath,
+          project?.current_test_stack_id,
+          projectId,
+          true
+        );
+        await contentfulService?.createEntry(
+          cleanLocalPath,
+          project?.current_test_stack_id,
+          projectId,
+          contentTypes,
+          project?.mapperKeys,
+          project?.stackDetails?.master_locale,
+          project
+        );
+        await contentfulService?.createVersionFile(
+          project?.current_test_stack_id,
+          projectId
+        );
         break;
       }
       default:
@@ -545,13 +578,45 @@ const startMigration = async (req: Request): Promise<any> => {
       }
       case CMS.CONTENTFUL: {
         const cleanLocalPath = file_path?.replace?.(/\/$/, '');
-        await contentfulService?.createLocale(cleanLocalPath, project?.destination_stack_id, projectId, project);
-        await contentfulService?.createRefrence(cleanLocalPath, project?.destination_stack_id, projectId);
-        await contentfulService?.createWebhooks(cleanLocalPath, project?.destination_stack_id, projectId);
-        await contentfulService?.createEnvironment(cleanLocalPath, project?.destination_stack_id, projectId);
-        await contentfulService?.createAssets(cleanLocalPath, project?.destination_stack_id, projectId);
-        await contentfulService?.createEntry(cleanLocalPath, project?.destination_stack_id, projectId, contentTypes, project?.mapperKeys, project?.stackDetails?.master_locale, project);
-        await contentfulService?.createVersionFile(project?.destination_stack_id, projectId);
+        await contentfulService?.createLocale(
+          cleanLocalPath,
+          project?.destination_stack_id,
+          projectId,
+          project
+        );
+        await contentfulService?.createRefrence(
+          cleanLocalPath,
+          project?.destination_stack_id,
+          projectId
+        );
+        await contentfulService?.createWebhooks(
+          cleanLocalPath,
+          project?.destination_stack_id,
+          projectId
+        );
+        await contentfulService?.createEnvironment(
+          cleanLocalPath,
+          project?.destination_stack_id,
+          projectId
+        );
+        await contentfulService?.createAssets(
+          cleanLocalPath,
+          project?.destination_stack_id,
+          projectId
+        );
+        await contentfulService?.createEntry(
+          cleanLocalPath,
+          project?.destination_stack_id,
+          projectId,
+          contentTypes,
+          project?.mapperKeys,
+          project?.stackDetails?.master_locale,
+          project
+        );
+        await contentfulService?.createVersionFile(
+          project?.destination_stack_id,
+          projectId
+        );
         break;
       }
       default:
@@ -620,7 +685,6 @@ const getLogs = async (req: Request): Promise<any> => {
  * @throws Exception if the project ID is invalid or the when the path to project.json is incorrect
  */
 export const createSourceLocales = async (req: Request) => {
-
   const projectId = req?.params?.projectId;
   const locales = req?.body?.locale;
 

ui/package-lock.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "tsc && node build/index.js",
-    "dev": "nodemon --watch src --ext ts --exec 'tsc && node build/index.js'",
+    "dev": "tsc --watch & node --watch build/index.js",
     "validation": "tsc && node build/main.js",
     "prettify": "prettier --write .",
     "lint": "eslint .",