Merge branch 'master' of https://github.com/tm-fe/FlexTable

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+<!--
+Thank you for your pull request. Please review below requirements.
+Bug fixes and new features should include tests and possibly docs.
+
+感谢您贡献代码。请确认下列 checklist 的完成情况。
+Bug 修复和新功能必须包含测试，必要时请附上文档。
+-->
+
+## Checklist
+
+<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
+
+* [ ] `npm test` passes
+* [ ] tests are included
+* [ ] documentation is changed or added
+* [ ] commit message follows commit guidelines
+
+## Affected feature(s)
+
+
+## Description of change
+
+<!-- Provide a description of the change below this comment. -->

build/webpack.base.config.js

@@ -6,7 +6,7 @@ const { VueLoaderPlugin } = require('vue-loader');
 function resolve(dir) {
     return path.join(__dirname, '..', dir);
 }
-let sourceMap = false; // css sourceMap
+const sourceMap = false; // css sourceMap
 let jsSourceMap = true;
 if (process.env.NODE_ENV === 'production') {
     jsSourceMap = false;
@@ -63,10 +63,10 @@ module.exports = {
                         ],
                     },
                     postLoaders: {
-                        html: 'babel-loader?sourceMap'
+                        html: 'babel-loader?sourceMap',
                     },
                     sourceMap: jsSourceMap,
-                }
+                },
             },
             {
                 test: /\.js$/,
@@ -91,7 +91,7 @@ module.exports = {
                             sourceMap,
                         },
                     },
-                ]
+                ],
             },
             {
                 test: /\.less$/,
@@ -114,7 +114,7 @@ module.exports = {
                             sourceMap,
                         },
                     },
-                ]
+                ],
             },
             {
                 test: /\.scss$/,
@@ -137,30 +137,34 @@ module.exports = {
                             sourceMap,
                         },
                     },
-                ]
+                ],
             },
             {
                 test: /\.(gif|jpg|png|woff|svg|eot|ttf)\??.*$/,
-                loader: 'url-loader?limit=8192'
+                loader: 'url-loader?limit=8192',
             },
             {
                 test: /\.(html|tpl)$/,
-                loader: 'html-loader'
-            }
-        ]
+                loader: 'html-loader',
+            },
+            {
+                test: /\.tsx?$/,
+                use: 'ts-loader',
+            },
+        ],
     },
     resolve: {
         extensions: ['.js', '.vue'],
         alias: {
-            'vue': 'vue/dist/vue.esm.js',
-            '@': resolve('src')
-        }
+            vue: 'vue/dist/vue.esm.js',
+            '@': resolve('src'),
+        },
     },
     plugins: [
         new webpack.optimize.ModuleConcatenationPlugin(),
         new webpack.DefinePlugin({
-            'process.env.VERSION': `'${pkg.version}'`
+            'process.env.VERSION': `'${pkg.version}'`,
         }),
         new VueLoaderPlugin(),
-    ]
-};
+    ],
+};

build/webpack.test.config.js

@@ -1,9 +1,21 @@
+const path = require('path');
 const merge = require('webpack-merge');
 const webpackBaseConfig = require('./webpack.base.config.js');
 
+function resolve(dir) {
+    return path.join(__dirname, '..', dir);
+}
+
 const conifg = merge(webpackBaseConfig, {
     devtool: 'eval-source-map',
     mode: 'development',
+    resolve: {
+        extensions: ['.js', '.vue', '.ts'],
+        alias: {
+            vue: 'vue/dist/vue.esm.js',
+            '@': resolve('test/unit'),
+        },
+    },
 });
 
 delete conifg.entry;