diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-25 21:15:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-25 21:15:16 +0300 |
| commit | 62866a623e24242c6f7a1a93dc2aca1467d6a6ae (patch) | |
| tree | 322ce00c652d376c949f1d45c39764eeb5bce620 /patches | |
| parent | f8888a274f6b095075fd8648d3732ad577a3a742 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/vue-apollo+3.0.7.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/vue-apollo+3.0.7.patch b/patches/vue-apollo+3.0.7.patch new file mode 100644 index 00000000000..c463150a4e3 --- /dev/null +++ b/patches/vue-apollo+3.0.7.patch @@ -0,0 +1,38 @@ +diff --git a/node_modules/vue-apollo/dist/vue-apollo.esm.js b/node_modules/vue-apollo/dist/vue-apollo.esm.js +index e4b4b15..6d3040b 100644 +--- a/node_modules/vue-apollo/dist/vue-apollo.esm.js ++++ b/node_modules/vue-apollo/dist/vue-apollo.esm.js +@@ -1933,14 +1933,6 @@ function initProvider() { + this.$apolloProvider = typeof optionValue === 'function' ? optionValue() : optionValue; + } else if (options.parent && options.parent.$apolloProvider) { + this.$apolloProvider = options.parent.$apolloProvider; +- } else if (options.provide) { +- // TODO remove +- // Temporary retro-compatibility +- var provided = typeof options.provide === 'function' ? options.provide.call(this) : options.provide; +- +- if (provided && provided.$apolloProvider) { +- this.$apolloProvider = provided.$apolloProvider; +- } + } + } + +diff --git a/node_modules/vue-apollo/dist/vue-apollo.umd.js b/node_modules/vue-apollo/dist/vue-apollo.umd.js +index 2310455..895f996 100644 +--- a/node_modules/vue-apollo/dist/vue-apollo.umd.js ++++ b/node_modules/vue-apollo/dist/vue-apollo.umd.js +@@ -1939,14 +1939,6 @@ + this.$apolloProvider = typeof optionValue === 'function' ? optionValue() : optionValue; + } else if (options.parent && options.parent.$apolloProvider) { + this.$apolloProvider = options.parent.$apolloProvider; +- } else if (options.provide) { +- // TODO remove +- // Temporary retro-compatibility +- var provided = typeof options.provide === 'function' ? options.provide.call(this) : options.provide; +- +- if (provided && provided.$apolloProvider) { +- this.$apolloProvider = provided.$apolloProvider; +- } + } + } + |