Merge branch 'winh-remove-vue-resource' into 'master'

Remove vue-resource dependency

Closes #18662 and #31361

See merge request gitlab-org/gitlab!16602

app/assets/javascripts/boards/index.js

@@ -22,7 +22,6 @@ import Board from 'ee_else_ce/boards/components/board';
 import BoardSidebar from 'ee_else_ce/boards/components/board_sidebar';
 import initNewListDropdown from 'ee_else_ce/boards/components/new_list_dropdown';
 import BoardAddIssuesModal from '~/boards/components/modal/index.vue';
-import '~/vue_shared/vue_resource_interceptor';
 import {
   NavigationType,
   convertObjectPropsToCamelCase,

app/assets/javascripts/commons/vue.js

 import Vue from 'vue';
-import '../vue_shared/vue_resource_interceptor';
 
 if (process.env.NODE_ENV !== 'production') {
   Vue.config.productionTip = false;

app/assets/javascripts/diff_notes/services/resolve.js

@@ -2,7 +2,6 @@
 
 import Vue from 'vue';
 import Flash from '../../flash';
-import '../../vue_shared/vue_resource_interceptor';
 import { __ } from '~/locale';
 
 window.gl = window.gl || {};

app/assets/javascripts/issue_show/index.js

@@ -2,7 +2,6 @@ import Vue from 'vue';
 import { initSidebarTracking } from 'ee_else_ce/event_tracking/issue_sidebar';
 import issuableApp from './components/app.vue';
 import { parseIssuableData } from './utils/parse_data';
-import '../vue_shared/vue_resource_interceptor';
 
 export default function initIssueableApp() {
   return new Vue({

app/assets/javascripts/lib/utils/axios_utils.js

@@ -8,19 +8,19 @@ axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 // Maintain a global counter for active requests
 // see: spec/support/wait_for_requests.rb
 axios.interceptors.request.use(config => {
-  window.activeVueResources = window.activeVueResources || 0;
-  window.activeVueResources += 1;
+  window.pendingRequests = window.pendingRequests || 0;
+  window.pendingRequests += 1;
   return config;
 });
 
 // Remove the global counter
 axios.interceptors.response.use(
   response => {
-    window.activeVueResources -= 1;
+    window.pendingRequests -= 1;
     return response;
   },
   err => {
-    window.activeVueResources -= 1;
+    window.pendingRequests -= 1;
     return Promise.reject(err);
   },
 );

app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue

@@ -27,8 +27,7 @@ export default {
 
     /**
         pageInfo will come from the headers of the API call
-        in the `.then` clause of the VueResource API call
-        there should be a function that contructs the pageInfo for this component
+        there should be a function that constructs the pageInfo for this component
 
         This is an example:
 

app/assets/javascripts/vue_shared/vue_resource_interceptor.js

-import Vue from 'vue';
-import VueResource from 'vue-resource';
-import csrf from '../lib/utils/csrf';
-
-Vue.use(VueResource);
-
-// Maintain a global counter for active requests
-// see: spec/support/wait_for_requests.rb
-Vue.http.interceptors.push((request, next) => {
-  window.activeVueResources = window.activeVueResources || 0;
-  window.activeVueResources += 1;
-
-  next(() => {
-    window.activeVueResources -= 1;
-  });
-});
-
-// Inject CSRF token and parse headers.
-// New Vue Resource version uses Headers, we are expecting a plain object to render pagination
-// and polling.
-Vue.http.interceptors.push((request, next) => {
-  request.headers.set(csrf.headerKey, csrf.token);
-
-  next(response => {
-    // Headers object has a `forEach` property that iterates through all values.
-    const headers = {};
-
-    response.headers.forEach((value, key) => {
-      headers[key] = value;
-    });
-    // eslint-disable-next-line no-param-reassign
-    response.headers = headers;
-  });
-});

package.json

@@ -133,7 +133,6 @@
     "vue": "^2.6.10",
     "vue-apollo": "^3.0.0-beta.28",
     "vue-loader": "^15.7.0",
-    "vue-resource": "^1.5.1",
     "vue-router": "^3.0.2",
     "vue-template-compiler": "^2.6.10",
     "vue-virtual-scroll-list": "^1.3.1",

spec/features/issues_spec.rb

@@ -470,9 +470,6 @@ describe 'Issues' do
             expect(page).to have_content 'None'
           end
 
-          # wait_for_requests does not work with vue-resource at the moment
-          sleep 1
-
           expect(issue.reload.assignees).to be_empty
         end
 

spec/frontend/helpers/vue_resource_helper.js

-// eslint-disable-next-line import/prefer-default-export
-export const headersInterceptor = (request, next) => {
-  next(response => {
-    const headers = {};
-    response.headers.forEach((value, key) => {
-      headers[key] = value;
-    });
-    // eslint-disable-next-line no-param-reassign
-    response.headers = headers;
-  });
-};

spec/javascripts/helpers/vue_resource_helper.js

-// eslint-disable-next-line import/prefer-default-export
-export const headersInterceptor = (request, next) => {
-  next(response => {
-    const headers = {};
-    response.headers.forEach((value, key) => {
-      headers[key] = value;
-    });
-    // eslint-disable-next-line no-param-reassign
-    response.headers = headers;
-  });
-};

spec/javascripts/test_bundle.js

@@ -7,7 +7,6 @@ import 'core-js/features/set-immediate';
 import 'vendor/jasmine-jquery';
 import '~/commons';
 import Vue from 'vue';
-import VueResource from 'vue-resource';
 import Translate from '~/vue_shared/translate';
 import jasmineDiff from 'jasmine-diff';
 import { config as testUtilsConfig } from '@vue/test-utils';
@@ -46,7 +45,6 @@ Vue.config.errorHandler = function(err) {
   fail(err);
 };
 
-Vue.use(VueResource);
 Vue.use(Translate);
 
 // enable test fixtures
@@ -102,13 +100,6 @@ afterEach(__rewire_reset_all__); // eslint-disable-line
 // to run our unit tests.
 beforeEach(done => done());
 
-const builtinVueHttpInterceptors = Vue.http.interceptors.slice();
-
-beforeEach(() => {
-  // restore interceptors so we have no remaining ones from previous tests
-  Vue.http.interceptors = builtinVueHttpInterceptors.slice();
-});
-
 let longRunningTestTimeoutHandle;
 
 beforeEach(done => {

spec/support/helpers/wait_for_requests.rb

@@ -49,11 +49,11 @@ module WaitForRequests
     return true unless javascript_test?
 
     finished_all_ajax_requests? &&
-      finished_all_vue_resource_requests?
+      finished_all_axios_requests?
   end
 
-  def finished_all_vue_resource_requests?
-    Capybara.page.evaluate_script('window.activeVueResources || 0').zero?
+  def finished_all_axios_requests?
+    Capybara.page.evaluate_script('window.pendingRequests || 0').zero?
   end
 
   def finished_all_ajax_requests?

vendor/licenses.csv

@@ -1131,7 +1131,6 @@ vue-apollo,3.0.0-beta.25,ISC
 vue-functional-data-merge,2.0.6,MIT
 vue-hot-reload-api,2.3.0,MIT
 vue-loader,15.4.2,MIT
-vue-resource,1.5.0,MIT
 vue-router,3.0.1,MIT
 vue-style-loader,4.1.0,MIT
 vue-template-compiler,2.5.17,MIT