From 21644a9d9961b7ae17f4c5be7c2e3ffa672c5f3c Mon Sep 17 00:00:00 2001
From: lizhouze <lizhouze@huawei.com>
Date: Sat, 19 Mar 2022 11:09:39 +0800
Subject: [PATCH] lizhouze@huawei.com

Signed-off-by: lizhouze <lizhouze@huawei.com>
---
 ace-loader/src/compile-plugin.js | 41 ++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/ace-loader/src/compile-plugin.js b/ace-loader/src/compile-plugin.js
index 2ad8ed4..c0f3c57 100644
--- a/ace-loader/src/compile-plugin.js
+++ b/ace-loader/src/compile-plugin.js
@@ -51,21 +51,48 @@ class ResultStates {
     const buildPath = this.options.build;
     const commonPaths = new Set();
     const i18nPaths = new Set();
+    const depsPackage = [];
 
     compiler.hooks.compilation.tap('toFindModule', (compilation) => {
       compilation.hooks.buildModule.tap("findModule", (module) => {
         if (/node_modules/.test(module.context)) {
           const beforNodeModules = module.context.substr(0, module.context.indexOf('node_modules'));
-          const afterNodeModules =
-            module.context.replace(beforNodeModules, '').replace('node_modules' + path.sep, '');
-          const src = afterNodeModules.substr(0, afterNodeModules.indexOf(path.sep));
-          const commonPath =
-            path.resolve(beforNodeModules, 'node_modules', src, 'src', 'js', 'common');
+          if (depsPackage == 0) {
+            const packageFilePath = path.join(beforNodeModules, 'package.json');
+            if ((!fs.existsSync(packageFilePath)) || (!fs.statSync(packageFilePath).isFile())) {
+              return;
+            }
+            try {
+              const packageFileObject = JSON.parse(fs.readFileSync(packageFilePath, "utf-8"));
+              if (packageFileObject['dependencies']) {
+                Object.keys(packageFileObject['dependencies']).forEach(key => {
+                  depsPackage.push(key);
+                })
+              }
+            } catch (err) {
+            }
+          }
+
+          let inPackage = false;
+          let modulePath = '';
+          depsPackage.forEach(value => {
+            if (module.context.indexOf(value) > 0) {
+              inPackage = true;
+              modulePath = path.join(beforNodeModules, 'node_modules', value);
+            }
+          });
+          if ((!inPackage) || (modulePath === '') || (!fs.existsSync(modulePath))) {
+            const afterNodeModules =
+              module.context.replace(beforNodeModules, '').replace('node_modules' + path.sep, '');
+            const src = afterNodeModules.substr(0, afterNodeModules.indexOf('src' + path.sep + 'main'))
+            modulePath = path.join(beforNodeModules, 'node_modules',  src);
+          }
+
+          const commonPath = path.resolve(modulePath, 'src', 'main', 'js', 'common');
           if (fs.existsSync(commonPath)) {
             commonPaths.add(commonPath)
           }
-          const i18nPath =
-            path.resolve(beforNodeModules, 'node_modules', src, 'src', 'js', 'i18n');
+          const i18nPath = path.resolve(modulePath, 'src', 'main', 'js', 'i18n');
           if (fs.existsSync(i18nPath)) {
             i18nPaths.add(i18nPath)
           }