diff --git a/packages/vue-cli-plugin-hbuilderx/module-alias.js b/packages/vue-cli-plugin-hbuilderx/module-alias.js index 8a65f715536c03692863dd0577076a4b4156e445..c80d0a0b748c5be4b013f2c92e460f0516a23262 100644 --- a/packages/vue-cli-plugin-hbuilderx/module-alias.js +++ b/packages/vue-cli-plugin-hbuilderx/module-alias.js @@ -17,6 +17,8 @@ moduleAlias.addAlias('@vue/component-compiler-utils/package.json', require.resol '@dcloudio/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/package.json')) if (isInHBuilderX) { + moduleAlias.addAlias('typescript', path.resolve(process.env.UNI_HBUILDERX_PLUGINS, + 'compile-typescript/node_modules/typescript')) moduleAlias.addAlias('less', path.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'compile-less/node_modules/less')) moduleAlias.addAlias('node-sass', path.resolve(process.env.UNI_HBUILDERX_PLUGINS, diff --git a/packages/vue-cli-plugin-uni/lib/chain-webpack.js b/packages/vue-cli-plugin-uni/lib/chain-webpack.js index 9bb76a27276eb729b1d9d52f4fb12b904ce558cf..871e6e20b2d1626f3cd7b5a73ce67b5d2e74a218 100644 --- a/packages/vue-cli-plugin-uni/lib/chain-webpack.js +++ b/packages/vue-cli-plugin-uni/lib/chain-webpack.js @@ -8,11 +8,11 @@ const { getPartialIdentifier } = require('./util') -function resolve(dir) { +function resolve (dir) { return path.resolve(__dirname, '..', dir) } -module.exports = function chainWebpack(platformOptions, vueOptions, api) { +module.exports = function chainWebpack (platformOptions, vueOptions, api) { const { runByHBuilderX, // 使用 HBuilderX 运行 cssPreprocessOptions @@ -154,8 +154,8 @@ module.exports = function chainWebpack(platformOptions, vueOptions, api) { .delete('@') .set( '@/pages.json', - path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') - + '?' + JSON.stringify({ + path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') + + '?' + JSON.stringify({ type: 'origin-pages-json' }) ) diff --git a/packages/vue-cli-plugin-uni/lib/mp/index.js b/packages/vue-cli-plugin-uni/lib/mp/index.js index f6ea592a48fcbaddaca7e6f77c3bca395ba08a7e..745a17d87494c124289d91b6001250e4c042168f 100644 --- a/packages/vue-cli-plugin-uni/lib/mp/index.js +++ b/packages/vue-cli-plugin-uni/lib/mp/index.js @@ -189,7 +189,9 @@ module.exports = { ? process.env.UNI_MP_PLUGIN_MAIN : JSON.parse(process.env.UNI_MP_PLUGIN_EXPORT) ).forEach(fileName => addToUniEntry(fileName)) - beforeCode += `${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;` + beforeCode += ` +// @ts-ignore +${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;` } const alias = { // 仅 mp-weixin @@ -218,8 +220,7 @@ module.exports = { output.pathinfo = false } return { - mode: process.env.NODE_ENV === 'production' ? 'production' - : 'development', + mode: process.env.NODE_ENV === 'production' ? 'production' : 'development', entry () { return process.UNI_ENTRY },