fixed lib error

NyanShen · Jan 16, 2023 · 3204245 · 3204245
1 parent 227cc8a
commit 3204245
Show file tree

Hide file tree

Showing 4 changed files with 16,485 additions and 86 deletions.
diff --git a/babel.config.js b/babel.config.js
diff --git a/config/webpack.base.config.js b/config/webpack.base.config.js
@@ -21,8 +21,7 @@ module.exports = {
             {
                 test: /\.tsx?$/,
                 exclude: /node_modules/,
-                loader: "babel-loader" //use babel.config.js
-                // loader: "awesome-typescript-loader"
+                loader: "awesome-typescript-loader"
             },
             {
                 test: /\.js$/,
@@ -43,54 +42,6 @@ module.exports = {
                 ]
             },
             {
-<<<<<<< HEAD
-=======
-                test: /\.scss$/,
-                use: [
-                    styleLoader,
-                    {
-                        loader: "css-loader",
-                        options: {
-                            importLoaders: 3
-                        }
-                    },
-                    "postcss-loader",
-                    "sass-loader",
-                    {
-                        loader: "sass-resources-loader",
-                        options: {
-                            resources: [
-                                "./src/styles/_variables.scss",
-                                "./src/styles/_mixins.scss"
-                            ]
-                        }
-                    }
-                ]
-            },
-            {
-                test: /\.less/,
-                use: [
-                    styleLoader,
-                    {
-                        loader: "css-loader",
-                        options: {
-                            importLoaders: 3
-                        }
-                    },
-                    "postcss-loader",
-                    {
-                        loader: "less-loader",
-                        options: {
-                           javascriptEnabled: true,
-                           modifyVars: {
-                               '@icon-url': "'~antd-iconfont/iconfont'"
-                           }
-                        }
-                    }
-                ]
-            },
-            {
->>>>>>> 8a7f695f03fae0d8e1ad9360a9e4514cf633e2a3
                 test: /\.(png|jpe?g|svg|gif)$/,
                 use: {
                     loader: "url-loader",