Changes after review - adds alias for icons path

8 files changed, 24 insertions, 23 deletions

diff --git a/app/assets/javascripts/environments/components/environment_actions.js.es6 b/app/assets/javascripts/environments/components/environment_actions.js.es6
index 17e99f18651..15e3f8823d2 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js.es6
+++ b/app/assets/javascripts/environments/components/environment_actions.js.es6
@@ -1,5 +1,5 @@
 const Vue = require('vue');
-const playIconSvg = require('../../../../views/shared/icons/_icon_play.svg');
+const playIconSvg = require('icons/_icon_play.svg');
 
 module.exports = Vue.component('actions-component', {
   props: {
diff --git a/app/assets/javascripts/environments/components/environment_terminal_button.js.es6 b/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
index 693cb852152..e86607e78f4 100644
--- a/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
+++ b/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
@@ -3,7 +3,7 @@
  * Used in environments table.
  */
 const Vue = require('vue');
-const terminalIconSvg = require('../../../../views/shared/icons/_icon_terminal.svg');
+const terminalIconSvg = require('icons/_icon_terminal.svg');
 
 module.exports = Vue.component('terminal-button-component', {
   props: {
diff --git a/app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6 b/app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
index d8097eaa7b2..357b3487ca9 100644
--- a/app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
+++ b/app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
@@ -1,5 +1,5 @@
 /* global Vue */
-import stopwatchSvg from '../../../../../views/shared/icons/_icon_stopwatch.svg';
+import stopwatchSvg from 'icons/_icon_stopwatch.svg';
 
 require('../../../lib/utils/pretty_time');
 
diff --git a/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
index e5f14c159c0..1ffb1543f71 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
@@ -1,6 +1,6 @@
 /* global Vue, Flash, gl */
 /* eslint-disable no-param-reassign,  no-alert */
-const playIconSvg = require('../../../views/shared/icons/_icon_play.svg');
+const playIconSvg = require('icons/_icon_play.svg');
 
 ((gl) => {
   gl.VuePipelineActions = Vue.extend({
diff --git a/app/assets/javascripts/vue_pipelines_index/stage.js.es6 b/app/assets/javascripts/vue_pipelines_index/stage.js.es6
index d04421a6169..f67ebd6a265 100644
--- a/app/assets/javascripts/vue_pipelines_index/stage.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/stage.js.es6
@@ -1,14 +1,14 @@
 /* global Vue, Flash, gl */
 /* eslint-disable no-param-reassign */
-import canceledSvg from '../../../views/shared/icons/_icon_status_canceled_borderless.svg';
-import createdSvg from '../../../views/shared/icons/_icon_status_created_borderless.svg';
-import failedSvg from '../../../views/shared/icons/_icon_status_failed_borderless.svg';
-import manualSvg from '../../../views/shared/icons/_icon_status_manual_borderless.svg';
-import pendingSvg from '../../../views/shared/icons/_icon_status_pending_borderless.svg';
-import runningSvg from '../../../views/shared/icons/_icon_status_running_borderless.svg';
-import skippedSvg from '../../../views/shared/icons/_icon_status_skipped_borderless.svg';
-import successSvg from '../../../views/shared/icons/_icon_status_success_borderless.svg';
-import warningSvg from '../../../views/shared/icons/_icon_status_warning_borderless.svg';
+import canceledSvg from 'icons/_icon_status_canceled_borderless.svg';
+import createdSvg from 'icons/_icon_status_created_borderless.svg';
+import failedSvg from 'icons/_icon_status_failed_borderless.svg';
+import manualSvg from 'icons/_icon_status_manual_borderless.svg';
+import pendingSvg from 'icons/_icon_status_pending_borderless.svg';
+import runningSvg from 'icons/_icon_status_running_borderless.svg';
+import skippedSvg from 'icons/_icon_status_skipped_borderless.svg';
+import successSvg from 'icons/_icon_status_success_borderless.svg';
+import warningSvg from 'icons/_icon_status_warning_borderless.svg';
 
 ((gl) => {
   gl.VueStage = Vue.extend({
diff --git a/app/assets/javascripts/vue_pipelines_index/status.js.es6 b/app/assets/javascripts/vue_pipelines_index/status.js.es6
index acdd82a480e..a3e56bc3193 100644
--- a/app/assets/javascripts/vue_pipelines_index/status.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/status.js.es6
@@ -1,15 +1,15 @@
 /* global Vue, gl */
 /* eslint-disable no-param-reassign */
 
-import canceledSvg from '../../../views/shared/icons/_icon_status_canceled.svg';
-import createdSvg from '../../../views/shared/icons/_icon_status_created.svg';
-import failedSvg from '../../../views/shared/icons/_icon_status_failed.svg';
-import manualSvg from '../../../views/shared/icons/_icon_status_manual.svg';
-import pendingSvg from '../../../views/shared/icons/_icon_status_pending.svg';
-import runningSvg from '../../../views/shared/icons/_icon_status_running.svg';
-import skippedSvg from '../../../views/shared/icons/_icon_status_skipped.svg';
-import successSvg from '../../../views/shared/icons/_icon_status_success.svg';
-import warningSvg from '../../../views/shared/icons/_icon_status_warning.svg';
+import canceledSvg from 'icons/_icon_status_canceled.svg';
+import createdSvg from 'icons/_icon_status_created.svg';
+import failedSvg from 'icons/_icon_status_failed.svg';
+import manualSvg from 'icons/_icon_status_manual.svg';
+import pendingSvg from 'icons/_icon_status_pending.svg';
+import runningSvg from 'icons/_icon_status_running.svg';
+import skippedSvg from 'icons/_icon_status_skipped.svg';
+import successSvg from 'icons/_icon_status_success.svg';
+import warningSvg from 'icons/_icon_status_warning.svg';
 
 ((gl) => {
   gl.VueStatusScope = Vue.extend({
diff --git a/app/assets/javascripts/vue_shared/components/commit.js.es6 b/app/assets/javascripts/vue_shared/components/commit.js.es6
index 89415fd4f1c..4381487b79e 100644
--- a/app/assets/javascripts/vue_shared/components/commit.js.es6
+++ b/app/assets/javascripts/vue_shared/components/commit.js.es6
@@ -1,6 +1,6 @@
 /* global Vue */
 window.Vue = require('vue');
-const commitIconSvg = require('../../../../views/shared/icons/_icon_commit.svg');
+const commitIconSvg = require('icons/_icon_commit.svg');
 
 (() => {
   window.gl = window.gl || {};
diff --git a/config/webpack.config.js b/config/webpack.config.js
index a754cdd1fd1..ddc888c5f93 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -90,6 +90,7 @@ var config = {
       '~':              path.join(ROOT_PATH, 'app/assets/javascripts'),
       'bootstrap/js':   'bootstrap-sass/assets/javascripts/bootstrap',
       'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'),
+      'icons':          path.join(ROOT_PATH, 'app/views/shared/icons'),
       'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
       'vue$':           IS_PRODUCTION ? 'vue/dist/vue.min.js' : 'vue/dist/vue.js',
     }