diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
| commit | db384e6b19af03b4c3c82a5760d83a3fd79f7982 (patch) | |
| tree | 34beaef37df5f47ccbcf5729d7583aae093cffa0 /patches | |
| parent | 54fd7b1bad233e3944434da91d257fa7f63c3996 (diff) | |
Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/@vue+compat+3.2.47.patch | 15 | ||||
| -rw-r--r-- | patches/@vue+test-utils-vue3+2.3.1.patch | 7 |
2 files changed, 19 insertions, 3 deletions
diff --git a/patches/@vue+compat+3.2.47.patch b/patches/@vue+compat+3.2.47.patch new file mode 100644 index 00000000000..20ee26a0308 --- /dev/null +++ b/patches/@vue+compat+3.2.47.patch @@ -0,0 +1,15 @@ +diff --git a/node_modules/@vue/compat/dist/vue.cjs.js b/node_modules/@vue/compat/dist/vue.cjs.js +index 0d10385..d1a5185 100644 +--- a/node_modules/@vue/compat/dist/vue.cjs.js ++++ b/node_modules/@vue/compat/dist/vue.cjs.js +@@ -5877,9 +5877,7 @@ function installCompatInstanceProperties(map) { + const res = {}; + for (const key in i.slots) { + const fn = i.slots[key]; +- if (!fn._ns /* non-scoped slot */) { +- res[key] = fn; +- } ++ res[key] = fn; + } + return res; + }, diff --git a/patches/@vue+test-utils-vue3+2.3.1.patch b/patches/@vue+test-utils-vue3+2.3.1.patch index c455db38089..c4d0324baf8 100644 --- a/patches/@vue+test-utils-vue3+2.3.1.patch +++ b/patches/@vue+test-utils-vue3+2.3.1.patch @@ -1,14 +1,15 @@ diff --git a/node_modules/@vue/test-utils-vue3/dist/vue-test-utils.cjs.js b/node_modules/@vue/test-utils-vue3/dist/vue-test-utils.cjs.js -index 2902a1e..4f5ab30 100644 +index 2902a1e..0c1e6b5 100644 --- a/node_modules/@vue/test-utils-vue3/dist/vue-test-utils.cjs.js +++ b/node_modules/@vue/test-utils-vue3/dist/vue-test-utils.cjs.js -@@ -7945,7 +7945,8 @@ function createStubComponentsTransformer(_a) { +@@ -7945,7 +7945,9 @@ function createStubComponentsTransformer(_a) { var stubName = name || registeredName || componentName; return ((_c = (_b = (_a = config.plugins).createStubs) === null || _b === void 0 ? void 0 : _b.call(_a, { name: stubName, - component: type + component: type, -+ registerStub ++ registerStub, ++ stubs })) !== null && _c !== void 0 ? _c : createStub({ name: stubName, type: type, |