chore: inlining json files as well for require

Author: abose

gulpfile.js/index.js

@@ -543,6 +543,7 @@ function containsRegExpExcludingEmpty(str) {
 
 
 const textContentMap = {};
+const excludeSuffixPathsInlining = ["MessageIds.json"];
 function inlineTextRequire(file, content, srcDir) {
     if(content.includes(`'text!`) || content.includes("`text!")) {
         throw new Error(`in file ${file} require("text!...") should always use a double quote "text! instead of " or \``);
@@ -551,18 +552,18 @@ function inlineTextRequire(file, content, srcDir) {
         const requireFragments = extractRequireTextFragments(content);
         for (const {requirePath, requireStatement} of requireFragments) {
             let textContent = textContentMap[requirePath];
+            let filePath = srcDir + requirePath;
+            if(requirePath.startsWith("./")) {
+                filePath = path.join(path.dirname(file), requirePath);
+            }
             if(!textContent){
-                let filePath = srcDir + requirePath;
-                if(requirePath.startsWith("./")) {
-                    filePath = path.join(path.dirname(file), requirePath);
-                }
                 console.log("reading file at path: ", filePath);
                 const fileContent = fs.readFileSync(filePath, "utf8");
                 textContentMap[requirePath] = fileContent;
                 textContent = fileContent;
             }
-            if(requirePath.endsWith(".js") || requirePath.endsWith(".json")) {
-                console.log("Not inlining JS/JSON file:", requirePath);
+            if(requirePath.endsWith(".js") || excludeSuffixPathsInlining.some(ext => requirePath.endsWith(ext))) {
+                console.warn("Not inlining JS/JSON file:", requirePath, filePath);
             } else {
                 console.log("Inlining", requireStatement);
                 if((requireStatement.includes(".html") || requireStatement.includes(".js"))

src/LiveDevelopment/BrowserScripts/LivePreviewTransportRemote.js

@@ -313,9 +313,10 @@
         }
     };
 
+    const ABS_REGEX = new RegExp("^(?:[a-z]+:)?\\/\\/", "i");
     function getAbsoluteUrl(url) {
         // Check if the URL is already absolute
-        if (/^(?:[a-z]+:)?\/\//i.test(url)) {
+        if (ABS_REGEX.test(url)) {
             return url; // The URL is already absolute
         }
 

src/LiveDevelopment/BrowserScripts/RemoteFunctions.js

@@ -3273,8 +3273,16 @@ function RemoteFunctions(config = {}) {
             const searchTerm = this._currentSearchQuery || 'image';
 
             // clean the search term and the photograper name to write in file name
-            const cleanSearchTerm = searchTerm.toLowerCase().replace(/[^a-z0-9]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
-            const cleanPhotographerName = photographerName.toLowerCase().replace(/[^a-z0-9]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
+            const cleanSearchTerm = searchTerm
+                .toLowerCase()
+                .replace(new RegExp("[^a-z0-9]", "g"), "-")
+                .replace(new RegExp("-+", "g"), "-")
+                .replace(new RegExp("^-|-$", "g"), "");
+            const cleanPhotographerName = photographerName
+                .toLowerCase()
+                .replace(new RegExp("[^a-z0-9]", "g"), "-")
+                .replace(new RegExp("-+", "g"), "-")
+                .replace(new RegExp("^-|-$", "g"), "");
 
             return `${cleanSearchTerm}-by-${cleanPhotographerName}`;
         },
@@ -3329,7 +3337,11 @@ function RemoteFunctions(config = {}) {
                 const extension = originalName.substring(originalName.lastIndexOf('.')) || '.jpg';
 
                 // we clean the file name because the file might have some chars which might not be compatible
-                const cleanName = nameWithoutExt.toLowerCase().replace(/[^a-z0-9]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
+                const cleanName = nameWithoutExt
+                    .toLowerCase()
+                    .replace(new RegExp("[^a-z0-9]", "g"), "-")
+                    .replace(new RegExp("-+", "g"), "-")
+                    .replace(new RegExp("^-|-$", "g"), "");
                 const filename = cleanName || 'selected-image';
 
                 // Use the unified _useImage method with isLocalFile flag
@@ -4767,7 +4779,9 @@ function RemoteFunctions(config = {}) {
                 return;
             }
 
-            targetID = edit.type.match(/textReplace|textDelete|textInsert|elementInsert|elementMove/) ? edit.parentID : edit.tagID;
+            targetID = new RegExp("textReplace|textDelete|textInsert|elementInsert|elementMove").test(edit.type)
+                ? edit.parentID : edit.tagID;
+
             targetElement = self._queryBracketsID(targetID);
 
             if (!targetElement && !editIsSpecialTag) {