From d434c62a83f5fe02f6eff3b9e311cba2eab38bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Mon, 26 Feb 2018 19:43:34 +0000 Subject: [PATCH] Move EE-specific JavaScript files to ee/app/assets/javascripts --- app/assets/javascripts/boards/index.js | 10 ++++++---- app/assets/javascripts/boards/stores/boards_store.js | 2 +- .../environments/components/environments_table.vue | 2 +- app/assets/javascripts/ide/components/repo_file.vue | 6 +++--- app/assets/javascripts/ide/components/repo_tab.vue | 2 +- .../components/mr_widget_pipeline.vue | 6 +++--- config/webpack.config.js | 1 + .../ci_variable_list/ci_variable_list_spec.js | 2 +- spec/javascripts/clusters/clusters_bundle_spec.js | 2 +- .../clusters/components/application_row_spec.js | 2 +- .../clusters/components/applications_spec.js | 2 +- .../commit/commit_pipeline_status_component_spec.js | 2 +- spec/javascripts/cycle_analytics/banner_spec.js | 2 +- .../cycle_analytics/total_time_component_spec.js | 2 +- spec/javascripts/environments/emtpy_state_spec.js | 2 +- .../javascripts/environments/environment_table_spec.js | 2 +- spec/javascripts/environments/environments_app_spec.js | 4 ++-- .../folder/environments_folder_view_spec.js | 4 ++-- .../feature_highlight/feature_highlight_helper_spec.js | 2 +- spec/javascripts/groups/components/group_item_spec.js | 3 +-- spec/javascripts/groups/components/groups_spec.js | 3 +-- .../javascripts/groups/components/item_actions_spec.js | 3 +-- spec/javascripts/groups/components/item_caret_spec.js | 2 +- spec/javascripts/groups/components/item_stats_spec.js | 3 +-- .../groups/components/item_stats_value_spec.js | 2 +- .../groups/components/item_type_icon_spec.js | 3 +-- spec/javascripts/issue_show/components/app_spec.js | 2 +- .../issue_show/components/description_spec.js | 2 +- spec/javascripts/jobs/header_spec.js | 2 +- .../jobs/index/components/stop_jobs_modal_spec.js | 2 +- .../shared/components/delete_milestone_modal_spec.js | 2 +- spec/javascripts/pipelines/graph/job_component_spec.js | 2 +- spec/javascripts/pipelines/pipelines_spec.js | 2 +- .../account/components/delete_account_modal_spec.js | 2 +- .../projects_dropdown/components/app_spec.js | 2 +- .../components/projects_list_frequent_spec.js | 2 +- .../components/projects_list_item_spec.js | 2 +- .../components/projects_list_search_spec.js | 2 +- .../projects_dropdown/components/search_spec.js | 2 +- spec/javascripts/registry/components/app_spec.js | 2 +- .../components/commit_sidebar/list_collapsed_spec.js | 2 +- .../repo/components/commit_sidebar/list_item_spec.js | 2 +- .../repo/components/commit_sidebar/list_spec.js | 2 +- .../repo/components/ide_context_bar_spec.js | 2 +- spec/javascripts/repo/components/ide_side_bar_spec.js | 2 +- spec/javascripts/repo/components/ide_spec.js | 2 +- .../repo/components/new_branch_form_spec.js | 2 +- .../repo/components/new_dropdown/index_spec.js | 2 +- .../repo/components/new_dropdown/modal_spec.js | 2 +- .../repo/components/new_dropdown/upload_spec.js | 2 +- .../repo/components/repo_commit_section_spec.js | 2 +- .../javascripts/sidebar/lock/edit_form_buttons_spec.js | 2 +- spec/javascripts/sidebar/participants_spec.js | 2 +- spec/javascripts/sidebar/sidebar_assignees_spec.js | 2 +- spec/javascripts/sidebar/sidebar_subscriptions_spec.js | 2 +- spec/javascripts/sidebar/subscriptions_spec.js | 2 +- .../vue_mr_widget/components/mr_widget_author_spec.js | 2 +- .../components/mr_widget_author_time_spec.js | 2 +- .../vue_mr_widget/components/mr_widget_header_spec.js | 2 +- .../components/mr_widget_merge_help_spec.js | 2 +- .../components/mr_widget_pipeline_spec.js | 2 +- .../vue_mr_widget/components/mr_widget_rebase_spec.js | 2 +- .../components/mr_widget_related_links_spec.js | 2 +- .../components/mr_widget_status_icon_spec.js | 2 +- .../components/states/mr_widget_archived_spec.js | 2 +- .../states/mr_widget_auto_merge_failed_spec.js | 2 +- .../components/states/mr_widget_checking_spec.js | 2 +- .../components/states/mr_widget_closed_spec.js | 2 +- .../components/states/mr_widget_conflicts_spec.js | 2 +- .../states/mr_widget_failed_to_merge_spec.js | 2 +- .../mr_widget_merge_when_pipeline_succeeds_spec.js | 2 +- .../components/states/mr_widget_merged_spec.js | 2 +- .../components/states/mr_widget_merging_spec.js | 2 +- .../components/states/mr_widget_missing_branch_spec.js | 2 +- .../components/states/mr_widget_not_allowed_spec.js | 2 +- .../states/mr_widget_pipeline_blocked_spec.js | 2 +- .../vue_mr_widget/mr_widget_options_spec.js | 2 +- .../vue_shared/components/ci_badge_link_spec.js | 2 +- .../vue_shared/components/clipboard_button_spec.js | 2 +- .../vue_shared/components/expand_button_spec.js | 2 +- .../vue_shared/components/file_icon_spec.js | 2 +- .../javascripts/vue_shared/components/gl_modal_spec.js | 2 +- .../vue_shared/components/header_ci_component_spec.js | 2 +- spec/javascripts/vue_shared/components/icon_spec.js | 2 +- .../vue_shared/components/issue/issue_warning_spec.js | 2 +- .../vue_shared/components/loading_button_spec.js | 2 +- spec/javascripts/vue_shared/components/modal_spec.js | 2 +- .../vue_shared/components/navigation_tabs_spec.js | 2 +- .../components/notes/placeholder_system_note_spec.js | 2 +- .../vue_shared/components/panel_resizer_spec.js | 2 +- spec/javascripts/vue_shared/components/pikaday_spec.js | 2 +- .../components/sidebar/collapsed_calendar_icon_spec.js | 2 +- .../sidebar/collapsed_grouped_date_picker_spec.js | 2 +- .../vue_shared/components/sidebar/date_picker_spec.js | 2 +- .../components/sidebar/toggle_sidebar_spec.js | 2 +- .../components/skeleton_loading_container_spec.js | 2 +- .../vue_shared/components/stacked_progress_bar_spec.js | 2 +- .../vue_shared/components/toggle_button_spec.js | 2 +- .../components/user_avatar/user_avatar_image_spec.js | 2 +- 99 files changed, 110 insertions(+), 112 deletions(-) diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js index 06a8abea940..8e31f1865f0 100644 --- a/app/assets/javascripts/boards/index.js +++ b/app/assets/javascripts/boards/index.js @@ -2,11 +2,13 @@ import _ from 'underscore'; import Vue from 'vue'; -import Flash from '../flash'; -import { __ } from '../locale'; + +import Flash from '~/flash'; +import { __ } from '~/locale'; + import FilteredSearchBoards from './filtered_search_boards'; import eventHub from './eventhub'; -import sidebarEventHub from '../sidebar/event_hub'; +import sidebarEventHub from '~/sidebar/event_hub'; // eslint-disable-line import/first import './models/issue'; import './models/label'; import './models/list'; @@ -22,7 +24,7 @@ import './components/board'; import './components/board_sidebar'; import './components/new_list_dropdown'; import './components/modal/index'; -import '../vue_shared/vue_resource_interceptor'; +import '~/vue_shared/vue_resource_interceptor'; // eslint-disable-line import/first export default () => { const $boardApp = document.getElementById('board-app'); diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js index 798d7e0d147..348cdeec737 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js +++ b/app/assets/javascripts/boards/stores/boards_store.js @@ -2,7 +2,7 @@ /* global List */ import _ from 'underscore'; import Cookies from 'js-cookie'; -import { getUrlParamsArray } from '../../lib/utils/common_utils'; +import { getUrlParamsArray } from '~/lib/utils/common_utils'; window.gl = window.gl || {}; window.gl.issueBoards = window.gl.issueBoards || {}; diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue index b4eca47957e..22863e926d4 100644 --- a/app/assets/javascripts/environments/components/environments_table.vue +++ b/app/assets/javascripts/environments/components/environments_table.vue @@ -2,8 +2,8 @@ /** * Render environments table. */ +import loadingIcon from '~/vue_shared/components/loading_icon.vue'; import environmentItem from './environment_item.vue'; -import loadingIcon from '../../vue_shared/components/loading_icon.vue'; export default { components: { diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue index 110918872fb..cbbab765e1c 100644 --- a/app/assets/javascripts/ide/components/repo_file.vue +++ b/app/assets/javascripts/ide/components/repo_file.vue @@ -1,9 +1,9 @@