Skip to content

Commit

Permalink
Build(npm): update npm dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
Armour committed May 2, 2020
1 parent 4d3d9b5 commit 122a8b7
Show file tree
Hide file tree
Showing 23 changed files with 1,379 additions and 1,313 deletions.
2 changes: 1 addition & 1 deletion mock/articles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const mockFullContent = '<p>I am testing data, I am testing data.</p><p><img src
for (let i = 0; i < articleCount; i++) {
articleList.push({
id: i,
status: faker.random.arrayElement(['published', 'draft', 'deleted']),
status: faker.random.arrayElement(['published', 'draft']),
title: faker.lorem.sentence(6, 10),
abstractContent: faker.lorem.sentences(2),
fullContent: mockFullContent,
Expand Down
78 changes: 39 additions & 39 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@
"test:unit": "jest --clearCache && vue-cli-service test:unit"
},
"dependencies": {
"@tinymce/tinymce-vue": "^3.2.0",
"@tinymce/tinymce-vue": "^3.2.1",
"axios": "^0.19.2",
"clipboard": "^2.0.6",
"codemirror": "^5.52.2",
"core-js": "^3.6.4",
"codemirror": "^5.53.2",
"core-js": "^3.6.5",
"cors": "^2.8.5",
"driver.js": "^0.9.8",
"echarts": "^4.7.0",
"element-ui": "^2.13.0",
"element-ui": "^2.13.1",
"faker": "^4.1.0",
"file-saver": "^2.0.2",
"fuse.js": "^5.1.0",
"fuse.js": "^5.2.3",
"js-cookie": "^2.2.1",
"jsonlint": "^1.6.3",
"jszip": "^3.3.0",
"jszip": "^3.4.0",
"lodash": "^4.17.15",
"morgan": "^1.10.0",
"normalize.css": "^8.0.1",
Expand All @@ -37,83 +37,83 @@
"register-service-worker": "^1.7.1",
"screenfull": "^5.0.2",
"script-loader": "^0.7.2",
"simple-progress-webpack-plugin": "^1.1.2",
"sortablejs": "^1.10.2",
"tinymce": "^5.2.1",
"tinymce": "^5.2.2",
"tui-editor": "^1.4.10",
"vue": "^2.6.11",
"vue-class-component": "^7.2.3",
"vue-count-to": "^1.0.13",
"vue-i18n": "^8.16.0",
"vue-i18n": "^8.17.4",
"vue-image-crop-upload": "^2.5.0",
"vue-property-decorator": "^8.4.1",
"vue-property-decorator": "^8.4.2",
"vue-router": "^3.1.6",
"vue-splitpane": "^1.0.6",
"vue-svgicon": "^3.2.6",
"vue2-dropzone": "^3.6.0",
"vuedraggable": "^2.23.2",
"vuex": "^3.1.3",
"vuex-module-decorators": "^0.16.1",
"xlsx": "^0.15.6",
"vuex": "^3.3.0",
"vuex-module-decorators": "^0.17.0",
"xlsx": "^0.16.0",
"yamljs": "^0.3.0"
},
"devDependencies": {
"@types/clipboard": "^2.0.1",
"@types/codemirror": "^0.0.90",
"@types/codemirror": "^0.0.91",
"@types/compression": "^1.7.0",
"@types/cors": "^2.8.6",
"@types/echarts": "^4.4.4",
"@types/express": "^4.17.4",
"@types/echarts": "^4.6.0",
"@types/express": "^4.17.6",
"@types/faker": "^4.1.11",
"@types/file-saver": "^2.0.1",
"@types/jest": "^25.1.5",
"@types/js-cookie": "^2.2.5",
"@types/jest": "^25.2.1",
"@types/js-cookie": "^2.2.6",
"@types/jszip": "^3.1.7",
"@types/lodash": "^4.14.149",
"@types/lodash": "^4.14.150",
"@types/morgan": "^1.9.0",
"@types/node": "^13.11.0",
"@types/node": "^13.13.4",
"@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.10.4",
"@types/tinymce": "^4.5.24",
"@types/webpack-env": "^1.15.1",
"@types/vue-splitpane": "^1.0.0",
"@types/webpack-env": "^1.15.2",
"@types/yamljs": "^0.2.30",
"@typescript-eslint/eslint-plugin": "^2.26.0",
"@typescript-eslint/parser": "^2.26.0",
"@vue/cli-plugin-babel": "^4.2.3",
"@vue/cli-plugin-e2e-cypress": "^4.2.3",
"@vue/cli-plugin-eslint": "^4.2.3",
"@vue/cli-plugin-pwa": "^4.2.3",
"@vue/cli-plugin-router": "^4.2.3",
"@vue/cli-plugin-typescript": "^4.2.3",
"@vue/cli-plugin-unit-jest": "^4.2.3",
"@vue/cli-plugin-vuex": "^4.2.3",
"@vue/cli-service": "^4.2.3",
"@typescript-eslint/eslint-plugin": "^2.30.0",
"@typescript-eslint/parser": "^2.30.0",
"@vue/cli-plugin-babel": "^4.3.1",
"@vue/cli-plugin-e2e-cypress": "^4.3.1",
"@vue/cli-plugin-eslint": "^4.3.1",
"@vue/cli-plugin-pwa": "^4.3.1",
"@vue/cli-plugin-router": "^4.3.1",
"@vue/cli-plugin-typescript": "^4.3.1",
"@vue/cli-plugin-unit-jest": "^4.3.1",
"@vue/cli-plugin-vuex": "^4.3.1",
"@vue/cli-service": "^4.3.1",
"@vue/eslint-config-standard": "^5.1.2",
"@vue/eslint-config-typescript": "^5.0.2",
"@vue/test-utils": "^1.0.0-beta.32",
"@vue/test-utils": "^1.0.0-beta.33",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.1.0",
"concurrently": "^5.1.0",
"concurrently": "^5.2.0",
"eslint": "^6.8.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.2.2",
"fibers": "^4.0.2",
"jest": "^25.2.7",
"lint-staged": "^10.1.1",
"sass": "^1.26.3",
"jest": "^25.5.4",
"lint-staged": "^10.2.2",
"sass": "^1.26.5",
"sass-loader": "^8.0.2",
"style-resources-loader": "^1.3.3",
"swagger-routes-express": "^3.1.2",
"ts-jest": "^25.3.0",
"ts-jest": "^25.4.0",
"ts-node-dev": "^1.0.0-pre.44",
"typescript": "^3.8.3",
"vue-cli-plugin-element": "^1.0.1",
"vue-cli-plugin-style-resources-loader": "^0.1.4",
"vue-template-compiler": "^2.6.11",
"webpack": "^4.42.1"
"webpack": "^4.43.0"
},
"bugs": {
"url": "https://github.com/armour/vue-typescript-admin-template/issues"
Expand Down
4 changes: 2 additions & 2 deletions src/components/Breadcrumb/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ export default class extends Vue {
this.$router.push(redirect).catch(err => {
// Throw Error "NavigationDuplicated"
// https://github.com/vuejs/vue-router/issues/2872#issuecomment-522341874
console.log(err)
console.warn(err)
})
return
}
this.$router.push(this.pathCompile(path)).catch(err => {
// Throw Error "NavigationDuplicated"
// https://github.com/vuejs/vue-router/issues/2872#issuecomment-522341874
console.log(err)
console.warn(err)
})
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ErrorLog/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
</template>
</el-table-column>
<el-table-column label="Stack">
<template slot-scope="scope">
{{ scope.row.err.stack }}
<template slot-scope="{row}">
{{ row.err.stack }}
</template>
</el-table-column>
</el-table>
Expand Down
6 changes: 5 additions & 1 deletion src/components/Tinymce/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,11 @@ export default class extends Vue {
imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
default_link_target: '_blank',
link_title: false,
nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
// inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
nonbreaking_force_tab: true,
// https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
// https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
convert_urls: false,
init_instance_callback: (editor: any) => {
if (this.value) {
editor.setContent(this.value)
Expand Down
3 changes: 0 additions & 3 deletions src/shims.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,3 @@ declare module 'vue2-dropzone'

// TODO: remove this part after vue-image-crop-upload has its typescript file
declare module 'vue-image-crop-upload'

// TODO: remove this part after vue-splitpane has its typescript file
declare module 'vue-splitpane'
4 changes: 2 additions & 2 deletions src/styles/element-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
// Override Element UI variables
$--color-primary: #1890ff;
$--color-success: #13ce66;
$--color-warning: #FFBA00;
$--color-warning: #ffba00;
$--color-danger: #ff4949;
$--color-info: #5d5d5d;
$--button-font-weight: 400;
$--color-text-regular: #1f2d3d;
$--border-color-light: #dfe4ed;
$--border-color-lighter: #e6ebf5;
$--table-border:1px solid#dfe6ec;
$--table-border: 1px solid#dfe6ec;

// Icon font path, required
$--font-path: '~element-ui/lib/theme-chalk/fonts';
Expand Down
2 changes: 1 addition & 1 deletion src/views/dashboard/admin/components/RadarChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default class extends mixins(ResizeMixin) {
indicator: [
{ name: 'Sales', max: 10000 },
{ name: 'Administration', max: 20000 },
{ name: 'Information Techology', max: 20000 },
{ name: 'Information Technology', max: 20000 },
{ name: 'Customer Support', max: 20000 },
{ name: 'Development', max: 20000 },
{ name: 'Marketing', max: 20000 }
Expand Down
8 changes: 4 additions & 4 deletions src/views/dashboard/admin/components/TransactionTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
label="OrderID"
min-width="200"
>
<template slot-scope="scope">
{{ scope.row.orderId | orderNoFilter }}
<template slot-scope="{row}">
{{ row.orderId | orderNoFilter }}
</template>
</el-table-column>
<el-table-column
label="Price"
width="195"
align="center"
>
<template slot-scope="scope">
¥{{ scope.row.price | toThousandFilter }}
<template slot-scope="{row}">
¥{{ row.price | toThousandFilter }}
</template>
</el-table-column>
<el-table-column
Expand Down
20 changes: 10 additions & 10 deletions src/views/example/list.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
align="center"
label="ID"
>
<template slot-scope="scope">
<span>{{ scope.row.id }}</span>
<template slot-scope="{row}">
<span>{{ row.id }}</span>
</template>
</el-table-column>

Expand All @@ -23,8 +23,8 @@
align="center"
label="Date"
>
<template slot-scope="scope">
<span>{{ scope.row.timestamp | parseTime }}</span>
<template slot-scope="{row}">
<span>{{ row.timestamp | parseTime }}</span>
</template>
</el-table-column>

Expand All @@ -33,18 +33,18 @@
align="center"
label="Author"
>
<template slot-scope="scope">
<span>{{ scope.row.author }}</span>
<template slot-scope="{row}">
<span>{{ row.author }}</span>
</template>
</el-table-column>

<el-table-column
width="105px"
label="Importance"
>
<template slot-scope="scope">
<template slot-scope="{row}">
<svg-icon
v-for="n in +scope.row.importance"
v-for="n in +row.importance"
:key="n"
name="star"
class="meta-item__icon"
Expand Down Expand Up @@ -83,8 +83,8 @@
label="Actions"
width="120"
>
<template slot-scope="scope">
<router-link :to="'/example/edit/'+scope.row.id">
<template slot-scope="{row}">
<router-link :to="'/example/edit/'+row.id">
<el-button
type="primary"
size="small"
Expand Down
20 changes: 10 additions & 10 deletions src/views/excel/export-excel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,41 +35,41 @@
align="center"
label="Id"
>
<template slot-scope="scope">
{{ scope.$index }}
<template slot-scope="{$index}">
{{ $index }}
</template>
</el-table-column>
<el-table-column label="Title">
<template slot-scope="scope">
{{ scope.row.title }}
<template slot-scope="{row}">
{{ row.title }}
</template>
</el-table-column>
<el-table-column
label="Author"
width="180"
align="center"
>
<template slot-scope="scope">
<el-tag>{{ scope.row.author }}</el-tag>
<template slot-scope="{row}">
<el-tag>{{ row.author }}</el-tag>
</template>
</el-table-column>
<el-table-column
width="115"
align="center"
label="Readings"
>
<template slot-scope="scope">
{{ scope.row.pageviews }}
<template slot-scope="{row}">
{{ row.pageviews }}
</template>
</el-table-column>
<el-table-column
width="220"
align="center"
label="Date"
>
<template slot-scope="scope">
<template slot-scope="{row}">
<i class="el-icon-time" />
<span>{{ scope.row.timestamp | parseTime }}</span>
<span>{{ row.timestamp | parseTime }}</span>
</template>
</el-table-column>
</el-table>
Expand Down
Loading

0 comments on commit 122a8b7

Please sign in to comment.