From 112745225345a7264e1d5bf9bce76e09e146dfb4 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Tue, 28 Dec 2021 20:10:22 +0800 Subject: [PATCH] fix(ts): add ts-nocheck --- packages/vue-cli-plugin-uni/lib/configure-webpack.js | 12 ++++++++---- .../packages/webpack-uni-app-loader/view/main.js | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/vue-cli-plugin-uni/lib/configure-webpack.js b/packages/vue-cli-plugin-uni/lib/configure-webpack.js index 5e0bab80d..c049c4bb2 100644 --- a/packages/vue-cli-plugin-uni/lib/configure-webpack.js +++ b/packages/vue-cli-plugin-uni/lib/configure-webpack.js @@ -69,12 +69,14 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt const tsConfigJsonFile = fs.existsSync(userTsConfigJson) ? userTsConfigJson : defaultTsConfigJson + const context = isInHBuilderX ? process.env.UNI_INPUT_DIR : process.env.UNI_CLI_CONTEXT + const tsLoaderOptions = { - context: process.env.UNI_INPUT_DIR, + context, configFile: tsConfigJsonFile, transpileOnly: false, compilerOptions: { - baseUrl: process.env.UNI_INPUT_DIR, + baseUrl: context, typeRoots: [resolveModule('@dcloudio/types'), resolveModule('@types')], types: [ 'uni-app', @@ -302,7 +304,9 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt const resolveLoaderAlias = {} const modules = ['@vue/cli-plugin-babel', '@vue/cli-service'] modules.forEach(m => { - const { dependencies } = require(`${m}/package.json`) + const { + dependencies + } = require(`${m}/package.json`) Object.keys(dependencies).forEach(key => { if (/-loader$/.test(key)) { resolveLoaderAlias[key] = require.resolve(key) @@ -350,4 +354,4 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt watchOptions: require('./util').getWatchOptions() }, platformWebpackConfig) } -} +} diff --git a/packages/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/main.js b/packages/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/main.js index df78f2b80..b9d46e6c4 100644 --- a/packages/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/main.js +++ b/packages/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/main.js @@ -112,7 +112,8 @@ module.exports = function (source, map) { ? 'import \'@dcloudio/uni-app-plus/dist/automator.view\'' : '' this.callback(null, - ` + ` +// @ts-nocheck import 'uni-pages?${JSON.stringify({ type: 'view' })}' ${automatorCode} function initView(){ -- GitLab