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 c32ce42644f3410d25c4b8d69bc980ef6b99ede6..28a940af48ebd9bfab5cee2949361638773e6a20 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 f102ce2e27b65fce6544daf967e9fcceb2802db9..c47c1f2220d8d2b722cac5f9e7e56c928daef033 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 } -} +}