update remaining uses of CJS syntax to ES module syntax

app/assets/javascripts/copy_as_gfm.js

@@ -1,6 +1,6 @@
 /* eslint-disable class-methods-use-this, object-shorthand, no-unused-vars, no-use-before-define, no-new, max-len, no-restricted-syntax, guard-for-in, no-continue */
 
-require('./lib/utils/common_utils');
+import './lib/utils/common_utils';
 
 const gfmRules = {
   // The filters referenced in lib/banzai/pipeline/gfm_pipeline.rb convert

app/assets/javascripts/diff.js

@@ -1,6 +1,6 @@
 /* eslint-disable class-methods-use-this */
 
-require('./lib/utils/url_utility');
+import './lib/utils/url_utility';
 
 const UNFOLD_COUNT = 20;
 let isBound = false;

app/assets/javascripts/dropzone_input.js

@@ -1,7 +1,7 @@
 /* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, one-var, no-var, one-var-declaration-per-line, no-unused-vars, camelcase, quotes, no-useless-concat, prefer-template, quote-props, comma-dangle, object-shorthand, consistent-return, prefer-arrow-callback */
 /* global Dropzone */
 
-require('./preview_markdown');
+import './preview_markdown';
 
 window.DropzoneInput = (function() {
   function DropzoneInput(form) {

app/assets/javascripts/gl_field_errors.js

@@ -1,6 +1,6 @@
 /* eslint-disable comma-dangle, class-methods-use-this, max-len, space-before-function-paren, arrow-parens, no-param-reassign */
 
-require('./gl_field_error');
+import './gl_field_error';
 
 const customValidationFlag = 'gl-field-error-ignore';
 

app/assets/javascripts/issue.js

@@ -1,11 +1,11 @@
 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, one-var, no-underscore-dangle, one-var-declaration-per-line, object-shorthand, no-unused-vars, no-new, comma-dangle, consistent-return, quotes, dot-notation, quote-props, prefer-arrow-callback, max-len */
- /* global Flash */
+/* global Flash */
-import CreateMergeRequestDropdown from './create_merge_request_dropdown';
 
-require('./flash');
+import 'vendor/jquery.waitforimages';
-require('~/lib/utils/text_utility');
+import '~/lib/utils/text_utility';
-require('vendor/jquery.waitforimages');
+import './flash';
-require('./task_list');
+import './task_list';
+import CreateMergeRequestDropdown from './create_merge_request_dropdown';
 
 class Issue {
   constructor() {

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

@@ -1,9 +1,10 @@
 /* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, comma-dangle, no-unused-expressions, prefer-template, max-len */
-/* global timeago */
-/* global dateFormat */
 
-window.timeago = require('timeago.js');
+import timeago from 'timeago.js';
-window.dateFormat = require('vendor/date.format');
+import dateFormat from 'vendor/date.format';
+
+window.timeago = timeago;
+window.dateFormat = dateFormat;
 
 (function() {
   (function(w) {

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

@@ -1,5 +1,6 @@
 /* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, quotes, one-var, one-var-declaration-per-line, operator-assignment, no-else-return, prefer-template, prefer-arrow-callback, no-empty, max-len, consistent-return, no-unused-vars, no-return-assign, max-len, vars-on-top */
-require('vendor/latinise');
+
+import 'vendor/latinise';
 
 var base;
 var w = window;

app/assets/javascripts/line_highlighter.js

@@ -4,8 +4,6 @@
 //
 // Handles single- and multi-line selection and highlight for blob views.
 //
-require('vendor/jquery.scrollTo');
-
 //
 // ### Example Markup
 //

app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js

@@ -2,14 +2,13 @@
 /* global Flash */
 
 import Vue from 'vue';
-
+import './merge_conflict_store';
-require('./merge_conflict_store');
+import './merge_conflict_service';
-require('./merge_conflict_service');
+import './mixins/line_conflict_utils';
-require('./mixins/line_conflict_utils');
+import './mixins/line_conflict_actions';
-require('./mixins/line_conflict_actions');
+import './components/diff_file_editor';
-require('./components/diff_file_editor');
+import './components/inline_conflict_lines';
-require('./components/inline_conflict_lines');
+import './components/parallel_conflict_lines';
-require('./components/parallel_conflict_lines');
 
 $(() => {
   const INTERACTIVE_RESOLVE_MODE = 'interactive';

app/assets/javascripts/merge_request.js

@@ -1,9 +1,9 @@
 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, quotes, no-underscore-dangle, one-var, one-var-declaration-per-line, consistent-return, dot-notation, quote-props, comma-dangle, object-shorthand, max-len, prefer-arrow-callback */
 /* global MergeRequestTabs */
 
-require('vendor/jquery.waitforimages');
+import 'vendor/jquery.waitforimages';
-require('./task_list');
+import './task_list';
-require('./merge_request_tabs');
+import './merge_request_tabs';
 
 (function() {
   this.MergeRequest = (function() {

app/assets/javascripts/notes.js

@@ -6,15 +6,17 @@
 
 import $ from 'jquery';
 import Cookies from 'js-cookie';
+import autosize from 'vendor/autosize';
+import Dropzone from 'dropzone';
+import 'vendor/jquery.caret'; // required by jquery.atwho
+import 'vendor/jquery.atwho';
 import CommentTypeToggle from './comment_type_toggle';
+import './autosave';
+import './dropzone_input';
+import './task_list';
 
-require('./autosave');
+window.autosize = autosize;
-window.autosize = require('vendor/autosize');
+window.Dropzone = Dropzone;
-window.Dropzone = require('dropzone');
-require('./dropzone_input');
-require('vendor/jquery.caret'); // required by jquery.atwho
-require('vendor/jquery.atwho');
-require('./task_list');
 
 const normalizeNewlines = function(str) {
   return str.replace(/\r\n/g, '\n');

app/assets/javascripts/pager.js

@@ -1,5 +1,5 @@
-require('~/lib/utils/common_utils');
+import '~/lib/utils/common_utils';
-require('~/lib/utils/url_utility');
+import '~/lib/utils/url_utility';
 
 (() => {
   const ENDLESS_SCROLL_BOTTOM_PX = 400;

app/assets/javascripts/profile/profile_bundle.js

@@ -1,2 +1,2 @@
-require('./gl_crop');
+import './gl_crop';
-require('./profile');
+import './profile';

app/assets/javascripts/protected_branches/protected_branches_bundle.js

@@ -1,5 +1,5 @@
-require('./protected_branch_access_dropdown');
+import './protected_branch_access_dropdown';
-require('./protected_branch_create');
+import './protected_branch_create';
-require('./protected_branch_dropdown');
+import './protected_branch_dropdown';
-require('./protected_branch_edit');
+import './protected_branch_edit';
-require('./protected_branch_edit_list');
+import './protected_branch_edit_list';

app/assets/javascripts/task_list.js

@@ -1,5 +1,6 @@
 /* global Flash */
-require('vendor/task_list');
+
+import 'vendor/task_list';
 
 class TaskList {
   constructor(options = {}) {

app/assets/javascripts/terminal/terminal_bundle.js

@@ -1,7 +1,9 @@
-require('vendor/xterm/encoding-indexes.js');
+import 'vendor/xterm/encoding-indexes';
-require('vendor/xterm/encoding.js');
+import 'vendor/xterm/encoding';
-window.Terminal = require('vendor/xterm/xterm.js');
+import Terminal from 'vendor/xterm/xterm';
-require('vendor/xterm/fit.js');
+import 'vendor/xterm/fit';
-require('./terminal.js');
+import './terminal';
+
+window.Terminal = Terminal;
 
 $(() => new gl.Terminal({ selector: '#terminal' }));

app/assets/javascripts/users/users_bundle.js

@@ -1 +1 @@
-require('./calendar');
+import './calendar';

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js

@@ -1,4 +1,4 @@
-require('../../lib/utils/text_utility');
+import '../../lib/utils/text_utility';
 
 export default {
   name: 'MRWidgetHeader',

app/assets/javascripts/wikis.js

@@ -1,8 +1,8 @@
 /* eslint-disable no-param-reassign */
 /* global Breakpoints */
 
-require('./breakpoints');
+import 'vendor/jquery.nicescroll';
-require('vendor/jquery.nicescroll');
+import './breakpoints';
 
 ((global) => {
   class Wikis {

app/assets/javascripts/zen_mode.js

@@ -1,5 +1,4 @@
 /* eslint-disable func-names, space-before-function-paren, wrap-iife, prefer-arrow-callback, no-unused-vars, consistent-return, camelcase, comma-dangle, max-len */
-/* global Dropzone */
 /* global Mousetrap */
 
 // Zen Mode (full screen) textarea
@@ -7,10 +6,12 @@
 /*= provides zen_mode:enter */
 /*= provides zen_mode:leave */
 
-require('vendor/jquery.scrollTo');
+import 'vendor/jquery.scrollTo';
-window.Dropzone = require('dropzone');
+import Dropzone from 'dropzone';
-require('mousetrap');
+import 'mousetrap';
-require('mousetrap/plugins/pause/mousetrap-pause');
+import 'mousetrap/plugins/pause/mousetrap-pause';
+
+window.Dropzone = Dropzone;
 
 //
 // ### Events