Adds required backslash changes for windows compatibility (#11606)

archesproject · Nov 8, 2024 · ceaa937 · ceaa937
1 parent 9dc2cb4
commit ceaa937
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/arches/install/arches-templates/webpack/webpack-utils/build-filepath-lookup.js b/arches/install/arches-templates/webpack/webpack-utils/build-filepath-lookup.js
@@ -4,6 +4,7 @@ const Path = require('path');
 const fs = require('fs');
 
 function buildFilepathLookup(path, staticUrlPrefix) {
+    path = path.replace(/\\/g, '/')
     if (!fs.existsSync(path)) {
         return;
     }
@@ -13,7 +14,7 @@ function buildFilepathLookup(path, staticUrlPrefix) {
 
     const getFileList = function (dirPath) {
         return fs.readdirSync(dirPath, { withFileTypes: true }).reduce((fileList,entries) => {
-            const childPath = Path.join(dirPath, entries.name);
+            const childPath = Path.join(dirPath, entries.name).replace(/\\/g, '/');
 
             if (entries.isDirectory()) {
                 fileList.push(...getFileList(childPath, fileList));
@@ -37,7 +38,7 @@ function buildFilepathLookup(path, staticUrlPrefix) {
             lookup[file.replace(path,'').replace(/\\/g, '/').replace(extensionReplacementRegex,'').replace(/^\//,'')] = {"import": file, "filename": `${prefix}/[name].${extension}`};
         }
         else if (extension === 'css' || extension === 'scss') {
-            lookup[Path.join('css', file.replace(path,'').replace(/\\/g, '/')).replace(extensionReplacementRegex,'').replace(/^\//,'')] = { 'import': file };
+            lookup[Path.join('css', file.replace(path,'')).replace(/\\/g, '/').replace(extensionReplacementRegex,'').replace(/^\//,'')] = { 'import': file };
         }
         else {
             // staticUrl used for images

diff --git a/webpack/webpack-utils/build-filepath-lookup.js b/webpack/webpack-utils/build-filepath-lookup.js
@@ -4,6 +4,7 @@ const Path = require('path');
 const fs = require('fs');
 
 function buildFilepathLookup(path, staticUrlPrefix) {
+    path = path.replace(/\\/g, '/')
     if (!fs.existsSync(path)) {
         return;
     }
@@ -13,7 +14,7 @@ function buildFilepathLookup(path, staticUrlPrefix) {
 
     const getFileList = function (dirPath) {
         return fs.readdirSync(dirPath, { withFileTypes: true }).reduce((fileList,entries) => {
-            const childPath = Path.join(dirPath, entries.name);
+            const childPath = Path.join(dirPath, entries.name).replace(/\\/g, '/');
 
             if (entries.isDirectory()) {
                 fileList.push(...getFileList(childPath, fileList));
@@ -37,7 +38,7 @@ function buildFilepathLookup(path, staticUrlPrefix) {
             lookup[file.replace(path,'').replace(/\\/g, '/').replace(extensionReplacementRegex,'').replace(/^\//,'')] = {"import": file, "filename": `${prefix}/[name].${extension}`};
         }
         else if (extension === 'css' || extension === 'scss') {
-            lookup[Path.join('css', file.replace(path,'').replace(/\\/g, '/')).replace(extensionReplacementRegex,'').replace(/^\//,'')] = { 'import': file };
+            lookup[Path.join('css', file.replace(path,'')).replace(/\\/g, '/').replace(extensionReplacementRegex,'').replace(/^\//,'')] = { 'import': file };
         }
         else {
             // staticUrl used for images