From 8ab2eedf6907c3bec37b0332c84e22e9529165a6 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Sat, 2 Apr 2022 17:19:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=20uni-cli-shared=20=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E8=BF=87=E6=97=A9=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/babel/global-component-traverse.js               | 7 ++-----
 .../lib/babel/scoped-component-traverse.js               | 9 +++------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/webpack-uni-mp-loader/lib/babel/global-component-traverse.js b/packages/webpack-uni-mp-loader/lib/babel/global-component-traverse.js
index c32ce4264..28a940af4 100644
--- a/packages/webpack-uni-mp-loader/lib/babel/global-component-traverse.js
+++ b/packages/webpack-uni-mp-loader/lib/babel/global-component-traverse.js
@@ -1,9 +1,6 @@
 const path = require('path')
 const t = require('@babel/types')
 const babelTraverse = require('@babel/traverse').default
-const {
-  normalizePath
-} = require('@dcloudio/uni-cli-shared')
 const {
   parseComponents
 } = require('./util')
@@ -58,7 +55,7 @@ module.exports = function (ast, state = {}) {
     }
   } catch (e) {
     if (state.filename) {
-      console.error('at ' + normalizePath(path.relative(process.env.UNI_INPUT_DIR, state.filename)) + ':1')
+      console.error('at ' + require('@dcloudio/uni-cli-shared').normalizePath(path.relative(process.env.UNI_INPUT_DIR, state.filename)) + ':1')
     }
     throw e
   }
@@ -66,4 +63,4 @@ module.exports = function (ast, state = {}) {
     ast,
     state
   }
-}
+}
diff --git a/packages/webpack-uni-mp-loader/lib/babel/scoped-component-traverse.js b/packages/webpack-uni-mp-loader/lib/babel/scoped-component-traverse.js
index f102ce2e2..c47c1f222 100644
--- a/packages/webpack-uni-mp-loader/lib/babel/scoped-component-traverse.js
+++ b/packages/webpack-uni-mp-loader/lib/babel/scoped-component-traverse.js
@@ -1,9 +1,6 @@
 const path = require('path')
 const t = require('@babel/types')
 const babelTraverse = require('@babel/traverse').default
-const {
-  normalizePath
-} = require('@dcloudio/uni-cli-shared')
 const {
   parseComponents
 } = require('./util')
@@ -110,7 +107,7 @@ module.exports = function (ast, state = {
   components: [],
   options: {}
 }) {
-  try {
+  try {
     babelTraverse(ast, {
       CallExpression (path) {
         const callee = path.node.callee
@@ -185,7 +182,7 @@ module.exports = function (ast, state = {
     })
   } catch (e) {
     if (state.filename) {
-      console.error('at ' + normalizePath(path.relative(process.env.UNI_INPUT_DIR, state.filename)) + ':1')
+      console.error('at ' + require('@dcloudio/uni-cli-shared').normalizePath(path.relative(process.env.UNI_INPUT_DIR, state.filename)) + ':1')
     }
     throw e
   }
@@ -193,4 +190,4 @@ module.exports = function (ast, state = {
     ast,
     state
   }
-}
+}
-- 
GitLab