Merge pull request #7 from marcoveeneman/custom-vendor

feat: Allow theme in the different vendor directory
magesuite · Oct 8, 2021 · 867c21c · 867c21c
2 parents 331345c + 8d53af7
commit 867c21c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/gulp/parentAliases.js b/gulp/parentAliases.js
@@ -11,12 +11,13 @@ const traverseAliases = themePath => {
     );
 
     const parentMatch = themeXML.match(
-        /<parent>[a-z]+\/[^\-]+\-([a-z]+)<\/parent>/i
+        /<parent>([a-z]+)\/[^\-]+\-([a-z]+)<\/parent>/i
     );
 
     if (parentMatch) {
-        const parentName = parentMatch[1];
-        const parentPath = path.resolve(`../theme-${parentName}`);
+        const parentVendor = parentMatch[1].toLowerCase();
+        const parentName = parentMatch[2];
+        const parentPath = path.resolve(`../../${parentVendor}/theme-${parentName}`);
 
         if (fs.existsSync(parentPath)) {
             const aliases = {