Merge pull request #1345 from contentstack/fix/CS-44467

Fix/CS-44467 - Fixed broken Embedded assets links in JSON rte after import
contentstack · Mar 22, 2024 · f9ca0c4 · f9ca0c4
2 parents 57b541c + c7a3f12
commit f9ca0c4
Show file tree

Hide file tree

Showing 7 changed files with 444 additions and 388 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@colors/colors": "^1.5.0",
     "@contentstack/cli-cm-export": "~1.11.1",
-    "@contentstack/cli-cm-import": "~1.14.2",
+    "@contentstack/cli-cm-import": "~1.14.3",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "async": "^3.2.4",

diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

diff --git a/packages/contentstack-import/src/utils/asset-helper.ts b/packages/contentstack-import/src/utils/asset-helper.ts
@@ -1,7 +1,7 @@
 import Bluebird from 'bluebird';
 import * as url from 'url';
 import * as path from 'path';
-import { ContentstackClient, managementSDKClient, escapeRegExp } from '@contentstack/cli-utilities';
+import { ContentstackClient, managementSDKClient } from '@contentstack/cli-utilities';
 import { ImportConfig } from '../types';
 const debug = require('debug')('util:requests');
 let _ = require('lodash');
@@ -10,6 +10,8 @@ let helper = require('./file-helper');
 
 const MAX_RETRY_LIMIT = 5;
 
+const escapeRegExp = (str: string) => str.replace(/[*+?^${}()|[\]\\]/g, '\\$&');
+
 function validate(req: any) {
   if (typeof req !== 'object') {
     throw new Error(`Invalid params passed for request\n${JSON.stringify(arguments)}`);
@@ -249,8 +251,8 @@ export const lookupAssets = function (
   assetUrls.forEach(function (assetUrl: any) {
     let mappedAssetUrl = mappedAssetUrls[assetUrl];
     if (typeof mappedAssetUrl !== 'undefined') {
-      const sanitizedUrl = escapeRegExp(assetUrl);
-      const escapedMappedUrl = escapeRegExp(mappedAssetUrl);
+      const sanitizedUrl = escapeRegExp(assetUrl).replace(/\.\./g, '\\$&');
+      const escapedMappedUrl = escapeRegExp(mappedAssetUrl).replace(/\.\./g, '\\$&');
       entry = entry.replace(new RegExp(sanitizedUrl, 'img'), escapedMappedUrl);
       matchedUrls.push(mappedAssetUrl);
     } else {

diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.14.2",
+    "@contentstack/cli-cm-import": "~1.14.3",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "inquirer": "8.2.4",

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run"
@@ -30,7 +30,7 @@
     "@contentstack/cli-cm-export": "~1.11.1",
     "@contentstack/cli-cm-clone": "~1.10.1",
     "@contentstack/cli-cm-export-to-csv": "~1.7.0",
-    "@contentstack/cli-cm-import": "~1.14.2",
+    "@contentstack/cli-cm-import": "~1.14.3",
     "@contentstack/cli-cm-migrate-rte": "~1.4.15",
     "@contentstack/cli-cm-seed": "~1.7.2",
     "@contentstack/cli-command": "~1.2.17",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml