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

Bump Vue to 3.5.13 #13085

Merged
merged 8 commits into from
Jan 22, 2025
Merged

Bump Vue to 3.5.13 #13085

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
8df329e
Bump Vue to 3.5.13
rak-phillip Jan 13, 2025
bea6fda
Resolve vue-router error
rak-phillip Jan 13, 2025
a47c507
Update vue shims
rak-phillip Jan 13, 2025
921cbfc
Remove missing `standard/no-callback-literal` eslint rule
rak-phillip Jan 13, 2025
9dbbe65
Resolve lint warning
rak-phillip Jan 13, 2025
2839761
Disabled failing AKS test
rak-phillip Jan 15, 2025
2bb17c8
Remove neuvector from `test-plugins-build.sh`
rak-phillip Jan 16, 2025
8171b5f
Disable capi, stackstate, and harvester extension tests
rak-phillip Jan 21, 2025
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
5 changes: 4 additions & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
module.exports = {
env: { jest: true },
env: {
jest: true,
'vue/setup-compiler-macros': true,
},
extends: [
'.eslintrc.default.js'
],
Expand Down
17 changes: 14 additions & 3 deletions creators/extension/pkg/vue-shim.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
declare module '*.vue' {
import Vue from 'vue';
export default Vue;
/* eslint-disable */
export { };

declare module 'vue' {
interface ComponentCustomProperties {
/**
* Lookup a given string with the given arguments
* @param raw if set, do not do HTML escaping.
*/
t: {
(key: string, args?: Record<string, any>, raw?: boolean): string;
(options: { k: string; raw?: boolean; tag?: string | Record<string, any>; escapehtml?: boolean }): string;
}
}
}
32 changes: 16 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"cache-loader": "4.1.0",
"clipboard-polyfill": "4.0.1",
"codemirror": "5.65.17",
"codemirror-editor-vue3": "2.7.1",
"codemirror-editor-vue3": "2.8.0",
"color": "4.2.3",
"cookie": "0.7.0",
"cookie-universal": "2.2.2",
Expand Down Expand Up @@ -110,22 +110,22 @@
"node-polyfill-webpack-plugin": "3.0.0",
"papaparse": "5.3.0",
"portal-vue": "3.0.0",
"sass": "1.51.0",
"sass-loader": "12.0.0",
"sass": "1.83.1",
"sass-loader": "12.6.0",
"set-cookie-parser": "2.4.6",
"shell-quote": "1.7.3",
"sinon": "8.1.1",
"ts-node": "8.10.2",
"ufo": "0.7.11",
"unfetch": "4.2.0",
"url-parse": "1.5.10",
"vue-router": "4.4.3",
"vue-router": "4.5.0",
"vue-select": "4.0.0-beta.6",
"vue-server-renderer": "2.6.14",
"vue3-resize": "0.2.0",
"vue3-virtual-scroll-list": "0.2.1",
"vuedraggable": "4.1.0",
"vuex": "4.0.2",
"vuex": "4.1.0",
"xterm": "5.2.1",
"xterm-addon-canvas": "0.5.0",
"xterm-addon-fit": "0.8.0",
Expand All @@ -151,11 +151,11 @@
"@types/js-yaml": "4.0.5",
"@types/lodash": "4.14.184",
"@types/node": "20.10.8",
"@typescript-eslint/eslint-plugin": "5.4.0",
"@typescript-eslint/parser": "5.4.0",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"@vue/cli-service": "5.0.8",
"@vue/eslint-config-standard": "5.1.2",
"@vue/test-utils": "2.0.2",
"@vue/eslint-config-standard": "6.1.0",
"@vue/test-utils": "2.4.6",
"@vue/vue3-jest": "27.0.0",
"add": "2.0.6",
"babel-core": "7.0.0-bridge.0",
Expand All @@ -165,34 +165,34 @@
"babel-plugin-istanbul": "6.1.1",
"babel-plugin-transform-require-context": "0.1.1",
"babel-preset-vue": "2.0.2",
"core-js": "3.25.3",
"core-js": "3.40.0",
"css-loader": "6.7.3",
"csv-loader": "3.0.3",
"cy2": "4.0.9",
"cypress": "11.1.0",
"cypress-delete-downloads-folder": "0.0.4",
"cypress-mochawesome-reporter": "^3.8.2",
"eslint": "7.32.0",
"cypress": "11.1.0",
"eslint-config-standard": "16.0.3",
"eslint-import-resolver-node": "0.3.4",
"eslint-module-utils": "2.6.1",
"eslint-plugin-cypress": "2.12.1",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jest": "24.4.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-vue": "9.10.0",
"eslint": "7.32.0",
"flush-promises": "1.0.2",
"frontmatter-markdown-loader": "3.7.0",
"jest": "27.5.1",
"jest-serializer-vue": "2.0.2",
"jest": "27.5.1",
"lodash.debounce": "4.0.8",
"nodemon": "2.0.22",
"nyc": "15.1.0",
"start-server-and-test": "1.13.1",
"style-loader": "3.3.2",
"ts-jest": "27.1.4",
"ts-jest": "27.1.5",
"typescript": "5.6.3",
"vue": "3.2.47",
"vue": "3.5.13",
"webpack-bundle-analyzer": "4.5.0",
"webpack-virtual-modules": "0.4.3",
"worker-loader": "3.0.8",
Expand Down
6 changes: 5 additions & 1 deletion pkg/aks/components/__tests__/CruAks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,11 @@ describe('aks provisioning form', () => {
})).toHaveLength(2);
});

