Skip to content

Commit

Permalink
Merge pull request #266 from girder/full-yarn-upgrade
Browse files Browse the repository at this point in the history
Yarn upgrade all packages to latest
  • Loading branch information
zachmullen committed Jul 21, 2020
2 parents 972a7d0 + c7302d0 commit deea486
Show file tree
Hide file tree
Showing 5 changed files with 2,004 additions and 1,717 deletions.
38 changes: 19 additions & 19 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "@girder/components",
"version": "2.2.4",
"version": "2.2.5",
"scripts": {
"serve": "vue-cli-service serve demo/main.js",
"build": "vue-cli-service build --target lib --name girder src/index.js",
Expand All @@ -17,37 +17,37 @@
"/vue.config.js"
],
"dependencies": {
"@mdi/font": "^3.5.95",
"axios": "^0.18.1",
"@mdi/font": "^5.3.45",
"axios": "^0.19.2",
"js-cookie": "^2.2.0",
"markdown-it": "^8.4.2",
"moment": "^2.24.0",
"qs": "^6.5.2",
"markdown-it": "^11.0.0",
"moment": "^2.27.0",
"qs": "^6.9.4",
"vue": "^2.6.10",
"vue-async-computed": "^3.4.1",
"vuetify": "^2.2.4"
"vuetify": "^2.3.1"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@vue/cli-plugin-babel": "^4.2.3",
"@vue/cli-plugin-eslint": "~4.2.0",
"@vue/cli-plugin-unit-jest": "^4.2.3",
"@vue/cli-service": "~4.2.3",
"@babel/core": "^7.10.2",
"@vue/cli-plugin-babel": "^4.4.4",
"@vue/cli-plugin-eslint": "~4.4.4",
"@vue/cli-plugin-unit-jest": "^4.4.4",
"@vue/cli-service": "~4.4.4",
"@vue/eslint-config-airbnb": "^5.0.2",
"@vue/test-utils": "1.0.0-beta.29",
"axios-mock-adapter": "^1.18.1",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.1",
"babel-jest": "^26.0.1",
"eslint": "7.2.0",
"eslint-plugin-import": "^2.21.2",
"eslint-plugin-vue": "^6.1.2",
"sass": "^1.22.7",
"sass": "^1.26.8",
"sass-loader": "^8.0.2",
"stylelint": "^9.6.0",
"stylelint-config-standard": "^18.2.0",
"stylelint": "^13.6.1",
"stylelint-config-standard": "^20.0.0",
"vue-cli-plugin-vuetify": "~2.0.5",
"vue-template-compiler": "^2.6.10",
"vuetify-loader": "^1.4.3"
"vuetify-loader": "^1.5.0"
},
"eslintConfig": {
"root": true,
Expand Down
1 change: 0 additions & 1 deletion src/components/Presentation/DataTable.vue
Expand Up @@ -169,7 +169,6 @@ export default {
</v-data-table>
</template>


<style lang="scss">
.girder-data-table {
cursor: default;
Expand Down
1 change: 0 additions & 1 deletion tests/unit/Search.spec.js
Expand Up @@ -59,7 +59,6 @@ function getMockSearchResult(users = 1, folders = 1, items = 1) {
};
}


describe('Search', () => {
const girderRest = new RestClient();
const mock = new MockAdapter(girderRest);
Expand Down
1 change: 0 additions & 1 deletion tests/unit/utils.js
Expand Up @@ -61,7 +61,6 @@ async function authenticateRestClient(girderRest, mock) {
return girderRest;
}


export {
flushPromises,
girderVue,
Expand Down

0 comments on commit deea486

Please sign in to comment.