From 5983a0f98bae0c9f340eb14e0d6c4b46e8f008cd Mon Sep 17 00:00:00 2001
From: wkj <278599135@qq.com>
Date: Tue, 15 Aug 2023 20:32:10 +0800
Subject: [PATCH] =?UTF-8?q?i18n=E7=BC=96=E8=AF=91=20=E9=80=82=E9=85=8Dmac?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/babel-plugin/oakI18n.js | 15 ++++++++++-----
 scripts/build-mp.js            |  4 ----
 scripts/build-web.js           |  4 ----
 scripts/start-mp.js            |  4 ----
 scripts/start-web.js           |  4 +---
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/config/babel-plugin/oakI18n.js b/config/babel-plugin/oakI18n.js
index a753054..14e9d51 100644
--- a/config/babel-plugin/oakI18n.js
+++ b/config/babel-plugin/oakI18n.js
@@ -14,7 +14,10 @@ function parseFileModuleAndNs(cwd, filename) {
     const relativePath = relative(cwd, filename);
 
     if (relativePath.startsWith('node_modules') || relativePath.startsWith('..')) { // 在测试环境下是相对路径
-        const moduleRelativePath = relativePath.split('\\').slice(0, 2);
+        const moduleRelativePath = relativePath
+            .replace(/\\/g, '/')
+            .split('/')
+            .slice(0, 2);
         const modulePath = join(cwd, ...moduleRelativePath);
         const moduleDir = moduleRelativePath[1];
 
@@ -23,9 +26,10 @@ function parseFileModuleAndNs(cwd, filename) {
             const { name } = require(join(modulePath, 'package.json'));
             ModuleDict[moduleDir] = name;
             moduleName = name;
-            console.log(moduleDir, name);
         }
-        const rel2paths = relative(modulePath, filename).split('\\');
+        const rel2paths = relative(modulePath, filename)
+            .replace(/\\/g, '/')
+            .split('/');
 
         let ns;
         switch (rel2paths[1]) {
@@ -51,10 +55,11 @@ function parseFileModuleAndNs(cwd, filename) {
             const { name } = require(join(cwd, 'package.json'));
             ModuleDict['./'] = name;
             moduleName = name;
-            console.log('./', name);
         }
 
-        const rel2paths = relative(cwd, filename).split('\\');
+        const rel2paths = relative(cwd, filename)
+            .replace(/\\/g, '/')
+            .split('/');
 
         let ns;
         switch (rel2paths[1]) {
diff --git a/scripts/build-mp.js b/scripts/build-mp.js
index 97d2715..450986a 100644
--- a/scripts/build-mp.js
+++ b/scripts/build-mp.js
@@ -12,10 +12,6 @@ const env = getClientEnvironment();
 
 fs.emptyDirSync(paths.appBuild);
 
-//copy
-const { copyLocaleFiles } = require('./locales/copy-mp-locales');
-copyLocaleFiles();
-
 webpack(config, (err, stats) => {
     if (err) {
         console.log(chalk.red(err.stack || err));
diff --git a/scripts/build-web.js b/scripts/build-web.js
index 3cf526b..5220ba2 100644
--- a/scripts/build-web.js
+++ b/scripts/build-web.js
@@ -214,8 +214,4 @@ function copyPublicFolder() {
         dereference: true,
         filter: (file) => file !== paths.appHtml,
     });
-
-    //copy
-    const { copyLocaleFiles } = require('./locales/copy-web-locales');
-    copyLocaleFiles();
 }
diff --git a/scripts/start-mp.js b/scripts/start-mp.js
index fc3fd52..f9c35fd 100644
--- a/scripts/start-mp.js
+++ b/scripts/start-mp.js
@@ -12,10 +12,6 @@ const env = getClientEnvironment();
 
 fs.emptyDirSync(paths.appBuild);
 
-//copy
-const { copyLocaleFiles } = require('./locales/copy-mp-locales');
-copyLocaleFiles();
-
 webpack(config, (err, stats) => {
     if (err) {
         console.log(chalk.red(err.stack || err));
diff --git a/scripts/start-web.js b/scripts/start-web.js
index 5c216d9..666bfc3 100644
--- a/scripts/start-web.js
+++ b/scripts/start-web.js
@@ -112,9 +112,7 @@ checkBrowsers(paths.appPath, isInteractive)
         host: HOST,
         port,
     };
-    //copy
-    const { copyLocaleFiles } = require('./locales/copy-web-locales');
-    copyLocaleFiles();
+
     const devServer = new WebpackDevServer(serverConfig, compiler);
     // Launch WebpackDevServer.
     devServer.startCallback(() => {