diff --git a/packages/taro-cli/src/util/index.js b/packages/taro-cli/src/util/index.js index 2f90c5cb215b..85448909240a 100644 --- a/packages/taro-cli/src/util/index.js +++ b/packages/taro-cli/src/util/index.js @@ -48,14 +48,14 @@ const processTypeMap = { exports.pocessTypeEnum = pocessTypeEnum -exports.CSS_EXT = ['.css', '.scss'] +exports.CSS_EXT = ['.css', '.scss', '.sass', '.less', '.styl'] exports.SCSS_EXT = ['.scss'] exports.JS_EXT = ['.js', '.jsx'] exports.TS_EXT = ['.ts', '.tsx'] exports.REG_JS = /\.js(\?.*)?$/ exports.REG_SCRIPT = /\.(js|jsx)(\?.*)?$/ exports.REG_TYPESCRIPT = /\.(tsx|ts)(\?.*)?$/ -exports.REG_STYLE = /\.(css|scss)(\?.*)?$/ +exports.REG_STYLE = /\.(css|scss|sass|less|styl)(\?.*)?$/ exports.REG_MEDIA = /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/ exports.REG_IMAGE = /\.(png|jpe?g|gif|bpm|svg)(\?.*)?$/ exports.REG_FONT = /\.(woff2?|eot|ttf|otf)(\?.*)?$/ @@ -77,7 +77,10 @@ exports.DEVICE_RATIO = { exports.FILE_PROCESSOR_MAP = { '.js': 'babel', - '.scss': 'sass' + '.scss': 'sass', + '.sass': 'sass', + '.less': 'less', + '.styl': 'stylus' } exports.isNpmPkg = function (name) { diff --git a/packages/taro-cli/templates/default/config/index b/packages/taro-cli/templates/default/config/index index 76dc8fd56fb5..4ae4e28b1905 100644 --- a/packages/taro-cli/templates/default/config/index +++ b/packages/taro-cli/templates/default/config/index @@ -16,35 +16,33 @@ const config = { 'transform-object-rest-spread' ] }, - typescript: { - { - compilerOptions: { - allowSyntheticDefaultImports: true, - baseUrl: '.', - declaration: false, - experimentalDecorators: true, - jsx: 'react', - jsxFactory: 'Nerv.createElement', - module: 'commonjs', - moduleResolution: 'node', - noImplicitAny: false, - noUnusedLocals: true, - outDir: './dist/', - preserveConstEnums: true, - removeComments: false, - rootDir: '.', - sourceMap: true, - strictNullChecks: true, - target: es6 - }, - include: [ - 'src/**/*' - ], - exclude: [ - 'node_modules' - ], - compileOnSave: false - } + typescript: typescript: { + compilerOptions: { + allowSyntheticDefaultImports: true, + baseUrl: '.', + declaration: false, + experimentalDecorators: true, + jsx: 'react', + jsxFactory: 'Nerv.createElement', + module: 'commonjs', + moduleResolution: 'node', + noImplicitAny: false, + noUnusedLocals: true, + outDir: './dist/', + preserveConstEnums: true, + removeComments: false, + rootDir: '.', + sourceMap: true, + strictNullChecks: true, + target: 'es6' + }, + include: [ + 'src/**/*' + ], + exclude: [ + 'node_modules' + ], + compileOnSave: false } }, defineConstants: {