use ~ to reference non-local scripts instead of resolve.root

config/webpack.config.js

@@ -82,15 +82,13 @@ var config = {
   resolve: {
     extensions: ['', '.js', '.es6', '.js.es6'],
     alias: {
+      '~':              path.join(ROOT_PATH, 'app/assets/javascripts'),
       'bootstrap/js':   'bootstrap-sass/assets/javascripts/bootstrap',
       'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'),
       'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
       'vue$':           'vue/dist/vue.js',
       'vue-resource$':  'vue-resource/dist/vue-resource.js'
-    },
-    root: [
-      path.join(ROOT_PATH, 'app/assets/javascripts'),
-    ],
+    }
   }
 }
 

spec/javascripts/abuse_reports_spec.js.es6

@@ -1,5 +1,5 @@
-require('lib/utils/text_utility');
-require('abuse_reports');
+require('~/lib/utils/text_utility');
+require('~/abuse_reports');
 
 ((global) => {
   describe('Abuse Reports', () => {

spec/javascripts/activities_spec.js.es6

@@ -1,8 +1,8 @@
 /* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-plusplus, no-shadow, max-len */
 
 require('vendor/jquery.endless-scroll.js');
-require('pager');
-require('activities');
+require('~/pager');
+require('~/activities');
 
 (() => {
   window.gon || (window.gon = {});

spec/javascripts/awards_handler_spec.js

@@ -1,7 +1,7 @@
 /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, no-unused-expressions, comma-dangle, new-parens, no-unused-vars, quotes, jasmine/no-spec-dupes, prefer-template, padded-blocks, max-len */
 /* global AwardsHandler */
 
-require('awards_handler');
+require('~/awards_handler');
 require('./fixtures/emoji_menu');
 
 (function() {

spec/javascripts/behaviors/autosize_spec.js

@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, no-var, comma-dangle, no-return-assign, padded-blocks, max-len */
 
-require('behaviors/autosize');
+require('~/behaviors/autosize');
 
 (function() {
   describe('Autosize behavior', function() {

spec/javascripts/behaviors/quick_submit_spec.js

@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, no-var, no-return-assign, comma-dangle, jasmine/no-spec-dupes, new-cap, padded-blocks, max-len */
 
-require('behaviors/quick_submit');
+require('~/behaviors/quick_submit');
 
 (function() {
   describe('Quick Submit behavior', function() {

spec/javascripts/behaviors/requires_input_spec.js

@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, no-var, padded-blocks */
 
-require('behaviors/requires_input');
+require('~/behaviors/requires_input');
 
 (function() {
   describe('requiresInput', function() {

spec/javascripts/boards/boards_store_spec.js.es6

@@ -6,13 +6,13 @@
 /* global listObj */
 /* global listObjDuplicate */
 
-require('lib/utils/url_utility');
-require('boards/models/issue');
-require('boards/models/label');
-require('boards/models/list');
-require('boards/models/user');
-require('boards/services/board_service');
-require('boards/stores/boards_store');
+require('~/lib/utils/url_utility');
+require('~/boards/models/issue');
+require('~/boards/models/label');
+require('~/boards/models/list');
+require('~/boards/models/user');
+require('~/boards/services/board_service');
+require('~/boards/stores/boards_store');
 require('./mock_data');
 
 describe('Store', () => {

spec/javascripts/boards/issue_spec.js.es6

@@ -2,13 +2,13 @@
 /* global BoardService */
 /* global ListIssue */
 
-require('lib/utils/url_utility');
-require('boards/models/issue');
-require('boards/models/label');
-require('boards/models/list');
-require('boards/models/user');
-require('boards/services/board_service');
-require('boards/stores/boards_store');
+require('~/lib/utils/url_utility');
+require('~/boards/models/issue');
+require('~/boards/models/label');
+require('~/boards/models/list');
+require('~/boards/models/user');
+require('~/boards/services/board_service');
+require('~/boards/stores/boards_store');
 require('./mock_data');
 
 describe('Issue model', () => {

spec/javascripts/boards/list_spec.js.es6

@@ -5,13 +5,13 @@
 /* global List */
 /* global listObj */
 
-require('lib/utils/url_utility');
-require('boards/models/issue');
-require('boards/models/label');
-require('boards/models/list');
-require('boards/models/user');
-require('boards/services/board_service');
-require('boards/stores/boards_store');
+require('~/lib/utils/url_utility');
+require('~/boards/models/issue');
+require('~/boards/models/label');
+require('~/boards/models/list');
+require('~/boards/models/user');
+require('~/boards/services/board_service');
+require('~/boards/stores/boards_store');
 require('./mock_data');
 
 describe('List model', () => {

spec/javascripts/bootstrap_linked_tabs_spec.js.es6

@@ -1,4 +1,4 @@
-require('lib/utils/bootstrap_linked_tabs');
+require('~/lib/utils/bootstrap_linked_tabs');
 
 (() => {
   describe('Linked Tabs', () => {

spec/javascripts/build_spec.js.es6

@@ -2,9 +2,9 @@
 /* global Build */
 /* global Turbolinks */
 
-require('lib/utils/datetime_utility');
-require('build');
-require('breakpoints');
+require('~/lib/utils/datetime_utility');
+require('~/build');
+require('~/breakpoints');
 require('vendor/jquery.nicescroll');
 
 describe('Build', () => {

spec/javascripts/dashboard_spec.js.es6

@@ -1,7 +1,7 @@
 /* eslint-disable no-new, padded-blocks */
 
-require('sidebar');
-require('lib/utils/text_utility');
+require('~/sidebar');
+require('~/lib/utils/text_utility');
 
 ((global) => {
   describe('Dashboard', () => {

spec/javascripts/datetime_utility_spec.js.es6

@@ -1,4 +1,4 @@
-require('lib/utils/datetime_utility');
+require('~/lib/utils/datetime_utility');
 
 (() => {
   describe('Date time utils', () => {

spec/javascripts/diff_comments_store_spec.js.es6

@@ -1,9 +1,9 @@
 /* eslint-disable no-extra-semi, jasmine/no-global-setup, dot-notation, jasmine/no-expect-in-setup-teardown, max-len */
 /* global CommentsStore */
 
-require('diff_notes/models/discussion');
-require('diff_notes/models/note');
-require('diff_notes/stores/comments');
+require('~/diff_notes/models/discussion');
+require('~/diff_notes/models/note');
+require('~/diff_notes/stores/comments');
 
 (() => {
   function createDiscussion(noteId = 1, resolved = true) {

spec/javascripts/environments/environment_actions_spec.js.es6

@@ -1,4 +1,4 @@
-require('environments/components/environment_actions');
+require('~/environments/components/environment_actions');
 
 describe('Actions Component', () => {
   preloadFixtures('static/environments/element.html.raw');

spec/javascripts/environments/environment_external_url_spec.js.es6

@@ -1,4 +1,4 @@
-require('environments/components/environment_external_url');
+require('~/environments/components/environment_external_url');
 
 describe('External URL Component', () => {
   preloadFixtures('static/environments/element.html.raw');

spec/javascripts/environments/environment_item_spec.js.es6

@@ -1,5 +1,5 @@
 window.timeago = require('vendor/timeago');
-require('environments/components/environment_item');
+require('~/environments/components/environment_item');
 
 describe('Environment item', () => {
   preloadFixtures('static/environments/table.html.raw');

spec/javascripts/environments/environment_rollback_spec.js.es6

@@ -1,4 +1,4 @@
-require('environments/components/environment_rollback');
+require('~/environments/components/environment_rollback');
 
 describe('Rollback Component', () => {
   preloadFixtures('static/environments/element.html.raw');

spec/javascripts/environments/environment_stop_spec.js.es6

@@ -1,4 +1,4 @@
-require('environments/components/environment_stop');
+require('~/environments/components/environment_stop');
 
 describe('Stop Component', () => {
   preloadFixtures('static/environments/element.html.raw');

spec/javascripts/environments/environments_store_spec.js.es6

@@ -1,6 +1,6 @@
 /* global environmentsList */
 
-require('environments/stores/environments_store');
+require('~/environments/stores/environments_store');
 require('./mock_data');
 
 (() => {

spec/javascripts/extensions/array_spec.js.es6

@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, no-var, padded-blocks */
 
-require('extensions/array');
+require('~/extensions/array');
 
 (function() {
   describe('Array extensions', function() {

spec/javascripts/extensions/element_spec.js.es6

@@ -1,4 +1,4 @@
-require('extensions/element');
+require('~/extensions/element');
 
 (() => {
   describe('Element extensions', function () {

spec/javascripts/extensions/jquery_spec.js

@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, no-var, padded-blocks */
 
-require('extensions/jquery');
+require('~/extensions/jquery');
 
 (function() {
   describe('jQuery extensions', function() {

spec/javascripts/extensions/object_spec.js.es6

@@ -1,4 +1,4 @@
-require('extensions/object');
+require('~/extensions/object');
 
 describe('Object extensions', () => {
   describe('assign', () => {

spec/javascripts/gl_dropdown_spec.js.es6

@@ -1,9 +1,9 @@
 /* eslint-disable comma-dangle, prefer-const, no-param-reassign, no-plusplus, semi, no-unused-expressions, arrow-spacing, max-len */
 /* global Turbolinks */
 
-require('gl_dropdown');
-require('lib/utils/common_utils');
-require('lib/utils/type_utility');
+require('~/gl_dropdown');
+require('~/lib/utils/common_utils');
+require('~/lib/utils/type_utility');
 
 (() => {
   const NON_SELECTABLE_CLASSES = '.divider, .separator, .dropdown-header, .dropdown-menu-empty-link';

spec/javascripts/gl_field_errors_spec.js.es6

@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, arrow-body-style, indent, padded-blocks */
 
-require('gl_field_errors');
+require('~/gl_field_errors');
 
 ((global) => {
   preloadFixtures('static/gl_field_errors.html.raw');

spec/javascripts/graphs/stat_graph_contributors_graph_spec.js

@@ -3,7 +3,7 @@
 /* global ContributorsGraph */
 /* global ContributorsMasterGraph */
 
-require('graphs/stat_graph_contributors_graph');
+require('~/graphs/stat_graph_contributors_graph');
 
 describe("ContributorsGraph", function () {
   describe("#set_x_domain", function () {

spec/javascripts/graphs/stat_graph_contributors_util_spec.js

@@ -1,7 +1,7 @@
 /* eslint-disable quotes, padded-blocks, no-var, camelcase, object-curly-spacing, semi, indent, object-property-newline, comma-dangle, comma-spacing, spaced-comment, max-len, key-spacing, vars-on-top, quote-props, no-multi-spaces */
 /* global ContributorsStatGraphUtil */
 
-require('graphs/stat_graph_contributors_util');
+require('~/graphs/stat_graph_contributors_util');
 
 describe("ContributorsStatGraphUtil", function () {
 

spec/javascripts/graphs/stat_graph_spec.js

@@ -1,7 +1,7 @@
 /* eslint-disable quotes, padded-blocks, semi */
 /* global StatGraph */
 
-require('graphs/stat_graph');
+require('~/graphs/stat_graph');
 
 describe("StatGraph", function () {
 

spec/javascripts/header_spec.js

@@ -1,7 +1,7 @@
 /* eslint-disable space-before-function-paren, padded-blocks, no-var */
 
-require('header');
-require('lib/utils/text_utility');
+require('~/header');
+require('~/lib/utils/text_utility');
 
 (function() {
 

spec/javascripts/issuable_spec.js.es6

@@ -1,7 +1,7 @@
 /* global Issuable */
 /* global Turbolinks */
 
-require('issuable');
+require('~/issuable');
 
 (() => {
   const BASE_URL = '/user/project/issues?scope=all&state=closed';

spec/javascripts/issue_spec.js

@@ -1,8 +1,8 @@
 /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, no-use-before-define, indent, no-trailing-spaces, comma-dangle, padded-blocks, max-len */
 /* global Issue */
 
-require('lib/utils/text_utility');
-require('issue');
+require('~/lib/utils/text_utility');
+require('~/issue');
 
 (function() {
   var INVALID_URL = 'http://goesnowhere.nothing/whereami';

spec/javascripts/labels_issue_sidebar_spec.js.es6

@@ -2,15 +2,15 @@
 /* global IssuableContext */
 /* global LabelsSelect */
 
-require('lib/utils/type_utility');
-require('gl_dropdown');
+require('~/lib/utils/type_utility');
+require('~/gl_dropdown');
 require('select2');
 require('vendor/jquery.nicescroll');
-require('api');
-require('create_label');
-require('issuable_context');
-require('users_select');
-require('labels_select');
+require('~/api');
+require('~/create_label');
+require('~/issuable_context');
+require('~/users_select');
+require('~/labels_select');
 
 (() => {
   let saveLabelCount = 0;

spec/javascripts/lib/utils/common_utils_spec.js.es6

@@ -1,4 +1,4 @@
-require('lib/utils/common_utils');
+require('~/lib/utils/common_utils');
 
 (() => {
   describe('common_utils', () => {

spec/javascripts/line_highlighter_spec.js

@@ -1,7 +1,7 @@
 /* eslint-disable space-before-function-paren, no-var, no-param-reassign, quotes, prefer-template, no-else-return, new-cap, dot-notation, no-return-assign, comma-dangle, no-new, one-var, one-var-declaration-per-line, no-plusplus, jasmine/no-spec-dupes, no-underscore-dangle, padded-blocks, max-len */
 /* global LineHighlighter */
 
-require('line_highlighter');
+require('~/line_highlighter');
 
 (function() {
   describe('LineHighlighter', function() {

spec/javascripts/merge_request_spec.js

@@ -1,7 +1,7 @@
 /* eslint-disable space-before-function-paren, no-return-assign, padded-blocks */
 /* global MergeRequest */
 
-require('merge_request');
+require('~/merge_request');
 
 (function() {
   describe('MergeRequest', function() {

spec/javascripts/merge_request_tabs_spec.js

@@ -1,8 +1,8 @@
 /* eslint-disable no-var, comma-dangle, object-shorthand */
 
-require('merge_request_tabs');
-require('breakpoints');
-require('lib/utils/common_utils');
+require('~/merge_request_tabs');
+require('~/breakpoints');
+require('~/lib/utils/common_utils');
 require('vendor/jquery.scrollTo');
 
 (function () {

spec/javascripts/merge_request_widget_spec.js

@@ -1,7 +1,7 @@
 /* eslint-disable space-before-function-paren, quotes, comma-dangle, dot-notation, indent, quote-props, no-var, padded-blocks, max-len */
 
-require('merge_request_widget');
-require('lib/utils/datetime_utility');
+require('~/merge_request_widget');
+require('~/lib/utils/datetime_utility');
 
 (function() {
   describe('MergeRequestWidget', function() {

spec/javascripts/mini_pipeline_graph_dropdown_spec.js.es6

@@ -1,7 +1,7 @@
 /* eslint-disable no-new */
 
-require('flash');
-require('mini_pipeline_graph_dropdown');
+require('~/flash');
+require('~/mini_pipeline_graph_dropdown');
 
 (() => {
   describe('Mini Pipeline Graph Dropdown', () => {

spec/javascripts/new_branch_spec.js

@@ -2,7 +2,7 @@
 /* global NewBranchForm */
 
 require('jquery-ui/ui/autocomplete');
-require('new_branch_form');
+require('~/new_branch_form');
 
 (function() {
   describe('Branch', function() {

spec/javascripts/notes_spec.js

@@ -1,10 +1,10 @@
 /* eslint-disable space-before-function-paren, no-unused-expressions, no-var, object-shorthand, comma-dangle, semi, padded-blocks, max-len */
 /* global Notes */
 
-require('notes');
+require('~/notes');
 require('vendor/autosize');
-require('gl_form');
-require('lib/utils/text_utility');
+require('~/gl_form');
+require('~/lib/utils/text_utility');
 
 (function() {
   window.gon || (window.gon = {});

spec/javascripts/pipelines_spec.js.es6

@@ -1,4 +1,4 @@
-require('pipelines');
+require('~/pipelines');
 
 (() => {
   describe('Pipelines', () => {

spec/javascripts/pretty_time_spec.js.es6

@@ -1,4 +1,4 @@
-require('lib/utils/pretty_time');
+require('~/lib/utils/pretty_time');
 
 (() => {
   const PrettyTime = gl.PrettyTime;

spec/javascripts/project_title_spec.js

@@ -2,11 +2,11 @@
 /* global Project */
 
 require('select2/select2.js');
-require('lib/utils/type_utility');
-require('gl_dropdown');
-require('api');
-require('project_select');
-require('project');
+require('~/lib/utils/type_utility');
+require('~/gl_dropdown');
+require('~/api');
+require('~/project_select');
+require('~/project');
 
 (function() {
   window.gon || (window.gon = {});

spec/javascripts/right_sidebar_spec.js

@@ -1,8 +1,8 @@
 /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, new-parens, no-return-assign, new-cap, vars-on-top, semi, padded-blocks, max-len */
 /* global Sidebar */
 
-require('right_sidebar');
-require('extensions/jquery.js');
+require('~/right_sidebar');
+require('~/extensions/jquery.js');
 
 (function() {
   var $aside, $icon, $labelsIcon, $page, $toggle, assertSidebarState;

spec/javascripts/search_autocomplete_spec.js

@@ -1,9 +1,9 @@
 /* eslint-disable space-before-function-paren, max-len, no-var, one-var, one-var-declaration-per-line, no-unused-expressions, consistent-return, no-param-reassign, default-case, no-return-assign, comma-dangle, object-shorthand, prefer-template, quotes, new-parens, vars-on-top, new-cap, padded-blocks, max-len */
 
-require('gl_dropdown');
-require('search_autocomplete');
-require('lib/utils/common_utils');
-require('lib/utils/type_utility');
+require('~/gl_dropdown');
+require('~/search_autocomplete');
+require('~/lib/utils/common_utils');
+require('~/lib/utils/type_utility');
 require('vendor/fuzzaldrin-plus');
 
 (function() {

spec/javascripts/shortcuts_issuable_spec.js

@@ -1,7 +1,7 @@
 /* eslint-disable space-before-function-paren, no-return-assign, no-var, quotes, padded-blocks */
 /* global ShortcutsIssuable */
 
-require('shortcuts_issuable');
+require('~/shortcuts_issuable');
 
 (function() {
   describe('ShortcutsIssuable', function() {

spec/javascripts/signin_tabs_memoizer_spec.js.es6

@@ -1,4 +1,4 @@
-require('signin_tabs_memoizer');
+require('~/signin_tabs_memoizer');
 
 ((global) => {
   describe('SigninTabsMemoizer', () => {

spec/javascripts/smart_interval_spec.js.es6

@@ -1,4 +1,4 @@
-require('smart_interval');
+require('~/smart_interval');
 
 (() => {
   const DEFAULT_MAX_INTERVAL = 100;

spec/javascripts/subbable_resource_spec.js.es6

@@ -1,6 +1,6 @@
 /* eslint-disable max-len, arrow-parens, comma-dangle, no-plusplus */
 
-require('subbable_resource');
+require('~/subbable_resource');
 
 /*
 * Test that each rest verb calls the publish and subscribe function and passes the correct value back

spec/javascripts/syntax_highlight_spec.js

@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, no-var, no-return-assign, quotes, padded-blocks */
 
-require('syntax_highlight');
+require('~/syntax_highlight');
 
 (function() {
   describe('Syntax Highlighter', function() {

spec/javascripts/u2f/authenticate_spec.js

@@ -2,9 +2,9 @@
 /* global MockU2FDevice */
 /* global U2FAuthenticate */
 
-require('u2f/authenticate');
-require('u2f/util');
-require('u2f/error');
+require('~/u2f/authenticate');
+require('~/u2f/util');
+require('~/u2f/error');
 require('vendor/u2f');
 require('./mock_u2f_device');
 

spec/javascripts/u2f/register_spec.js

@@ -2,9 +2,9 @@
 /* global MockU2FDevice */
 /* global U2FRegister */
 
-require('u2f/register');
-require('u2f/util');
-require('u2f/error');
+require('~/u2f/register');
+require('~/u2f/util');
+require('~/u2f/error');
 require('vendor/u2f');
 require('./mock_u2f_device');
 

spec/javascripts/vue_common_components/commit_spec.js.es6

@@ -1,4 +1,4 @@
-require('vue_common_component/commit');
+require('~/vue_common_component/commit');
 
 describe('Commit component', () => {
   let props;

spec/javascripts/zen_mode_spec.js

@@ -3,7 +3,7 @@
 /* global Mousetrap */
 /* global ZenMode */
 
-require('zen_mode');
+require('~/zen_mode');
 
 (function() {
   var enterZen, escapeKeydown, exitZen;