Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #481

Merged
merged 8 commits into from
Aug 25, 2020
Merged

Update dependencies #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
316b15a
Update dependencies
kinow Aug 19, 2020
9a8436c
Install `eslint-plugin-import` reported as missing when tried to buil…
kinow Aug 19, 2020
7221e7a
Add babel-runtime for vue-markdown
kinow Aug 19, 2020
fabcdcb
Use getIntrospectionQuery now instead of introspectionQuery.
kinow Aug 19, 2020
21ead91
lodash is not only for development
kinow Aug 19, 2020
54fab8c
Apollo Boost is not necessary. Apollo libraries are for runtime, and …
kinow Aug 19, 2020
04d701a
Add changelog
kinow Aug 19, 2020
d88bed4
Add (now) missing @vue/babel-preset-app for development dependencies
kinow Aug 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ None or N/A.
[#458](https://github.com/cylc/cylc-ui/pull/458) - Add CylcTree and
use deltas for the Tree view and component.

[#481](https://github.com/cylc/cylc-ui/pull/481) - Update dependencies,
most important ones were Vue/React, Apollo GraphQL libraries, GraphQL,
and the development libraries.

### Fixes

None.
Expand Down
120 changes: 61 additions & 59 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,87 +17,89 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"@lumino/algorithm": "^1.3.2",
"@lumino/datagrid": "^0.3.1",
"@lumino/default-theme": "^0.1.8",
"@lumino/widgets": "^1.9.3",
"apollo-boost": "^0.4.4",
"apollo-utilities": "^1.3.2",
"@lumino/algorithm": "^1.3.3",
"@lumino/datagrid": "^0.12.0",
"@lumino/default-theme": "^0.4.4",
"@lumino/widgets": "^1.13.4",
"apollo-cache-inmemory": "^1.6.6",
"apollo-client": "^2.6.10",
"apollo-link": "^1.2.14",
"apollo-link-http": "^1.5.17",
"apollo-link-ws": "^1.0.20",
"apollo-utilities": "^1.3.4",
"axios": "^0.19.2",
"axios-fetch": "^1.1.0",
"cytoscape": "^3.9.0",
"babel-runtime": "^6.26.0",
"cytoscape": "^3.15.2",
"cytoscape-dagre": "^2.2.2",
"cytoscape-expand-collapse": "^3.1.2",
"cytoscape-node-html-label": "^1.1.5",
"cytoscape-expand-collapse": "^4.0.0",
"cytoscape-node-html-label": "^1.2.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm updating the Graph dependencies, assuming they won't require us to change anything in the Graph component or view 👍 if they demand further work, I will remove these changes to simplify the PR, since we may choose a different library for handling Graphs in Cylc UI.

Copy link
Member

@hjoliver hjoliver Aug 19, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we may want to remove the graph view next release, pending @oliver-sanders massive re-do. Probably not good to have a barely-usable POC graph view with wrong look-and-feel alongside our nice (and now performant, post deltas) tree view. (n-distance windows might save graph view performance, but still have the other problems...).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least removing dependencies and code is easier. Just need to remember to remove not only cytoscape- dependencies, but also the tippy I think. Would be nice if there were dependency groups in NPM, or if at least we could add comments to package.json (JSON limitation)

"cytoscape-panzoom": "^2.5.3",
"cytoscape-popper": "^1.0.4",
"cytoscape-undo-redo": "^1.3.1",
"cytoscape-popper": "^1.0.7",
"cytoscape-undo-redo": "^1.3.3",
"dedent": "^0.7.0",
"dotparser": "^0.4.0",
"dotparser": "^1.0.0",
"enumify": "^2.0.0",
"graphiql": "^0.17.5",
"graphql": "^14.5.8",
"graphql-tag": "^2.10.1",
"jshint": "^2.10.2",
"graphiql": "^1.0.3",
"graphql": "^15.3.0",
"graphql-tag": "^2.11.0",
"jshint": "^2.12.0",
"lodash": "^4.17.20",
"nprogress": "^0.2.0",
"react": "^15.6.2",
"react-dom": "^15.6.2",
"tippy.js": "^4.3.5",
"vue": "^2.6.10",
"vue-i18n": "^8.14.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"tippy.js": "^6.2.6",
"vue": "^2.6.11",
"vue-i18n": "^8.21.0",
"vue-markdown": "^2.2.4",
"vue-meta": "^2.3.1",
"vue-router": "^3.1.3",
"vue-spinner": "^1.0.3",
"vue-meta": "^2.4.0",
"vue-router": "^3.4.3",
"vue-spinner": "^1.0.4",
"vue-the-mask": "^0.11.1",
"vuetify": "^2.3.9",
"vuex": "^3.1.1",
"vuetify": "^2.2.6",
"vuex": "^3.5.1",
"vuex-router-sync": "^5.0.0"
},
"devDependencies": {
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@cypress/code-coverage": "^2.0.5",
"@cypress/webpack-preprocessor": "^5.1.2",
"@mdi/font": "^4.5.95",
"@vue/cli-plugin-babel": "^3.12.0",
"@vue/cli-plugin-e2e-cypress": "^4.3.1",
"@vue/cli-plugin-eslint": "^4.2.3",
"@vue/cli-plugin-unit-mocha": "^4.2.3",
"@vue/cli-service": "^4.2.2",
"@vue/test-utils": "^1.0.0-beta.29",
"apollo-cache-inmemory": "^1.6.3",
"apollo-client": "^2.6.4",
"apollo-link": "^1.2.13",
"apollo-link-http": "^1.5.16",
"apollo-link-ws": "^1.0.19",
"axios": "^0.19.0",
"babel-eslint": "^10.0.3",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@cypress/code-coverage": "^3.8.1",
"@cypress/webpack-preprocessor": "^5.4.4",
"@mdi/font": "^5.5.55",
"@vue/babel-preset-app": "^4.5.4",
"@vue/cli-plugin-babel": "^4.5.4",
"@vue/cli-plugin-e2e-cypress": "^4.5.4",
"@vue/cli-plugin-eslint": "^4.5.4",
"@vue/cli-plugin-unit-mocha": "^4.5.4",
"@vue/cli-service": "^4.5.4",
"@vue/test-utils": "^1.0.4",
"babel-eslint": "^10.1.0",
"chai": "^4.2.0",
"cross-env": "^6.0.3",
"cross-fetch": "^3.0.4",
"eslint": "^7.0.0",
"cross-env": "^7.0.2",
"cross-fetch": "^3.0.5",
"eslint": "^7.7.0",
"eslint-config-standard": "^14.1.1",
"eslint-config-vuetify": "^0.5.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.2.2",
"istanbul-instrumenter-loader": "^3.0.1",
"istanbul-lib-coverage": "^3.0.0",
"lodash": "^4.17.15",
"null-loader": "^3.0.0",
"nyc": "^15.0.1",
"sass": "^1.26.3",
"sass-loader": "^8.0.2",
"sinon": "^7.5.0",
"standard": "^14.3.1",
"subscriptions-transport-ws": "^0.9.16",
"null-loader": "^4.0.0",
"nyc": "^15.1.0",
"sass": "^1.26.10",
"sass-loader": "^9.0.3",
"sinon": "^9.0.3",
"standard": "^14.3.4",
"subscriptions-transport-ws": "^0.9.18",
"svgo": "^1.3.2",
"vue-cli-plugin-apollo": "^0.21.0",
"vue-cli-plugin-apollo": "^0.22.2",
"vue-cli-plugin-eslint-config-vuetify": "0.0.3",
"vue-cli-plugin-vuetify": "^2.0.5",
"vue-cli-plugin-vuetify": "^2.0.7",
"vue-cli-plugin-vuetify-essentials": "^0.8.3",
"vue-template-compiler": "^2.6.10",
"vuetify-loader": "^1.3.0",
"webpack": "^4.41.0"
"vue-template-compiler": "^2.6.11",
"vuetify-loader": "^1.6.0",
"webpack": "^4.44.1"
},
"resolutions": {
"istanbul-instrumenter-loader/**/istanbul-lib-instrument": "4.0.1"
Expand Down
4 changes: 2 additions & 2 deletions src/views/Mutations.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

<script>
import gql from 'graphql-tag'
import { introspectionQuery, print } from 'graphql'
import { getIntrospectionQuery as getGraphQLIntrospectionQuery, print } from 'graphql'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed in GraphQL 15. Luckily they didn't remove the functionality.

Note that we already have a function in this module called getIntrospectionQuery, by coincidence. So if we imported like this, we could end up with weird build issues (e.g. recursively calling itself instead of calling the function from the graphql module). So I've renamed the import 👍


import Mutation from '@/components/cylc/Mutation'

Expand Down Expand Up @@ -255,7 +255,7 @@ export default {
// we are only interested in mutations so can make our life
// a little easier by restricting the scope of the default
// introspection query
const fullIntrospection = gql(introspectionQuery)
const fullIntrospection = gql(getGraphQLIntrospectionQuery())
const mutationQuery = gql(`
query {
__schema {
Expand Down
Loading