Merge branch 'remove-common-vue-ee' into 'master'

EE Port of "Remove common_vue bundle"

See merge request gitlab-org/gitlab-ee!4849

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/views/groups/issues.html.haml

@@ -2,9 +2,6 @@
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@group.name} issues")
 
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'common_vue'
-
 - if group_issues_count(state: 'all').zero?
   = render 'shared/empty_states/issues', project_select_button: true
 - else

app/views/projects/cycle_analytics/show.html.haml

 - @no_container = true
 - page_title "Cycle Analytics"
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag('common_vue')
 
 #cycle-analytics{ class: container_class, "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project) } }
   - if @cycle_analytics_no_data

app/views/projects/edit.html.haml

@@ -3,9 +3,6 @@
 - @content_class = "limit-container-width" unless fluid_layout
 - expanded = Rails.env.test?
 
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag('common_vue')
-
 .project-edit-container
   %section.settings.general-settings.no-animate{ class: ('expanded' if expanded) }
     .settings-header

app/views/projects/environments/index.html.haml

@@ -2,9 +2,6 @@
 - page_title "Environments"
 - add_to_breadcrumbs("Pipelines", project_pipelines_path(@project))
 
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag("common_vue")
-
 #environments-list-view{ data: { environments_data: environments_list_data,
   "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,
   "can-read-environment" => can?(current_user, :read_environment, @project).to_s,

app/views/projects/issues/index.html.haml

@@ -4,9 +4,6 @@
 - page_title "Issues"
 - new_issue_email = @project.new_issuable_address(current_user, 'issue')
 
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'common_vue'
-
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@project.name} issues")
 

app/views/projects/merge_requests/index.html.haml

@@ -6,9 +6,6 @@
 - page_title "Merge Requests"
 - new_merge_request_email = @project.new_issuable_address(current_user, 'merge_request')
 
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'common_vue'
-
 %div{ class: container_class }
   = render 'projects/last_push'
 

app/views/projects/pipelines/show.html.haml

@@ -10,6 +10,3 @@
   = render "projects/pipelines/with_tabs", pipeline: @pipeline
 
 .js-pipeline-details-vue{ data: { endpoint: project_pipeline_path(@project, @pipeline, format: :json) } }
-
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag('common_vue')

app/views/projects/registry/repositories/index.html.haml

@@ -14,8 +14,6 @@
     .col-lg-12
       #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json) } }
 
-      = webpack_bundle_tag('common_vue')
-
   .row.prepend-top-10
     .col-lg-12
       .panel.panel-default

app/views/projects/settings/repository/show.html.haml

@@ -2,9 +2,6 @@
 - page_title "Repository"
 - @content_class = "limit-container-width" unless fluid_layout
 
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag('common_vue')
-
 = render "projects/push_rules/index"
 = render "projects/mirrors/show"
 

app/views/shared/boards/_show.html.haml

@@ -7,7 +7,6 @@
 - page_title "Boards"
 
 - content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'common_vue'
 
   -# haml-lint:disable InlineJavaScript
   %script#js-board-template{ type: "text/x-template" }= render "shared/boards/components/board"

config/webpack.config.js

@@ -49,8 +49,6 @@ function generateEntries() {
 
   const manualEntries = {
     common:               './commons/index.js',
-    common_vue:           './vue_shared/vue_resource_interceptor.js',
-    locale:               './locale/index.js',
     main:                 './main.js',
     raven:                './raven/index.js',
     webpack_runtime:      './webpack.js',

ee/app/views/admin/geo_nodes/index.html.haml

 - page_title 'Geo nodes'
 - @content_class = "geo-admin-container"
 
-= webpack_bundle_tag 'common_vue'
-
 %h2.page-title.clearfix
   %span.title-text.pull-left= _("Geo Nodes")
   = link_to s_("GeoNodes|New node"), new_admin_geo_node_path, class: 'btn btn-create pull-right'

ee/app/views/groups/epics/show.html.haml

@@ -12,7 +12,4 @@
 
 - page_card_attributes @epic.card_attributes
 
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'common_vue'
-
 #epic-show-app{ data: epic_show_app_data(@epic, author_icon: avatar_icon_for_user(@epic.author), initial: issuable_initial_data(@epic)) }

ee/app/views/groups/roadmap/show.html.haml

@@ -5,8 +5,6 @@
 - breadcrumb_title _("Epics Roadmap")
 
 - if @epics_count != 0
-  - content_for :page_specific_javascripts do
-    = webpack_bundle_tag 'common_vue'
   #js-roadmap{ data: { epics_path: group_epics_path(@group, format: :json), group_id: @group.id, empty_state_illustration: image_path('illustrations/epics/roadmap.svg') } }
 - else
   = render 'shared/empty_states/roadmap'

ee/app/views/ide/index.html.haml

@@ -2,7 +2,6 @@
 - page_title 'IDE'
 
 - content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'common_vue'
   = webpack_bundle_tag 'ide', force_same_domain: true
 
 #ide.ide-loading{ data: {"empty-state-svg-path" => image_path('illustrations/multi_file_editor_empty.svg'),

ee/app/views/shared/empty_states/_epics.html.haml

@@ -9,6 +9,4 @@
       %p
         = _('Track groups of issues that share a theme, across projects and milestones')
       - if can?(current_user, :create_epic, @group)
-        - content_for :page_specific_javascripts do
-          = webpack_bundle_tag 'common_vue'
         #new-epic-app{ data: { endpoint: request.url } }

ee/app/views/shared/empty_states/_roadmap.html.haml

@@ -9,8 +9,6 @@
       %p
         = _('To view the roadmap, add a planned start or finish date to one of your epics in this group or its subgroups. Only epics in the past 3 months and the next 3 months are shown.')
       - if can?(current_user, :create_epic, @group)
-        - content_for :page_specific_javascripts do
-          = webpack_bundle_tag 'common_vue'
         #new-epic-app{ data: { endpoint: request.url } }
       = link_to group_epics_path(@group), title: 'List', class: 'btn' do
         %span= _('View epics list')

spec/javascripts/environments/environments_app_spec.js

@@ -60,7 +60,8 @@ describe('Environment', () => {
       });
     });
 
-    describe('with environments', () => {
+    describe('with paginated environments', () => {
+      let backupInterceptors;
       const environmentsResponseInterceptor = (request, next) => {
         next((response) => {
           response.headers.set('X-nExt-pAge', '2');
@@ -84,16 +85,16 @@ describe('Environment', () => {
       };
 
       beforeEach(() => {
-        Vue.http.interceptors.push(environmentsResponseInterceptor);
-        Vue.http.interceptors.push(headersInterceptor);
+        backupInterceptors = Vue.http.interceptors;
+        Vue.http.interceptors = [
+          environmentsResponseInterceptor,
+          headersInterceptor,
+        ];
         component = mountComponent(EnvironmentsComponent, mockData);
       });
 
       afterEach(() => {
-        Vue.http.interceptors = _.without(
-          Vue.http.interceptors, environmentsResponseInterceptor,
-        );
-        Vue.http.interceptors = _.without(Vue.http.interceptors, headersInterceptor);
+        Vue.http.interceptors = backupInterceptors;
       });
 
       it('should render a table with environments', (done) => {