fix: 解决自定义配置问题

lark-org · Oct 28, 2021 · 904cd67 · 904cd67
1 parent abff8ae
commit 904cd67
Show file tree

Hide file tree

Showing 4 changed files with 8,438 additions and 8,166 deletions.
diff --git a/src/.babel.config.js b/src/.babel.config.js
@@ -6,7 +6,9 @@ const path = require('path')
 // TODO: 作为一个 preset 的方式大概会更好
 
 module.exports = (api) => {
-  const projectBabelPath = getProjectFilePath('.babel.config.js')
+  const projectBabelPath =
+    getProjectFilePath('.babel.config.js') ||
+    getProjectFilePath('babel.config.js')
 
   let customBabelConfig = {}
   if (fs.existsSync(projectBabelPath)) {
@@ -18,10 +20,7 @@ module.exports = (api) => {
   const { NODE_ENV, BABEL_ENV } = process.env
   const resolverOpts = {
     root: [path.relative(__dirname, process.cwd())],
-    extensions: ['.js', '.jsx', '.tsx', '.ts'],
-    alias: {
-      '@': './src'
-    }
+    extensions: ['.js', '.jsx', '.tsx', '.ts']
   }
 
   let environment = []
@@ -39,8 +38,8 @@ module.exports = (api) => {
   const config = {
     presets: [
       ['@babel/preset-env'],
-      '@babel/preset-react',
-      '@babel/preset-typescript'
+      '@babel/preset-typescript',
+      '@babel/preset-react'
     ],
     plugins: [
       ...environment,

diff --git a/src/index.js b/src/index.js
@@ -35,6 +35,4 @@ yargs
   })
   .demandCommand()
   .help()
-  .option('version', {
-    alias: 'v'
-  }).argv
+  .version().argv
diff --git a/src/utils/custom-config.js b/src/utils/custom-config.js
@@ -29,18 +29,19 @@ const getCustomConfig = () => {
   return customConfig
 }
 
+let webpackConfig = null
 const processWebpackConfig = (config) => {
   const customWebpackConfig = getCustomConfig().configureWebpack
 
   if (typeof customWebpackConfig === 'function') {
-    customConfig = customWebpackConfig(config)
+    webpackConfig = customWebpackConfig(config)
   } else if (typeof customWebpackConfig === 'object') {
-    customConfig = customWebpackConfig
+    webpackConfig = customWebpackConfig
   }
 
-  if (customConfig) {
+  if (webpackConfig) {
     // eslint-disable-next-line no-param-reassign
-    config = mergeWebpackConfig(config, customConfig)
+    config = mergeWebpackConfig(config, webpackConfig)
   }
   return config
 }