diff --git a/packages/uni-cli-shared/lib/package.js b/packages/uni-cli-shared/lib/package.js index 9bec1d1afa9f27fc6a78b34d3997c34d5a018df0..b050a2ea32a4f2c1e939f6d07f9921af2b61988a 100644 --- a/packages/uni-cli-shared/lib/package.js +++ b/packages/uni-cli-shared/lib/package.js @@ -1,6 +1,6 @@ const uniI18n = require('@dcloudio/uni-cli-i18n') -function isPlainObject(a) { +function isPlainObject (a) { if (a === null) { return false } @@ -8,7 +8,7 @@ function isPlainObject(a) { } module.exports = { - initCustomScript(name, pkgPath) { + initCustomScript (name, pkgPath) { const pkg = require(pkgPath) const uniAppOptions = pkg['uni-app'] @@ -24,7 +24,9 @@ module.exports = { } if (!scriptOptions.env || !scriptOptions.env.UNI_PLATFORM) { - console.error(uniI18n.__('cliShared.requireConfigUniPlatform', { 0: `package.json->uni-app->scripts->${name}->env ` })) + console.error(uniI18n.__('cliShared.requireConfigUniPlatform', { + 0: `package.json->uni-app->scripts->${name}->env ` + })) process.exit(0) } @@ -32,7 +34,9 @@ module.exports = { Object.keys(uniAppOptions.scripts).forEach(scriptName => { if (scriptName !== name) { const define = uniAppOptions.scripts[scriptName].define - Object.keys(define).forEach(name => define[name] = false) + Object.keys(define).forEach(name => { + define[name] = false + }) Object.assign(scriptOptions.define, define) } }) @@ -46,4 +50,4 @@ module.exports = { return scriptOptions } -} +} diff --git a/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js b/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js index 8c26e35c976e520b6432dfdf2f7afdf9da766339..87bd71ca3983ba553febee1f9cfc1d63fd0cd08c 100644 --- a/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js +++ b/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js @@ -58,6 +58,7 @@ if (isSass) { const scssLoader = { loader: '@dcloudio/vue-cli-plugin-uni/packages/sass-loader', options: { + nvue: true, sourceMap: false } } @@ -65,6 +66,7 @@ const scssLoader = { const sassLoader = { loader: '@dcloudio/vue-cli-plugin-uni/packages/sass-loader', options: { + nvue: true, sourceMap: false } } diff --git a/packages/vue-cli-plugin-uni/packages/sass-loader/dist/webpackImporter.js b/packages/vue-cli-plugin-uni/packages/sass-loader/dist/webpackImporter.js index 48a11937ef15812c111c7cc34d6cd0d73c25abe7..5a211bc29c6175d2385b5df0257a5e07a66e2fe8 100644 --- a/packages/vue-cli-plugin-uni/packages/sass-loader/dist/webpackImporter.js +++ b/packages/vue-cli-plugin-uni/packages/sass-loader/dist/webpackImporter.js @@ -41,10 +41,11 @@ const matchCss = /\.css$/i; const fs = require('fs') const preprocessor = require('../../webpack-preprocess-loader/preprocess/lib/preprocess') const { - cssPreprocessOptions + cssPreprocessOptions, + nvueCssPreprocessOptions } = require('@dcloudio/uni-cli-shared') - -function webpackImporter(resourcePath, resolve, addNormalizedDependency) { +// fixed by xxxxxx +function webpackImporter(resourcePath, resolve, addNormalizedDependency, isNVue) { function dirContextFrom(fileContext) { return _path.default.dirname( // The first file is 'stdin' when we're using the data option fileContext === 'stdin' ? resourcePath : fileContext); @@ -63,7 +64,7 @@ function webpackImporter(resourcePath, resolve, addNormalizedDependency) { if (contents.includes('#endif')) { return { file, - contents: preprocessor.preprocess(contents, cssPreprocessOptions.context, { + contents: preprocessor.preprocess(contents, isNVue ? nvueCssPreprocessOptions.context : cssPreprocessOptions.context, { type: cssPreprocessOptions.type }) }