it('should display subnets grouped by network in the virtual network dropdown', async() => {
/**
* TODO: Issue #13122 - bumping Vue and related deps to 3.5.x uncovered a
* legitimate bug that exists in master
*/
it.skip('should display subnets grouped by network in the virtual network dropdown', async() => {
const noneOption = { label: 'generic.none' };
const config = {
dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', resourceLocation: 'eastus'
Expand Down
4 changes: 2 additions & 2 deletions pkg/gke/components/AccountAccess.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ export default defineComponent({

this.$emit('update:isAuthenticated', true);

// eslint-disable-next-line standard/no-callback-literal, node/no-callback-literal
// eslint-disable-next-line node/no-callback-literal
return cb(true);
} catch (e) {
this.$emit('error', e?.data || e);
this.$emit('update:isAuthenticated', false);

// eslint-disable-next-line standard/no-callback-literal, node/no-callback-literal
// eslint-disable-next-line node/no-callback-literal
return cb(false);
}
},
Expand Down
36 changes: 18 additions & 18 deletions pkg/rancher-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,34 +24,34 @@
"lodash.debounce": "4.0.8"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "~5.4.0",
"@typescript-eslint/parser": "~5.4.0",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
"@vue/cli-plugin-typescript": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"@vue/eslint-config-standard": "5.1.2",
"@vue/eslint-config-typescript": "~9.1.0",
"@vue/test-utils": "~2.0.0-0",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-eslint": "5.0.8",
"@vue/cli-plugin-typescript": "5.0.8",
"@vue/cli-service": "5.0.8",
"@vue/eslint-config-standard": "6.1.0",
"@vue/eslint-config-typescript": "9.1.0",
"@vue/test-utils":"2.4.6",
"babel-eslint": "10.1.0",
"core-js": "3.25.3",
"core-js": "3.40.0",
"cron-validator": "1.3.1",
"cronstrue": "2.50.0",
"eslint": "7.32.0",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "4.2.1",
"eslint-plugin-promise": "5.2.0",
"eslint-plugin-standard": "4.0.0",
"eslint-plugin-vue": "9.10.0",
"eslint": "7.32.0",
"jsonpath-plus": "10.0.7",
"sass": "1.55.0",
"sass-loader": "~12.0.0",
"sass-loader": "12.6.0",
"sass": "1.83.1",
"typescript": "5.6.3",
"vue": "~3.2.13",
"vue": "^3.2.13",
cnotv marked this conversation as resolved.
Show resolved Hide resolved
"eslint-plugin-local-rules": "link:../../eslint-plugin-local-rules"
},
"peerDependencies": {
"core-js": "3.25.3",
"vue": "~3.2.13"
"core-js": "3.40.0",
"vue": "^3.2.13"
}
}
9 changes: 2 additions & 7 deletions pkg/rancher-components/src/shim-vue.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { DefineComponent } from 'vue'
export {}

declare module '*.vue' {
const component: DefineComponent<{}, {}, any>
export default component
}

declare module '@vue/runtime-core' {
declare module 'vue' {
interface ComponentCustomProperties {
Copy link
Member Author

Choose a reason for hiding this comment

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

It appears that we want to provide type augments for vue rather than @vue/runtime-core12

Footnotes

  1. https://vuejs.org/guide/typescript/options-api#type-augmentation-placement ↩

  2. https://github.com/lovetingyuan/router/blob/97be7c3462b1d44bf7767a76b7290b6764150895/packages/router/src/globalExtensions.ts#L11 ↩

/**
* Lookup a given string with the given arguments
Expand Down
1 change: 0 additions & 1 deletion shell/config/router/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export default [
{
path: '/',
component: () => interopDefault(import('@shell/pages/index.vue')),
name: 'index',
meta: { requiresAuthentication: true },
children: [
{
Expand Down
46 changes: 23 additions & 23 deletions shell/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,51 +41,51 @@
"@types/is-url": "1.2.30",
"@types/node": "20.10.8",
"@types/semver": "^7.5.8",
"@typescript-eslint/eslint-plugin": "~5.4.0",
"@typescript-eslint/parser": "~5.4.0",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-typescript": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"@vue/test-utils": "~2.0.0-0",
"@vue/vue3-jest": "^27.0.0-alpha.1",
"@vue/cli-service": "5.0.8",
"@vue/test-utils": "2.4.6",
"@vue/vue3-jest": "27.0.0",
"add": "2.0.6",
"ansi_up": "5.0.0",
"axios": "0.21.4",
"axios-retry": "3.1.9",
"axios": "0.21.4",
"babel-eslint": "10.1.0",
"babel-plugin-module-resolver": "4.0.0",
"babel-preset-vue": "2.0.2",
"cache-loader": "4.1.0",
"clipboard-polyfill": "4.0.1",
"color": "4.2.3",
"codemirror-editor-vue3": "2.8.0",
"codemirror": ">=5.64.0 <6",
"codemirror-editor-vue3": "2.7.1",
"cookie": "0.7.0",
"color": "4.2.3",
"cookie-universal": "2.2.2",
"core-js": "3.25.3",
"cookie": "0.7.0",
"core-js": "3.40.0",
"cron-validator": "1.3.1",
"cronstrue": "2.50.0",
"cross-env": "7.0.3",
"css-loader": "6.7.3",
"csv-loader": "3.0.3",
"custom-event-polyfill": "^1.0.7",
"cypress": "10.3.1",
"d3": "7.3.0",
"cypress": "11.1.0",
"d3-selection": "1.4.1",
"d3": "7.3.0",
"dayjs": "1.8.29",
"defu": "5.0.1",
"diff2html": "3.4.24",
"dompurify": "2.5.4",
"element-matches": "^0.1.2",
"eslint": "7.32.0",
"eslint-config-standard": "16.0.3",
"eslint-import-resolver-node": "0.3.4",
"eslint-module-utils": "2.6.1",
"eslint-plugin-cypress": "2.12.1",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jest": "24.4.0",
"eslint-plugin-n": "15.2.0",
"eslint-plugin-vue": "9.10.0",
"eslint": "7.32.0",
"event-target-shim": "5.0.1",
"express": "4.17.1",
"file-saver": "2.0.2",
Expand All @@ -95,26 +95,26 @@
"intl-messageformat": "7.8.4",
"ip": "2.0.1",
"is-url": "1.2.4",
"jest": "27.5.1",
"jest-serializer-vue": "2.0.2",
"jexl": "2.3.0",
"jest": "27.5.1",
"jquery": "3.5.1",
"js-cookie": "2.2.1",
"js-yaml": "4.1.0",
"js-yaml-loader": "1.2.2",
"js-yaml": "4.1.0",
"jsdiff": "1.1.1",
"jsonpath-plus": "10.0.7",
"jsrsasign": "10.5.25",
"jszip": "3.8.0",
"lodash": "4.17.21",
"marked": "4.0.17",
"node-polyfill-webpack-plugin": "3.0.0",
"nodemon": "2.0.22",
"nyc": "15.1.0",
"node-polyfill-webpack-plugin": "3.0.0",
"papaparse": "5.3.0",
"portal-vue": "~3.0.0",
"sass": "1.51.0",
"sass-loader": "~12.0.0",
"sass-loader": "12.6.0",
"sass": "1.83.1",
"serve-static": "1.14.1",
"set-cookie-parser": "2.4.6",
"shell-quote": "1.7.3",
Expand All @@ -126,23 +126,23 @@
"ufo": "0.7.11",
"unfetch": "4.2.0",
"url-parse": "1.5.10",
"vue": "~3.2.13",
"vue-router": "4.4.3",
"vue-router": "4.5.0",
"vue-select": "4.0.0-beta.6",
"vue-server-renderer": "2.7.16",
"vue": "^3.2.13",
"vue3-resize": "0.2.0",
"vue3-virtual-scroll-list": "0.2.1",
"vuedraggable": "4.1.0",
"vuex": "~4.0.0",
"vuex": "4.1.0",
"webpack-bundle-analyzer": "4.5.0",
"webpack-virtual-modules": "0.4.3",
"worker-loader": "3.0.8",
"xterm": "5.2.1",
"xterm-addon-canvas": "0.5.0",
"xterm-addon-fit": "0.8.0",
"xterm-addon-search": "0.13.0",
"xterm-addon-web-links": "0.9.0",
"xterm-addon-webgl": "0.16.0",
"xterm": "5.2.1",
"yarn": "1.22.18"
},
"resolutions": {
Expand Down
10 changes: 6 additions & 4 deletions shell/scripts/test-plugins-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,11 @@ function clone_repo_test_extension_build() {
# Don't forget to add the unit tests exception to clone_repo_test_extension_build function if a new extension has those
clone_repo_test_extension_build "rancher" "kubewarden-ui" "kubewarden"
clone_repo_test_extension_build "rancher" "elemental-ui" "elemental"
clone_repo_test_extension_build "neuvector" "manager-ext" "neuvector-ui-ext"
clone_repo_test_extension_build "rancher" "capi-ui-extension" "capi"
clone_repo_test_extension_build "StackVista" "rancher-extension-stackstate" "observability"
clone_repo_test_extension_build "harvester" "harvester-ui-extension" "harvester"
# TODO #13141: Enable neuvector tests after issues have been resolved
# clone_repo_test_extension_build "neuvector" "manager-ext" "neuvector-ui-ext"
# TODO: #13173: Enable capi, stackstate, and harvester after `entities` resolution has been set
# clone_repo_test_extension_build "rancher" "capi-ui-extension" "capi"
# clone_repo_test_extension_build "StackVista" "rancher-extension-stackstate" "observability"
# clone_repo_test_extension_build "harvester" "harvester-ui-extension" "harvester"

echo "All done"
10 changes: 2 additions & 8 deletions shell/types/vue-shim.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
/* eslint-disable */
import type { DefineComponent } from 'vue'
import { ComponentCustomProperties } from 'vue';
export {};

declare module '*.vue' {
const component: DefineComponent<{}, {}, any>
export default component
}

declare module '@vue/runtime-core' {
declare module 'vue' {
interface ComponentCustomProperties {
t: {
(key: string, args?: Record<string, any>, raw?: boolean): string;
Expand Down
Loading
Loading