Skip to content

Commit 13bc02a

Browse files
committed
refator: change test
1 parent 8b35485 commit 13bc02a

19 files changed

+85
-387
lines changed

build/webpack.config.base.js

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const path = require('path')
99

1010
module.exports = {
1111
resolve: {
12-
extensions: ['.js', '.vue', '.json','.ts', '.tsx'],
12+
extensions: ['.js', '.vue', '.json'],
1313
alias: {
1414
'assets': utils.resolve('assets'),
1515
'static': utils.resolve('static'),
@@ -82,26 +82,6 @@ module.exports = {
8282
test: /\.tsx$/,
8383
exclude: /node_modules/,
8484
loader: ['babel-loader', 'ts-loader']
85-
},{
86-
test: /\.css$/,
87-
use: [
88-
'vue-style-loader',
89-
'css-loader'
90-
]
91-
},{
92-
test: /\.styl(us)?$/,
93-
use: [
94-
'vue-style-loader',
95-
'css-loader',
96-
'stylus-loader'
97-
]
98-
},{
99-
test: /\.scss$/,
100-
use: [
101-
'vue-style-loader',
102-
'css-loader',
103-
'sass-loader'
104-
]
10585
}
10686
]
10787
},
@@ -114,4 +94,4 @@ module.exports = {
11494
toType: 'dir'
11595
}])
11696
]
117-
}
97+
}

build/webpack.config.dev.js

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,32 @@ module.exports = merge(baseConfig, {
2626
quiet: true
2727
},
2828

29+
module: {
30+
rules: [
31+
{
32+
test: /\.css$/,
33+
use: [
34+
'vue-style-loader',
35+
'css-loader'
36+
]
37+
}, {
38+
test: /\.styl(us)?$/,
39+
use: [
40+
'vue-style-loader',
41+
'css-loader',
42+
'stylus-loader'
43+
]
44+
}, {
45+
test: /\.scss$/,
46+
use: [
47+
'vue-style-loader',
48+
'css-loader',
49+
'sass-loader'
50+
]
51+
}
52+
]
53+
},
54+
2955
plugins: [
3056
new webpack.HotModuleReplacementPlugin(),
3157
new HtmlWebpackPlugin({
@@ -57,4 +83,4 @@ module.exports = merge(baseConfig, {
5783
additionalTransformers: []
5884
}),
5985
]
60-
})
86+
})

build/webpack.config.doc.js

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ module.exports = merge(baseConfig, {
1515
libraryTarget: 'umd',
1616
umdNamedDefine: true
1717
},
18-
externals:{
19-
'vue': 'Vue',
20-
'vue-router': 'VueRouter',
21-
'highlight.js': 'hljs',
22-
},
2318
optimization: {
2419
splitChunks: {
2520
cacheGroups: {
@@ -31,9 +26,34 @@ module.exports = merge(baseConfig, {
3126
}
3227
}
3328
},
29+
module: {
30+
rules: [
31+
{
32+
test: /\.css$/,
33+
use: [
34+
'vue-style-loader',
35+
'css-loader'
36+
]
37+
}, {
38+
test: /\.styl(us)?$/,
39+
use: [
40+
'vue-style-loader',
41+
'css-loader',
42+
'stylus-loader'
43+
]
44+
}, {
45+
test: /\.scss$/,
46+
use: [
47+
'vue-style-loader',
48+
'css-loader',
49+
'sass-loader'
50+
]
51+
}
52+
]
53+
},
3454
plugins: [
3555
new HtmlWebpackPlugin({
36-
template: './doc/doc.html',
56+
template: './doc/index.html',
3757
filename: 'index.html',
3858
favicon:'./doc/favicon.ico',
3959
inject: true
@@ -46,4 +66,4 @@ module.exports = merge(baseConfig, {
4666
filename: 'ninecatdoc.min.css'
4767
})
4868
]
49-
})
69+
})

build/webpack.config.prod.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,31 @@ module.exports = merge(baseConfig, {
3535
}
3636
}
3737
},
38+
module: {
39+
rules: [
40+
{
41+
test: /\.css?$/,
42+
use: [
43+
MiniCssExtractPlugin.loader,
44+
'css-loader'
45+
]
46+
}, {
47+
test: /\.styl(us)?$/,
48+
use: [
49+
MiniCssExtractPlugin.loader,
50+
'css-loader',
51+
'stylus-loader'
52+
]
53+
}, {
54+
test: /\.scss$/,
55+
use: [
56+
'vue-style-loader',
57+
'css-loader',
58+
'sass-loader'
59+
]
60+
}
61+
]
62+
},
3863
plugins: [
3964
new MiniCssExtractPlugin({
4065
filename: 'main.css'

packages/nAlert/src/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
</template>
2323

2424
<script>
25+
import './index.scss';
2526
import nIcon from '../../nIcon';
2627
export default {
2728
name: 'NAlert',

packages/nTag/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import nTag from './src';
1+
import nTag from './src/index.tsx';
22
console.log(nTag);
33
nTag.install = function (Vue) {
44
Vue.component('NTag', nTag);

packages/nTag/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default defineComponent({
1919
defalut: 'blue'
2020
}
2121
},
22-
setup(props) {
22+
setup(props:any) {
2323
return () => (
2424
<div class="n-tag">
2525
<div class={props.type} style={getStyle(props.color)}>

src/index.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ const install = function (Vue, opts = {}) {
5959
locale.use(opts.locale);
6060
locale.i18n(opts.i18n);
6161
Object.values(components).forEach(component => {
62-
if (typeof component === 'function') {
63-
Vue.use(component);
64-
} else {
65-
Vue.component(component.name, component);
66-
}
62+
Vue.component(component.name, component);
6763
});
6864
Vue.prototype.$nMessage = nMessage;
6965
};

test/specs/alert.spec.js

Lines changed: 0 additions & 59 deletions
This file was deleted.

test/specs/avatar.spec.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)