Skip to content

Commit 122a8b7

Browse files
committed
Build(npm): update npm dependencies.
1 parent 4d3d9b5 commit 122a8b7

File tree

23 files changed

+1379
-1313
lines changed

23 files changed

+1379
-1313
lines changed

mock/articles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const mockFullContent = '<p>I am testing data, I am testing data.</p><p><img src
99
for (let i = 0; i < articleCount; i++) {
1010
articleList.push({
1111
id: i,
12-
status: faker.random.arrayElement(['published', 'draft', 'deleted']),
12+
status: faker.random.arrayElement(['published', 'draft']),
1313
title: faker.lorem.sentence(6, 10),
1414
abstractContent: faker.lorem.sentences(2),
1515
fullContent: mockFullContent,

package.json

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414
"test:unit": "jest --clearCache && vue-cli-service test:unit"
1515
},
1616
"dependencies": {
17-
"@tinymce/tinymce-vue": "^3.2.0",
17+
"@tinymce/tinymce-vue": "^3.2.1",
1818
"axios": "^0.19.2",
1919
"clipboard": "^2.0.6",
20-
"codemirror": "^5.52.2",
21-
"core-js": "^3.6.4",
20+
"codemirror": "^5.53.2",
21+
"core-js": "^3.6.5",
2222
"cors": "^2.8.5",
2323
"driver.js": "^0.9.8",
2424
"echarts": "^4.7.0",
25-
"element-ui": "^2.13.0",
25+
"element-ui": "^2.13.1",
2626
"faker": "^4.1.0",
2727
"file-saver": "^2.0.2",
28-
"fuse.js": "^5.1.0",
28+
"fuse.js": "^5.2.3",
2929
"js-cookie": "^2.2.1",
3030
"jsonlint": "^1.6.3",
31-
"jszip": "^3.3.0",
31+
"jszip": "^3.4.0",
3232
"lodash": "^4.17.15",
3333
"morgan": "^1.10.0",
3434
"normalize.css": "^8.0.1",
@@ -37,83 +37,83 @@
3737
"register-service-worker": "^1.7.1",
3838
"screenfull": "^5.0.2",
3939
"script-loader": "^0.7.2",
40-
"simple-progress-webpack-plugin": "^1.1.2",
4140
"sortablejs": "^1.10.2",
42-
"tinymce": "^5.2.1",
41+
"tinymce": "^5.2.2",
4342
"tui-editor": "^1.4.10",
4443
"vue": "^2.6.11",
4544
"vue-class-component": "^7.2.3",
4645
"vue-count-to": "^1.0.13",
47-
"vue-i18n": "^8.16.0",
46+
"vue-i18n": "^8.17.4",
4847
"vue-image-crop-upload": "^2.5.0",
49-
"vue-property-decorator": "^8.4.1",
48+
"vue-property-decorator": "^8.4.2",
5049
"vue-router": "^3.1.6",
5150
"vue-splitpane": "^1.0.6",
5251
"vue-svgicon": "^3.2.6",
5352
"vue2-dropzone": "^3.6.0",
5453
"vuedraggable": "^2.23.2",
55-
"vuex": "^3.1.3",
56-
"vuex-module-decorators": "^0.16.1",
57-
"xlsx": "^0.15.6",
54+
"vuex": "^3.3.0",
55+
"vuex-module-decorators": "^0.17.0",
56+
"xlsx": "^0.16.0",
5857
"yamljs": "^0.3.0"
5958
},
6059
"devDependencies": {
6160
"@types/clipboard": "^2.0.1",
62-
"@types/codemirror": "^0.0.90",
61+
"@types/codemirror": "^0.0.91",
6362
"@types/compression": "^1.7.0",
6463
"@types/cors": "^2.8.6",
65-
"@types/echarts": "^4.4.4",
66-
"@types/express": "^4.17.4",
64+
"@types/echarts": "^4.6.0",
65+
"@types/express": "^4.17.6",
6766
"@types/faker": "^4.1.11",
6867
"@types/file-saver": "^2.0.1",
69-
"@types/jest": "^25.1.5",
70-
"@types/js-cookie": "^2.2.5",
68+
"@types/jest": "^25.2.1",
69+
"@types/js-cookie": "^2.2.6",
7170
"@types/jszip": "^3.1.7",
72-
"@types/lodash": "^4.14.149",
71+
"@types/lodash": "^4.14.150",
7372
"@types/morgan": "^1.9.0",
74-
"@types/node": "^13.11.0",
73+
"@types/node": "^13.13.4",
7574
"@types/nprogress": "^0.2.0",
7675
"@types/sortablejs": "^1.10.4",
7776
"@types/tinymce": "^4.5.24",
78-
"@types/webpack-env": "^1.15.1",
77+
"@types/vue-splitpane": "^1.0.0",
78+
"@types/webpack-env": "^1.15.2",
7979
"@types/yamljs": "^0.2.30",
80-
"@typescript-eslint/eslint-plugin": "^2.26.0",
81-
"@typescript-eslint/parser": "^2.26.0",
82-
"@vue/cli-plugin-babel": "^4.2.3",
83-
"@vue/cli-plugin-e2e-cypress": "^4.2.3",
84-
"@vue/cli-plugin-eslint": "^4.2.3",
85-
"@vue/cli-plugin-pwa": "^4.2.3",
86-
"@vue/cli-plugin-router": "^4.2.3",
87-
"@vue/cli-plugin-typescript": "^4.2.3",
88-
"@vue/cli-plugin-unit-jest": "^4.2.3",
89-
"@vue/cli-plugin-vuex": "^4.2.3",
90-
"@vue/cli-service": "^4.2.3",
80+
"@typescript-eslint/eslint-plugin": "^2.30.0",
81+
"@typescript-eslint/parser": "^2.30.0",
82+
"@vue/cli-plugin-babel": "^4.3.1",
83+
"@vue/cli-plugin-e2e-cypress": "^4.3.1",
84+
"@vue/cli-plugin-eslint": "^4.3.1",
85+
"@vue/cli-plugin-pwa": "^4.3.1",
86+
"@vue/cli-plugin-router": "^4.3.1",
87+
"@vue/cli-plugin-typescript": "^4.3.1",
88+
"@vue/cli-plugin-unit-jest": "^4.3.1",
89+
"@vue/cli-plugin-vuex": "^4.3.1",
90+
"@vue/cli-service": "^4.3.1",
9191
"@vue/eslint-config-standard": "^5.1.2",
9292
"@vue/eslint-config-typescript": "^5.0.2",
93-
"@vue/test-utils": "^1.0.0-beta.32",
93+
"@vue/test-utils": "^1.0.0-beta.33",
9494
"babel-core": "^7.0.0-bridge.0",
9595
"babel-eslint": "^10.1.0",
96-
"concurrently": "^5.1.0",
96+
"concurrently": "^5.2.0",
9797
"eslint": "^6.8.0",
9898
"eslint-plugin-import": "^2.20.2",
9999
"eslint-plugin-node": "^11.1.0",
100100
"eslint-plugin-promise": "^4.2.1",
101101
"eslint-plugin-standard": "^4.0.1",
102102
"eslint-plugin-vue": "^6.2.2",
103103
"fibers": "^4.0.2",
104-
"jest": "^25.2.7",
105-
"lint-staged": "^10.1.1",
106-
"sass": "^1.26.3",
104+
"jest": "^25.5.4",
105+
"lint-staged": "^10.2.2",
106+
"sass": "^1.26.5",
107107
"sass-loader": "^8.0.2",
108108
"style-resources-loader": "^1.3.3",
109109
"swagger-routes-express": "^3.1.2",
110-
"ts-jest": "^25.3.0",
110+
"ts-jest": "^25.4.0",
111111
"ts-node-dev": "^1.0.0-pre.44",
112112
"typescript": "^3.8.3",
113113
"vue-cli-plugin-element": "^1.0.1",
114114
"vue-cli-plugin-style-resources-loader": "^0.1.4",
115115
"vue-template-compiler": "^2.6.11",
116-
"webpack": "^4.42.1"
116+
"webpack": "^4.43.0"
117117
},
118118
"bugs": {
119119
"url": "https://github.com/armour/vue-typescript-admin-template/issues"

src/components/Breadcrumb/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ export default class extends Vue {
7777
this.$router.push(redirect).catch(err => {
7878
// Throw Error "NavigationDuplicated"
7979
// https://github.com/vuejs/vue-router/issues/2872#issuecomment-522341874
80-
console.log(err)
80+
console.warn(err)
8181
})
8282
return
8383
}
8484
this.$router.push(this.pathCompile(path)).catch(err => {
8585
// Throw Error "NavigationDuplicated"
8686
// https://github.com/vuejs/vue-router/issues/2872#issuecomment-522341874
87-
console.log(err)
87+
console.warn(err)
8888
})
8989
}
9090
}

src/components/ErrorLog/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
</template>
6666
</el-table-column>
6767
<el-table-column label="Stack">
68-
<template slot-scope="scope">
69-
{{ scope.row.err.stack }}
68+
<template slot-scope="{row}">
69+
{{ row.err.stack }}
7070
</template>
7171
</el-table-column>
7272
</el-table>

src/components/Tinymce/index.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,11 @@ export default class extends Vue {
141141
imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
142142
default_link_target: '_blank',
143143
link_title: false,
144-
nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
144+
// inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
145+
nonbreaking_force_tab: true,
146+
// https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
147+
// https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
148+
convert_urls: false,
145149
init_instance_callback: (editor: any) => {
146150
if (this.value) {
147151
editor.setContent(this.value)

src/shims.d.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,3 @@ declare module 'vue2-dropzone'
2222

2323
// TODO: remove this part after vue-image-crop-upload has its typescript file
2424
declare module 'vue-image-crop-upload'
25-
26-
// TODO: remove this part after vue-splitpane has its typescript file
27-
declare module 'vue-splitpane'

src/styles/element-variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// Override Element UI variables
44
$--color-primary: #1890ff;
55
$--color-success: #13ce66;
6-
$--color-warning: #FFBA00;
6+
$--color-warning: #ffba00;
77
$--color-danger: #ff4949;
88
$--color-info: #5d5d5d;
99
$--button-font-weight: 400;
1010
$--color-text-regular: #1f2d3d;
1111
$--border-color-light: #dfe4ed;
1212
$--border-color-lighter: #e6ebf5;
13-
$--table-border:1px solid#dfe6ec;
13+
$--table-border: 1px solid#dfe6ec;
1414

1515
// Icon font path, required
1616
$--font-path: '~element-ui/lib/theme-chalk/fonts';

src/views/dashboard/admin/components/RadarChart.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export default class extends mixins(ResizeMixin) {
6161
indicator: [
6262
{ name: 'Sales', max: 10000 },
6363
{ name: 'Administration', max: 20000 },
64-
{ name: 'Information Techology', max: 20000 },
64+
{ name: 'Information Technology', max: 20000 },
6565
{ name: 'Customer Support', max: 20000 },
6666
{ name: 'Development', max: 20000 },
6767
{ name: 'Marketing', max: 20000 }

src/views/dashboard/admin/components/TransactionTable.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
label="OrderID"
88
min-width="200"
99
>
10-
<template slot-scope="scope">
11-
{{ scope.row.orderId | orderNoFilter }}
10+
<template slot-scope="{row}">
11+
{{ row.orderId | orderNoFilter }}
1212
</template>
1313
</el-table-column>
1414
<el-table-column
1515
label="Price"
1616
width="195"
1717
align="center"
1818
>
19-
<template slot-scope="scope">
20-
¥{{ scope.row.price | toThousandFilter }}
19+
<template slot-scope="{row}">
20+
¥{{ row.price | toThousandFilter }}
2121
</template>
2222
</el-table-column>
2323
<el-table-column

src/views/example/list.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
align="center"
1414
label="ID"
1515
>
16-
<template slot-scope="scope">
17-
<span>{{ scope.row.id }}</span>
16+
<template slot-scope="{row}">
17+
<span>{{ row.id }}</span>
1818
</template>
1919
</el-table-column>
2020

@@ -23,8 +23,8 @@
2323
align="center"
2424
label="Date"
2525
>
26-
<template slot-scope="scope">
27-
<span>{{ scope.row.timestamp | parseTime }}</span>
26+
<template slot-scope="{row}">
27+
<span>{{ row.timestamp | parseTime }}</span>
2828
</template>
2929
</el-table-column>
3030

@@ -33,18 +33,18 @@
3333
align="center"
3434
label="Author"
3535
>
36-
<template slot-scope="scope">
37-
<span>{{ scope.row.author }}</span>
36+
<template slot-scope="{row}">
37+
<span>{{ row.author }}</span>
3838
</template>
3939
</el-table-column>
4040

4141
<el-table-column
4242
width="105px"
4343
label="Importance"
4444
>
45-
<template slot-scope="scope">
45+
<template slot-scope="{row}">
4646
<svg-icon
47-
v-for="n in +scope.row.importance"
47+
v-for="n in +row.importance"
4848
:key="n"
4949
name="star"
5050
class="meta-item__icon"
@@ -83,8 +83,8 @@
8383
label="Actions"
8484
width="120"
8585
>
86-
<template slot-scope="scope">
87-
<router-link :to="'/example/edit/'+scope.row.id">
86+
<template slot-scope="{row}">
87+
<router-link :to="'/example/edit/'+row.id">
8888
<el-button
8989
type="primary"
9090
size="small"

0 commit comments

Comments
 (0)