Skip to content

Commit 814c014

Browse files
Merge pull request #1269 from MetRonnie/vue3
Upgrade to Vue 3 ⚡
2 parents 8cf019c + 471aad9 commit 814c014

File tree

179 files changed

+8256
-17950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+8256
-17950
lines changed

.env.offline

Lines changed: 0 additions & 2 deletions
This file was deleted.

.eslintrc.js

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,46 @@
1717

1818
module.exports = {
1919
root: true,
20-
env: {
21-
node: true
20+
parserOptions: {
21+
/* Allow new ECMAScript syntax but not globals. This is because vite/esbuild
22+
transforms syntax to es2015 (at the earliest) but does not pollyfill APIs. */
23+
ecmaVersion: 'latest',
2224
},
2325
extends: [
2426
'standard',
2527
'eslint:recommended',
26-
'plugin:vue/essential',
27-
'plugin:cypress/recommended'
28+
'plugin:vue/vue3-essential',
29+
'plugin:vuetify/base',
30+
'plugin:cypress/recommended',
2831
],
2932
rules: {
30-
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
31-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
32-
'no-unreachable': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
33-
'no-unused-vars': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
34-
indent: [
33+
'comma-dangle': [
3534
'error',
36-
2,
3735
{
38-
ignoredNodes: [
39-
'TemplateLiteral'
40-
]
41-
}
36+
arrays: 'only-multiline',
37+
objects: 'only-multiline',
38+
imports: 'only-multiline',
39+
exports: 'only-multiline',
40+
functions: 'never',
41+
},
4242
],
4343
'template-curly-spacing': [
4444
'off'
4545
],
4646
'vue/multi-word-component-names': [
4747
'off'
4848
],
49-
'vue/no-reserved-component-names': [
50-
'off'
51-
],
5249
'vue/valid-v-slot': [
5350
'error',
5451
{
5552
allowModifiers: true
5653
}
5754
],
58-
'import/no-duplicates': 'off',
59-
'no-duplicate-imports': 'error'
55+
'promise/param-names': [
56+
'error'
57+
],
58+
'promise/no-return-wrap': [
59+
'error'
60+
],
6061
},
61-
parserOptions: {
62-
parser: '@babel/eslint-parser'
63-
}
6462
}

.github/workflows/auto_publish_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: yarn install
3636

3737
- name: Build
38-
run: yarn build --optimize
38+
run: yarn build
3939

4040
- name: Get the version number
4141
run: |

.github/workflows/main.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
pull_request:
77
workflow_dispatch:
88

9+
env:
10+
FORCE_COLOR: 2
11+
912
jobs:
1013
unit-test-and-build:
1114
runs-on: ubuntu-latest
@@ -23,26 +26,18 @@ jobs:
2326
run: yarn install
2427

2528
- name: Lint
26-
env:
27-
NODE_ENV: production
2829
run: |
29-
yarn run lint --no-fix
30+
yarn run lint
3031
3132
- name: Test
3233
run: |
33-
yarn run coverage:unit --colors
34-
35-
- name: Docs
36-
uses: andstor/jsdoc-action@v1
37-
with:
38-
config_file: jsdoc.conf.json
39-
# TODO: upload to GH pages?
34+
yarn run coverage:unit
4035
4136
- name: Upload coverage to Codecov
4237
uses: codecov/codecov-action@v3
4338
with:
4439
token: ${{ secrets.CODECOV_TOKEN }}
45-
file: ./coverage/lcov.info
40+
file: ./coverage/clover.xml
4641
name: '${{ github.job }}'
4742
flags: unittests
4843
fail_ci_if_error: false
@@ -54,6 +49,7 @@ jobs:
5449
cypress-run:
5550
runs-on: ${{ matrix.os }}
5651
strategy:
52+
fail-fast: false
5753
matrix:
5854
os: [ubuntu-latest]
5955
browser: [firefox, chrome]
@@ -62,6 +58,8 @@ jobs:
6258
# include:
6359
# - os: macos-latest
6460
# browser: edge
61+
env:
62+
COVERAGE: true
6563
steps:
6664
- name: Checkout
6765
uses: actions/checkout@v3
@@ -71,20 +69,24 @@ jobs:
7169
with:
7270
node-version: '16'
7371

74-
- name: Test
72+
- name: Test (E2E)
73+
if: matrix.type == 'e2e'
7574
uses: cypress-io/github-action@v5
75+
env:
76+
BASE_URL: http://localhost:4173/
7677
with:
77-
start: yarn run serve --hide=CLIENT # turn off build output because it's absurdly long
78-
wait-on: http://localhost:8080/
79-
config-file: cypress.config.js
80-
component: ${{ matrix.type == 'component' }}
81-
spec: |
82-
tests/e2e/**/*
83-
cypress/component/*
84-
cypress/component/**/*
78+
build: yarn run build --mode offline
79+
start: yarn run preview
80+
config: baseUrl=${{ env.BASE_URL }}
81+
wait-on: ${{ env.BASE_URL }}
82+
browser: ${{ matrix.browser }}
83+
84+
- name: Test (component)
85+
if: matrix.type == 'component'
86+
uses: cypress-io/github-action@v5
87+
with:
88+
component: true
8589
browser: ${{ matrix.browser }}
86-
env:
87-
CYPRESS_baseUrl: http://localhost:8080/
8890

8991
- uses: actions/upload-artifact@v3
9092
if: failure()

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ selenium-debug.log*
3333

3434
# Editor-related config that we may want to commit down the line,
3535
# just not yet
36-
jsconfig.json
3736
vue-shim.d.js
3837

3938
# Yarn

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Martin Ryan <[email protected]>
1010
1111
Mel Hall <[email protected]> Melanie Hall <[email protected]>
1212
13+
1314
Sadie Bartholomew <[email protected]> Sadie L. Bartholomew <[email protected]>
1415
Alex Szabó <[email protected]> Szabó Alex
1516

CHANGES.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ creating a new release entry be sure to copy & paste the span tag with the
1010
`actions:bind` attribute, which is used by a regex to find the text to be
1111
updated. Only the first match gets replaced, so it's fine to leave the old
1212
ones in. -->
13+
-------------------------------------------------------------------------------
14+
## __cylc-ui-2.0.0 (<span actions:bind='release-date'>Upcoming</span>)__
15+
16+
### Enhancements
17+
18+
[#1269](https://github.com/cylc/cylc-ui/pull/1269) -
19+
Upgraded Vue and Vuetify frameworks to v3.
20+
1321
-------------------------------------------------------------------------------
1422
## __cylc-ui-1.6.0 (<span actions:bind='release-date'>Upcoming</span>)__
1523

@@ -18,6 +26,12 @@ ones in. -->
1826
[#1187](https://github.com/cylc/cylc-ui/pull/1187) - Improved the workflow
1927
filtering menu in the sidebar.
2028

29+
### Fixes
30+
31+
[#1249](https://github.com/cylc/cylc-ui/pull/1249) - Fix tasks not loading
32+
when navigating between workflows in the standalone `#/tree/` and `#/table/`
33+
views.
34+
2135
-------------------------------------------------------------------------------
2236
## __cylc-ui-1.5.0 (<span actions:bind='release-date'>Released 2023-02-20</span>)__
2337

0 commit comments

Comments
 (0)