Skip to content

Commit

Permalink
[vue] Update dependencies in package.json
Browse files Browse the repository at this point in the history
  • Loading branch information
csordasmarton committed Jul 6, 2020
1 parent c27161b commit 5a5bfc0
Show file tree
Hide file tree
Showing 13 changed files with 66 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ cache:

addons:
firefox: "69.0.1"
chrome: "80.0"
chrome: stable
apt:
sources:
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
Expand Down
22 changes: 12 additions & 10 deletions web/server/vue-cli/config/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,17 @@ module.exports = {
favicon: helpers.root('src', 'assets', 'favicon.ico'),
template: helpers.root('src', 'index.html')
}),
new CopyPlugin([
{
from: helpers.root('src', 'assets', 'userguide', 'images'),
to: helpers.root('dist', 'images')
},
{
from: helpers.root('src', 'browsersupport.js'),
to: helpers.root('dist')
}
]),
new CopyPlugin({
patterns: [
{
from: helpers.root('src', 'assets', 'userguide', 'images'),
to: helpers.root('dist', 'images')
},
{
from: helpers.root('src', 'browsersupport.js'),
to: helpers.root('dist')
}
]
}),
]
}
7 changes: 1 addition & 6 deletions web/server/vue-cli/e2e/specs/reportDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@ module.exports = {

reportDetailPage
.waitForElementVisible("@page", 10000)
.isVisible({
selector: "@progressBar",
timeout: 500,
suppressNotFoundErrors: true
})
.waitForElementNotPresent("@progressBar");
.waitForProgressBarNotPresent();
},

after(browser) {
Expand Down
83 changes: 41 additions & 42 deletions web/server/vue-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,62 +26,61 @@
"test": "npm run test:lint && npm run test:unit && npm run test:e2e"
},
"dependencies": {
"@mdi/font": "^5.3.45",
"codechecker-api": "6.27.0",
"codemirror": "^5.52.0",
"date-fns": "^2.10.0",
"highlight.js": "^9.18.1",
"jsplumb": "^2.12.9",
"codemirror": "^5.55.0",
"date-fns": "^2.14.0",
"highlight.js": "^10.1.1",
"jsplumb": "^2.13.3",
"lodash": "^4.17.15",
"marked": "^0.8.0",
"marked": "^1.1.0",
"splitpanes": "^2.2.1",
"thrift": "0.11.0",
"vue": "^2.6.11",
"vuetify": "^2.3.3",
"vue-cookie": "^1.1.4",
"vue-router": "^3.1.5",
"vuex": "^3.1.2"
"vue-router": "^3.3.4",
"vuex": "^3.5.1"
},
"devDependencies": {
"@babel/cli": "^7.8.4",
"@babel/core": "^7.8.4",
"@babel/preset-env": "^7.8.4",
"@mdi/font": "^4.9.95",
"@types/jest": "^25.1.3",
"@vue/test-utils": "^1.0.0-beta.31",
"babel-eslint": "^10.0.3",
"babel-jest": "^25.1.0",
"babel-loader": "^8.0.6",
"chromedriver": "^80.0.1",
"copy-webpack-plugin": "^5.1.1",
"core-js": "^3.6.4",
"css-loader": "^3.4.2",
"cross-env": "^6.0.3",
"@babel/cli": "^7.10.4",
"@babel/core": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"@types/jest": "^26.0.3",
"@vue/test-utils": "^1.0.3",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.1.0",
"babel-loader": "^8.1.0",
"chromedriver": "^83.0.0",
"copy-webpack-plugin": "^6.0.3",
"core-js": "^3.6.5",
"css-loader": "^3.6.0",
"cross-env": "^7.0.2",
"deepmerge": "^4.2.2",
"eslint": "^6.8.0",
"eslint-loader": "^3.0.3",
"eslint-plugin-vue": "^6.2.1",
"fibers": "^4.0.2",
"file-loader": "^5.1.0",
"eslint": "^7.4.0",
"eslint-loader": "^4.0.2",
"eslint-plugin-vue": "^6.2.2",
"fibers": "^5.0.0",
"file-loader": "^6.0.0",
"geckodriver": "^1.19.1",
"html-webpack-plugin": "^3.2.0",
"http-server": "^0.12.1",
"jest": "^25.1.0",
"nightwatch": "^1.3.4",
"raw-loader": "^4.0.0",
"regenerator-runtime": "^0.13.3",
"html-webpack-plugin": "^4.3.0",
"http-server": "^0.12.3",
"jest": "^26.1.0",
"nightwatch": "^1.3.6",
"raw-loader": "^4.0.1",
"regenerator-runtime": "^0.13.5",
"rimraf": "^3.0.2",
"sass": "^1.26.0",
"sass": "^1.26.9",
"sass-loader": "^8.0.2",
"selenium-server": "^3.141.59",
"start-server-and-test": "^1.10.11",
"vue-jest": "^3.0.5",
"vue-loader": "^15.9.0",
"start-server-and-test": "^1.11.0",
"vue-jest": "^3.0.6",
"vue-loader": "^15.9.3",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.11",
"vuetify": "^2.2.14",
"vuetify-loader": "^1.4.3",
"webpack": "^4.41.6",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.10.3",
"vuetify-loader": "^1.5.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^4.2.2"
},
"jest": {
Expand Down
4 changes: 2 additions & 2 deletions web/server/vue-cli/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<v-app id="app">
<the-header />

<v-content>
<v-main>
<router-view />

<errors />
</v-content>
</v-main>
</v-app>
</template>

Expand Down
2 changes: 1 addition & 1 deletion web/server/vue-cli/src/components/Errors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
vertical
color="error"
:value="errors.length"
:timeout="0"
:timeout="-1"
>
<v-alert
v-for="(error, idx) in errors"
Expand Down
4 changes: 2 additions & 2 deletions web/server/vue-cli/src/components/Layout/HeaderMenuItems.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
icon
color="primary"
>
<v-icon>mdi-github-circle</v-icon>
<v-icon>mdi-github</v-icon>
</v-btn>
</v-list-item-avatar>

Expand All @@ -51,7 +51,7 @@
target="_blank"
>
<v-list-item-avatar>
<v-icon>mdi-github-circle</v-icon>
<v-icon>mdi-github</v-icon>
</v-list-item-avatar>
<v-list-item-title>
CodeChecker @ GitHub
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
:rules="rules.endpoint"
label="URL endpoint*"
name="endpoint"
prepend-icon="mdi-account-card-details-outline"
prepend-icon="mdi-card-account-details-outline"
required
/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
>
<template v-slot:icon>
<v-icon color="grey">
mdi-account-card-details
mdi-card-account-details
</v-icon>
</template>
</select-option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
>
<template v-slot:icon>
<v-icon color="grey">
mdi-file-document-box-outline
mdi-file-document-outline
</v-icon>
</template>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
class="settings-btn"
v-on="on"
>
<v-icon>mdi-settings</v-icon>
<v-icon>mdi-cog</v-icon>
</v-btn>
</template>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class="mr-1"
small
>
mdi-file-document-box-outline
mdi-file-document-outline
</v-icon>
Show documentation
</v-btn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</v-row>
<v-row v-if="stats.failed">
<v-icon class="mr-2">
mdi-file-document-box-multiple-outline
mdi-text-box-multiple-outline
</v-icon>
<b>Files which failed to analyze:</b>
<v-container class="pl-8">
Expand Down

0 comments on commit 5a5bfc0

Please sign in to comment.