Convert the files in the `/web` folder to ES6 modules

Note that as discussed on IRC, this makes the viewer slightly slower to load *only* in `gulp server` mode, however the difference seem slight enough that I think it will be fine.

web/annotation_layer_builder.js

@@ -13,24 +13,9 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
+import { mozL10n } from 'pdfjs-web/ui_utils';
-(function (root, factory) {
+import { SimpleLinkService } from 'pdfjs-web/pdf_link_service';
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/annotation_layer_builder', ['exports',
-      'pdfjs-web/ui_utils', 'pdfjs-web/pdf_link_service',
-      'pdfjs-web/pdfjs'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'),
-      require('./pdf_link_service.js'), require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebAnnotationLayerBuilder = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebPDFLinkService, root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, uiUtils, pdfLinkService, pdfjsLib) {
-
-var mozL10n = uiUtils.mozL10n;
-var SimpleLinkService = pdfLinkService.SimpleLinkService;
 
 /**
  * @typedef {Object} AnnotationLayerBuilderOptions
@@ -142,6 +127,7 @@ DefaultAnnotationLayerFactory.prototype = {
   }
 };
 
-exports.AnnotationLayerBuilder = AnnotationLayerBuilder;
+export {
-exports.DefaultAnnotationLayerFactory = DefaultAnnotationLayerFactory;
+  AnnotationLayerBuilder,
-}));
+  DefaultAnnotationLayerFactory,
+};

web/app.js

@@ -14,95 +14,34 @@
  */
 /* globals PDFBug, Stats */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
+import {
-(function (root, factory) {
+  animationStarted, DEFAULT_SCALE_VALUE, getPDFFileNameFromURL, localized,
-  if (typeof define === 'function' && define.amd) {
+  MAX_SCALE, MIN_SCALE, mozL10n, noContextMenuHandler, normalizeWheelEventDelta,
-    define('pdfjs-web/app', ['exports', 'pdfjs-web/ui_utils',
+  parseQueryString, ProgressBar, RendererType, UNKNOWN_SCALE
-      'pdfjs-web/pdf_history',
+} from 'pdfjs-web/ui_utils';
-      'pdfjs-web/preferences', 'pdfjs-web/pdf_sidebar',
+import {
-      'pdfjs-web/view_history', 'pdfjs-web/pdf_thumbnail_viewer',
+  PDFRenderingQueue, RenderingStates
-      'pdfjs-web/toolbar', 'pdfjs-web/secondary_toolbar',
+} from 'pdfjs-web/pdf_rendering_queue';
-      'pdfjs-web/password_prompt', 'pdfjs-web/pdf_presentation_mode',
+import { PDFSidebar, SidebarView } from 'pdfjs-web/pdf_sidebar';
-      'pdfjs-web/pdf_document_properties', 'pdfjs-web/hand_tool',
+import { PDFViewer, PresentationModeState } from 'pdfjs-web/pdf_viewer';
-      'pdfjs-web/pdf_viewer', 'pdfjs-web/pdf_rendering_queue',
+import { getGlobalEventBus } from 'pdfjs-web/dom_events';
-      'pdfjs-web/pdf_link_service', 'pdfjs-web/pdf_outline_viewer',
+import { HandTool } from 'pdfjs-web/hand_tool';
-      'pdfjs-web/overlay_manager', 'pdfjs-web/pdf_attachment_viewer',
+import { OverlayManager } from 'pdfjs-web/overlay_manager';
-      'pdfjs-web/pdf_find_controller', 'pdfjs-web/pdf_find_bar',
+import { PasswordPrompt } from 'pdfjs-web/password_prompt';
-      'pdfjs-web/dom_events', 'pdfjs-web/pdfjs'],
+import { PDFAttachmentViewer } from 'pdfjs-web/pdf_attachment_viewer';
-      factory);
+import { PDFDocumentProperties } from 'pdfjs-web/pdf_document_properties';
-  } else if (typeof exports !== 'undefined') {
+import { PDFFindBar } from 'pdfjs-web/pdf_find_bar';
-    factory(exports, require('./ui_utils.js'),
+import { PDFFindController } from 'pdfjs-web/pdf_find_controller';
-      require('./pdf_history.js'), require('./preferences.js'),
+import { PDFHistory } from 'pdfjs-web/pdf_history';
-      require('./pdf_sidebar.js'), require('./view_history.js'),
+import { PDFLinkService } from 'pdfjs-web/pdf_link_service';
-      require('./pdf_thumbnail_viewer.js'), require('./toolbar.js'),
+import { PDFOutlineViewer } from 'pdfjs-web/pdf_outline_viewer';
-      require('./secondary_toolbar.js'), require('./password_prompt.js'),
+import { PDFPresentationMode } from 'pdfjs-web/pdf_presentation_mode';
-      require('./pdf_presentation_mode.js'),
+import { PDFThumbnailViewer } from 'pdfjs-web/pdf_thumbnail_viewer';
-      require('./pdf_document_properties.js'), require('./hand_tool.js'),
+import { Preferences } from 'pdfjs-web/preferences';
-      require('./pdf_viewer.js'), require('./pdf_rendering_queue.js'),
+import { SecondaryToolbar } from 'pdfjs-web/secondary_toolbar';
-      require('./pdf_link_service.js'), require('./pdf_outline_viewer.js'),
+import { Toolbar } from 'pdfjs-web/toolbar';
-      require('./overlay_manager.js'), require('./pdf_attachment_viewer.js'),
+import { ViewHistory } from 'pdfjs-web/view_history';
-      require('./pdf_find_controller.js'), require('./pdf_find_bar.js'),
-      require('./dom_events.js'), require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebApp = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebPDFHistory,
-      root.pdfjsWebPreferences, root.pdfjsWebPDFSidebar,
-      root.pdfjsWebViewHistory, root.pdfjsWebPDFThumbnailViewer,
-      root.pdfjsWebToolbar, root.pdfjsWebSecondaryToolbar,
-      root.pdfjsWebPasswordPrompt, root.pdfjsWebPDFPresentationMode,
-      root.pdfjsWebPDFDocumentProperties, root.pdfjsWebHandTool,
-      root.pdfjsWebPDFViewer, root.pdfjsWebPDFRenderingQueue,
-      root.pdfjsWebPDFLinkService, root.pdfjsWebPDFOutlineViewer,
-      root.pdfjsWebOverlayManager, root.pdfjsWebPDFAttachmentViewer,
-      root.pdfjsWebPDFFindController, root.pdfjsWebPDFFindBar,
-      root.pdfjsWebDOMEvents, root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, uiUtilsLib, pdfHistoryLib,
-                  preferencesLib, pdfSidebarLib, viewHistoryLib,
-                  pdfThumbnailViewerLib, toolbarLib, secondaryToolbarLib,
-                  passwordPromptLib, pdfPresentationModeLib,
-                  pdfDocumentPropertiesLib, handToolLib, pdfViewerLib,
-                  pdfRenderingQueueLib, pdfLinkServiceLib, pdfOutlineViewerLib,
-                  overlayManagerLib, pdfAttachmentViewerLib,
-                  pdfFindControllerLib, pdfFindBarLib, domEventsLib, pdfjsLib) {
-
-var UNKNOWN_SCALE = uiUtilsLib.UNKNOWN_SCALE;
-var DEFAULT_SCALE_VALUE = uiUtilsLib.DEFAULT_SCALE_VALUE;
-var MIN_SCALE = uiUtilsLib.MIN_SCALE;
-var MAX_SCALE = uiUtilsLib.MAX_SCALE;
-var ProgressBar = uiUtilsLib.ProgressBar;
-var getPDFFileNameFromURL = uiUtilsLib.getPDFFileNameFromURL;
-var noContextMenuHandler = uiUtilsLib.noContextMenuHandler;
-var mozL10n = uiUtilsLib.mozL10n;
-var parseQueryString = uiUtilsLib.parseQueryString;
-var PDFHistory = pdfHistoryLib.PDFHistory;
-var Preferences = preferencesLib.Preferences;
-var SidebarView = pdfSidebarLib.SidebarView;
-var PDFSidebar = pdfSidebarLib.PDFSidebar;
-var ViewHistory = viewHistoryLib.ViewHistory;
-var PDFThumbnailViewer = pdfThumbnailViewerLib.PDFThumbnailViewer;
-var Toolbar = toolbarLib.Toolbar;
-var SecondaryToolbar = secondaryToolbarLib.SecondaryToolbar;
-var PasswordPrompt = passwordPromptLib.PasswordPrompt;
-var PDFPresentationMode = pdfPresentationModeLib.PDFPresentationMode;
-var PDFDocumentProperties = pdfDocumentPropertiesLib.PDFDocumentProperties;
-var HandTool = handToolLib.HandTool;
-var PresentationModeState = pdfViewerLib.PresentationModeState;
-var PDFViewer = pdfViewerLib.PDFViewer;
-var RenderingStates = pdfRenderingQueueLib.RenderingStates;
-var PDFRenderingQueue = pdfRenderingQueueLib.PDFRenderingQueue;
-var PDFLinkService = pdfLinkServiceLib.PDFLinkService;
-var PDFOutlineViewer = pdfOutlineViewerLib.PDFOutlineViewer;
-var OverlayManager = overlayManagerLib.OverlayManager;
-var PDFAttachmentViewer = pdfAttachmentViewerLib.PDFAttachmentViewer;
-var PDFFindController = pdfFindControllerLib.PDFFindController;
-var PDFFindBar = pdfFindBarLib.PDFFindBar;
-var getGlobalEventBus = domEventsLib.getGlobalEventBus;
-var normalizeWheelEventDelta = uiUtilsLib.normalizeWheelEventDelta;
-var animationStarted = uiUtilsLib.animationStarted;
-var localized = uiUtilsLib.localized;
-var RendererType = uiUtilsLib.RendererType;
 
 var DEFAULT_SCALE_DELTA = 1.1;
 var DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000;
@@ -2269,7 +2208,8 @@ var PDFPrintServiceFactory = {
   }
 };
 
-exports.PDFViewerApplication = PDFViewerApplication;
+export {
-exports.DefaultExternalServices = DefaultExternalServices;
+  PDFViewerApplication,
-exports.PDFPrintServiceFactory = PDFPrintServiceFactory;
+  DefaultExternalServices,
-}));
+  PDFPrintServiceFactory,
+};

web/chromecom.js

@@ -14,32 +14,16 @@
  */
 /* globals chrome */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
+import { DefaultExternalServices, PDFViewerApplication } from 'pdfjs-web/app';
+import { OverlayManager } from 'pdfjs-web/overlay_manager';
+import { Preferences } from 'pdfjs-web/preferences';
 
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/chromecom', ['exports', 'pdfjs-web/app',
-      'pdfjs-web/overlay_manager', 'pdfjs-web/preferences', 'pdfjs-web/pdfjs'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./app.js'), require('./overlay_manager.js'),
-      require('./preferences.js'), require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebChromeCom = {}), root.pdfjsWebApp,
-      root.pdfjsWebOverlayManager, root.pdfjsWebPreferences,
-      root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, app, overlayManager, preferences, pdfjsLib) {
 if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('CHROME')) {
   throw new Error('Module "pdfjs-web/chromecom" shall not be used outside ' +
                   'CHROME build.');
 }
 
-  var PDFViewerApplication = app.PDFViewerApplication;
-  var DefaultExternalServices = app.DefaultExternalServices;
-  var OverlayManager = overlayManager.OverlayManager;
-  var Preferences = preferences.Preferences;
-
 var ChromeCom = {};
 /**
  * Creates an event that the extension is listening for and will
@@ -359,5 +343,6 @@
 };
 PDFViewerApplication.externalServices = ChromeExternalServices;
 
-  exports.ChromeCom = ChromeCom;
+export {
-}));
+  ChromeCom,
+};

web/dom_events.js

@@ -13,18 +13,7 @@
  * limitations under the License.
  */
 
-'use strict';
+import { EventBus } from 'pdfjs-web/ui_utils';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/dom_events', ['exports', 'pdfjs-web/ui_utils'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'));
-  } else {
-    factory((root.pdfjsWebDOMEvents = {}), root.pdfjsWebUIUtils);
-  }
-}(this, function (exports, uiUtils) {
-  var EventBus = uiUtils.EventBus;
 
 // Attaching to the application event bus to dispatch events to the DOM for
 // backwards viewer API compatibility.
@@ -149,6 +138,7 @@
   return globalEventBus;
 }
 
-  exports.attachDOMEventsToEventBus = attachDOMEventsToEventBus;
+export {
-  exports.getGlobalEventBus = getGlobalEventBus;
+  attachDOMEventsToEventBus,
-}));
+  getGlobalEventBus,
+};

web/download_manager.js

@@ -13,27 +13,14 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
+import { DefaultExternalServices, PDFViewerApplication } from 'pdfjs-web/app';
 
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/download_manager', ['exports', 'pdfjs-web/app',
-      'pdfjs-web/pdfjs'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./app.js'), require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebDownloadManager = {}), root.pdfjsWebApp,
-      root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, app, pdfjsLib) {
 if (typeof PDFJSDev !== 'undefined' && !PDFJSDev.test('CHROME || GENERIC')) {
   throw new Error('Module "pdfjs-web/download_manager" shall not be used ' +
                   'outside CHROME and GENERIC builds.');
 }
 
-var PDFViewerApplication = app.PDFViewerApplication;
-var DefaultExternalServices = app.DefaultExternalServices;
-
 function download(blobUrl, filename) {
   var a = document.createElement('a');
   if (a.click) {
@@ -118,5 +105,6 @@ GenericExternalServices.createDownloadManager = function () {
 };
 PDFViewerApplication.externalServices = GenericExternalServices;
 
-exports.DownloadManager = DownloadManager;
+export {
-}));
+  DownloadManager,
+};

web/firefox_print_service.js

@@ -13,22 +13,9 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
+import { CSS_UNITS } from 'pdfjs-web/ui_utils';
-(function (root, factory) {
+import { PDFPrintServiceFactory } from 'pdfjs-web/app';
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/firefox_print_service', ['exports', 'pdfjs-web/ui_utils',
-      'pdfjs-web/app', 'pdfjs-web/pdfjs'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'), require('./app.js'),
-      require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebFirefoxPrintService = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebApp, root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, uiUtils, app, pdfjsLib) {
-  var CSS_UNITS = uiUtils.CSS_UNITS;
-  var PDFPrintServiceFactory = app.PDFPrintServiceFactory;
 
 // Creates a placeholder with div and canvas with right size for the page.
 function composePage(pdfDocument, pageNumber, size, printContainer) {
@@ -118,5 +105,6 @@
   }
 };
 
-  exports.FirefoxPrintService = FirefoxPrintService;
+export {
-}));
+  FirefoxPrintService,
+};

web/firefoxcom.js

@@ -13,29 +13,16 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
+import { PDFViewerApplication } from 'pdfjs-web/app';
-(function (root, factory) {
+import { Preferences } from 'pdfjs-web/preferences';
-  if (typeof define === 'function' && define.amd) {
+
-    define('pdfjs-web/firefoxcom', ['exports', 'pdfjs-web/preferences',
-      'pdfjs-web/app', 'pdfjs-web/pdfjs'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./preferences.js'), require('./app.js'),
-      require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebFirefoxCom = {}), root.pdfjsWebPreferences,
-      root.pdfjsWebApp, root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, preferences, app, pdfjsLib) {
 if (typeof PDFJSDev === 'undefined' ||
     !PDFJSDev.test('FIREFOX || MOZCENTRAL')) {
   throw new Error('Module "pdfjs-web/firefoxcom" shall not be used outside ' +
                   'FIREFOX and MOZCENTRAL builds.');
 }
 
-var Preferences = preferences.Preferences;
-var PDFViewerApplication = app.PDFViewerApplication;
-
 var FirefoxCom = (function FirefoxComClosure() {
   return {
     /**
@@ -291,6 +278,7 @@ document.mozL10n.setExternalLocalizerServices({
   }
 });
 
-exports.DownloadManager = DownloadManager;
+export {
-exports.FirefoxCom = FirefoxCom;
+  DownloadManager,
-}));
+  FirefoxCom,
+};

web/grab_to_pan.js

@@ -14,17 +14,6 @@
  * limitations under the License.
  */
 
-'use strict';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/grab_to_pan', ['exports'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports);
-  } else {
-    factory((root.pdfjsWebGrabToPan = {}));
-  }
-}(this, function (exports) {
 /**
  * Construct a GrabToPan instance for a given HTML element.
  * @param options.element {Element}
@@ -233,5 +222,6 @@
   }
 }
 
-  exports.GrabToPan = GrabToPan;
+export {
-}));
+  GrabToPan,
+};

web/hand_tool.js

@@ -13,24 +13,9 @@
  * limitations under the License.
  */
 
-'use strict';
+import { GrabToPan } from 'pdfjs-web/grab_to_pan';
-
+import { localized } from 'pdfjs-web/ui_utils';
-(function (root, factory) {
+import { Preferences } from 'pdfjs-web/preferences';
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/hand_tool', ['exports', 'pdfjs-web/grab_to_pan',
-      'pdfjs-web/preferences', 'pdfjs-web/ui_utils'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./grab_to_pan.js'), require('./preferences.js'),
-      require('./ui_utils.js'));
-  } else {
-    factory((root.pdfjsWebHandTool = {}), root.pdfjsWebGrabToPan,
-      root.pdfjsWebPreferences, root.pdfjsWebUIUtils);
-  }
-}(this, function (exports, grabToPan, preferences, uiUtils) {
-
-var GrabToPan = grabToPan.GrabToPan;
-var Preferences = preferences.Preferences;
-var localized = uiUtils.localized;
 
 /**
  * @typedef {Object} HandToolOptions
@@ -110,5 +95,6 @@ var HandTool = (function HandToolClosure() {
   return HandTool;
 })();
 
-exports.HandTool = HandTool;
+export {
-}));
+  HandTool,
+};

web/overlay_manager.js

@@ -13,18 +13,6 @@
  * limitations under the License.
  */
 
-'use strict';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/overlay_manager', ['exports'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports);
-  } else {
-    factory((root.pdfjsWebOverlayManager = {}));
-  }
-}(this, function (exports) {
-
 var OverlayManager = {
   overlays: {},
   active: null,
@@ -151,5 +139,6 @@ var OverlayManager = {
   }
 };
 
-exports.OverlayManager = OverlayManager;
+export {
-}));
+  OverlayManager,
+};

web/password_prompt.js

@@ -13,24 +13,9 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
+import { mozL10n } from 'pdfjs-web/ui_utils';
-(function (root, factory) {
+import { OverlayManager } from 'pdfjs-web/overlay_manager';
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/password_prompt', ['exports',
-      'pdfjs-web/ui_utils', 'pdfjs-web/overlay_manager', 'pdfjs-web/pdfjs'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'), require('./overlay_manager.js'),
-      require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebPasswordPrompt = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebOverlayManager, root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, uiUtils, overlayManager, pdfjsLib) {
-
-var mozL10n = uiUtils.mozL10n;
-var OverlayManager = overlayManager.OverlayManager;
 
 /**
  * @typedef {Object} PasswordPromptOptions
@@ -120,5 +105,6 @@ var PasswordPrompt = (function PasswordPromptClosure() {
   return PasswordPrompt;
 })();
 
-exports.PasswordPrompt = PasswordPrompt;
+export {
-}));
+  PasswordPrompt,
+};

web/pdf_attachment_viewer.js

@@ -13,18 +13,7 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_attachment_viewer', ['exports', 'pdfjs-web/pdfjs'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebPDFAttachmentViewer = {}), root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, pdfjsLib) {
 
 /**
  * @typedef {Object} PDFAttachmentViewerOptions
@@ -205,5 +194,6 @@ var PDFAttachmentViewer = (function PDFAttachmentViewerClosure() {
   return PDFAttachmentViewer;
 })();
 
-exports.PDFAttachmentViewer = PDFAttachmentViewer;
+export {
-}));
+  PDFAttachmentViewer,
+};

web/pdf_document_properties.js

@@ -13,23 +13,8 @@
  * limitations under the License.
  */
 
-'use strict';
+import { getPDFFileNameFromURL, mozL10n } from 'pdfjs-web/ui_utils';
-
+import { OverlayManager } from 'pdfjs-web/overlay_manager';
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_document_properties', ['exports',
-      'pdfjs-web/ui_utils', 'pdfjs-web/overlay_manager'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'), require('./overlay_manager.js'));
-  } else {
-    factory((root.pdfjsWebPDFDocumentProperties = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebOverlayManager);
-  }
-}(this, function (exports, uiUtils, overlayManager) {
-
-var getPDFFileNameFromURL = uiUtils.getPDFFileNameFromURL;
-var mozL10n = uiUtils.mozL10n;
-var OverlayManager = overlayManager.OverlayManager;
 
 /**
  * @typedef {Object} PDFDocumentPropertiesOptions
@@ -239,5 +224,6 @@ var PDFDocumentProperties = (function PDFDocumentPropertiesClosure() {
   return PDFDocumentProperties;
 })();
 
-exports.PDFDocumentProperties = PDFDocumentProperties;
+export {
-}));
+  PDFDocumentProperties,
+};

web/pdf_find_bar.js

@@ -13,23 +13,8 @@
  * limitations under the License.
  */
 
-'use strict';
+import { FindStates } from 'pdfjs-web/pdf_find_controller';
-
+import { mozL10n } from 'pdfjs-web/ui_utils';
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_find_bar', ['exports',
-      'pdfjs-web/ui_utils', 'pdfjs-web/pdf_find_controller'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'),
-      require('./pdf_find_controller.js'));
-  } else {
-    factory((root.pdfjsWebPDFFindBar = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebPDFFindController);
-  }
-}(this, function (exports, uiUtils, pdfFindController) {
-
-var mozL10n = uiUtils.mozL10n;
-var FindStates = pdfFindController.FindStates;
 
 /**
  * Creates a "search bar" given a set of DOM elements that act as controls
@@ -236,5 +221,6 @@ var PDFFindBar = (function PDFFindBarClosure() {
   return PDFFindBar;
 })();
 
-exports.PDFFindBar = PDFFindBar;
+export {
-}));
+  PDFFindBar,
+};

web/pdf_find_controller.js

@@ -13,20 +13,7 @@
  * limitations under the License.
  */
 
-'use strict';
+import { scrollIntoView } from 'pdfjs-web/ui_utils';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_find_controller', ['exports', 'pdfjs-web/ui_utils'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'));
-  } else {
-    factory((root.pdfjsWebPDFFindController = {}), root.pdfjsWebUIUtils);
-  }
-}(this, function (exports, uiUtils) {
-
-var scrollIntoView = uiUtils.scrollIntoView;
 
 var FindStates = {
   FIND_FOUND: 0,
@@ -505,6 +492,7 @@ var PDFFindController = (function PDFFindControllerClosure() {
   return PDFFindController;
 })();
 
-exports.FindStates = FindStates;
+export {
-exports.PDFFindController = PDFFindController;
+  FindStates,
-}));
+  PDFFindController,
+};

web/pdf_history.js

@@ -14,18 +14,7 @@
  */
 /* globals chrome */
 
-'use strict';
+import { domEvents } from 'pdfjs-web/dom_events';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_history', ['exports', 'pdfjs-web/dom_events'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./dom_events.js'));
-  } else {
-    factory((root.pdfjsWebPDFHistory = {}), root.pdfjsWebDOMEvents);
-  }
-}(this, function (exports, domEvents) {
 
 function PDFHistory(options) {
   this.linkService = options.linkService;
@@ -432,5 +421,6 @@
   }
 };
 
-  exports.PDFHistory = PDFHistory;
+export {
-}));
+  PDFHistory,
+};

web/pdf_link_service.js

@@ -13,21 +13,8 @@
  * limitations under the License.
  */
 
-'use strict';
+import { domEvents } from 'pdfjs-web/dom_events';
-
+import { parseQueryString } from 'pdfjs-web/ui_utils';
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_link_service', ['exports', 'pdfjs-web/ui_utils',
-      'pdfjs-web/dom_events'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'), require('./dom_events.js'));
-  } else {
-    factory((root.pdfjsWebPDFLinkService = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebDOMEvents);
-  }
-}(this, function (exports, uiUtils, domEvents) {
-
-var parseQueryString = uiUtils.parseQueryString;
 
 var PageNumberRegExp = /^\d+$/;
 function isPageNumber(str) {
@@ -487,6 +474,7 @@ var SimpleLinkService = (function SimpleLinkServiceClosure() {
   return SimpleLinkService;
 })();
 
-exports.PDFLinkService = PDFLinkService;
+export {
-exports.SimpleLinkService = SimpleLinkService;
+  PDFLinkService,
-}));
+  SimpleLinkService,
+};

web/pdf_outline_viewer.js

@@ -13,18 +13,7 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_outline_viewer', ['exports', 'pdfjs-web/pdfjs'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebPDFOutlineViewer = {}), root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, pdfjsLib) {
 
 var PDFJS = pdfjsLib.PDFJS;
 
@@ -231,5 +220,6 @@ var PDFOutlineViewer = (function PDFOutlineViewerClosure() {
   return PDFOutlineViewer;
 })();
 
-exports.PDFOutlineViewer = PDFOutlineViewer;
+export {
-}));
+  PDFOutlineViewer,
+};

web/pdf_page_view.js

@@ -13,31 +13,13 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
+import {
-(function (root, factory) {
+  approximateFraction, CSS_UNITS, DEFAULT_SCALE, getOutputScale, RendererType,
-  if (typeof define === 'function' && define.amd) {
+  roundToDivide
-    define('pdfjs-web/pdf_page_view', ['exports',
+} from 'pdfjs-web/ui_utils';
-      'pdfjs-web/ui_utils', 'pdfjs-web/pdf_rendering_queue',
+import { domEvents } from 'pdfjs-web/dom_events';
-      'pdfjs-web/dom_events', 'pdfjs-web/pdfjs'], factory);
+import { RenderingStates } from 'pdfjs-web/pdf_rendering_queue';
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'),
-      require('./pdf_rendering_queue.js'), require('./dom_events.js'),
-      require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebPDFPageView = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebPDFRenderingQueue, root.pdfjsWebDOMEvents,
-      root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, uiUtils, pdfRenderingQueue, domEvents, pdfjsLib) {
-
-var CSS_UNITS = uiUtils.CSS_UNITS;
-var DEFAULT_SCALE = uiUtils.DEFAULT_SCALE;
-var getOutputScale = uiUtils.getOutputScale;
-var approximateFraction = uiUtils.approximateFraction;
-var roundToDivide = uiUtils.roundToDivide;
-var RendererType = uiUtils.RendererType;
-var RenderingStates = pdfRenderingQueue.RenderingStates;
 
 var TEXT_LAYER_RENDER_DELAY = 200; // ms
 
@@ -691,5 +673,6 @@ var PDFPageView = (function PDFPageViewClosure() {
   return PDFPageView;
 })();
 
-exports.PDFPageView = PDFPageView;
+export {
-}));
+  PDFPageView,
+};

web/pdf_presentation_mode.js

@@ -13,19 +13,7 @@
  * limitations under the License.
  */
 
-'use strict';
+import { normalizeWheelEventDelta } from 'pdfjs-web/ui_utils';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_presentation_mode', ['exports', 'pdfjs-web/ui_utils'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'));
-  } else {
-    factory((root.pdfjsWebPDFPresentationMode = {}), root.pdfjsWebUIUtils);
-  }
-}(this, function (exports, uiUtils) {
-var normalizeWheelEventDelta = uiUtils.normalizeWheelEventDelta;
 
 var DELAY_BEFORE_RESETTING_SWITCH_IN_PROGRESS = 1500; // in ms
 var DELAY_BEFORE_HIDING_CONTROLS = 3000; // in ms
@@ -517,5 +505,6 @@ var PDFPresentationMode = (function PDFPresentationModeClosure() {
   return PDFPresentationMode;
 })();
 
-exports.PDFPresentationMode = PDFPresentationMode;
+export {
-}));
+  PDFPresentationMode,
+};

web/pdf_print_service.js

@@ -13,25 +13,10 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
+import { CSS_UNITS, mozL10n } from 'pdfjs-web/ui_utils';
-(function (root, factory) {
+import { OverlayManager } from 'pdfjs-web/overlay_manager';
-  if (typeof define === 'function' && define.amd) {
+import { PDFPrintServiceFactory } from 'pdfjs-web/app';
-    define('pdfjs-web/pdf_print_service', ['exports', 'pdfjs-web/ui_utils',
-      'pdfjs-web/overlay_manager', 'pdfjs-web/app', 'pdfjs-web/pdfjs'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'), require('./overlay_manager.js'),
-      require('./app.js'), require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebPDFPrintService = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebOverlayManager, root.pdfjsWebApp, root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, uiUtils, overlayManager, app, pdfjsLib) {
-  var mozL10n = uiUtils.mozL10n;
-  var CSS_UNITS = uiUtils.CSS_UNITS;
-  var PDFPrintServiceFactory = app.PDFPrintServiceFactory;
-  var OverlayManager = overlayManager.OverlayManager;
 
 var activeService = null;
 
@@ -346,5 +331,6 @@
   }
 };
 
-  exports.PDFPrintService = PDFPrintService;
+export {
-}));
+  PDFPrintService,
+};

web/pdf_rendering_queue.js

@@ -13,18 +13,6 @@
  * limitations under the License.
  */
 
-'use strict';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_rendering_queue', ['exports'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports);
-  } else {
-    factory((root.pdfjsWebPDFRenderingQueue = {}));
-  }
-}(this, function (exports) {
-
 var CLEANUP_TIMEOUT = 30000;
 
 var RenderingStates = {
@@ -186,6 +174,7 @@ var PDFRenderingQueue = (function PDFRenderingQueueClosure() {
   return PDFRenderingQueue;
 })();
 
-exports.RenderingStates = RenderingStates;
+export {
-exports.PDFRenderingQueue = PDFRenderingQueue;
+  RenderingStates,
-}));
+  PDFRenderingQueue,
+};

web/pdf_sidebar.js

@@ -13,23 +13,8 @@
  * limitations under the License.
  */
 
-'use strict';
+import { mozL10n } from 'pdfjs-web/ui_utils';
-
+import { RenderingStates } from 'pdfjs-web/pdf_rendering_queue';
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_sidebar', ['exports',
-      'pdfjs-web/pdf_rendering_queue', 'pdfjs-web/ui_utils'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./pdf_rendering_queue.js'),
-      require('./ui_utils.js'));
-  } else {
-    factory((root.pdfjsWebPDFSidebar = {}), root.pdfjsWebPDFRenderingQueue,
-      root.pdfjsWebUIUtils);
-  }
-}(this, function (exports, pdfRenderingQueue, uiUtils) {
-
-var RenderingStates = pdfRenderingQueue.RenderingStates;
-var mozL10n = uiUtils.mozL10n;
 
 var UI_NOTIFICATION_CLASS = 'pdfSidebarNotification';
 
@@ -460,6 +445,7 @@ var PDFSidebar = (function PDFSidebarClosure() {
   return PDFSidebar;
 })();
 
-exports.SidebarView = SidebarView;
+export {
-exports.PDFSidebar = PDFSidebar;
+  SidebarView,
-}));
+  PDFSidebar,
+};

web/pdf_thumbnail_view.js

@@ -13,24 +13,8 @@
  * limitations under the License.
  */
 
-'use strict';
+import { getOutputScale, mozL10n } from 'pdfjs-web/ui_utils';
-
+import { RenderingStates } from 'pdfjs-web/pdf_rendering_queue';
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/pdf_thumbnail_view', ['exports',
-      'pdfjs-web/ui_utils', 'pdfjs-web/pdf_rendering_queue'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'),
-      require('./pdf_rendering_queue.js'));
-  } else {
-    factory((root.pdfjsWebPDFThumbnailView = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebPDFRenderingQueue);
-  }
-}(this, function (exports, uiUtils, pdfRenderingQueue) {
-
-var mozL10n = uiUtils.mozL10n;
-var getOutputScale = uiUtils.getOutputScale;
-var RenderingStates = pdfRenderingQueue.RenderingStates;
 
 var THUMBNAIL_WIDTH = 98; // px
 var THUMBNAIL_CANVAS_BORDER_WIDTH = 1; // px
@@ -430,5 +414,6 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
 
 PDFThumbnailView.tempImageCache = null;
 
-exports.PDFThumbnailView = PDFThumbnailView;
+export {
-}));
+  PDFThumbnailView,
+};

web/pdf_thumbnail_viewer.js

@@ -13,25 +13,10 @@
  * limitations under the License.
  */
 
-'use strict';
+import {
-
+  getVisibleElements, scrollIntoView, watchScroll
-(function (root, factory) {
+} from 'pdfjs-web/ui_utils';
-  if (typeof define === 'function' && define.amd) {
+import { PDFThumbnailView } from 'pdfjs-web/pdf_thumbnail_view';
-    define('pdfjs-web/pdf_thumbnail_viewer', ['exports',
-      'pdfjs-web/ui_utils', 'pdfjs-web/pdf_thumbnail_view'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'),
-      require('./pdf_thumbnail_view.js'));
-  } else {
-    factory((root.pdfjsWebPDFThumbnailViewer = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebPDFThumbnailView);
-  }
-}(this, function (exports, uiUtils, pdfThumbnailView) {
-
-var watchScroll = uiUtils.watchScroll;
-var getVisibleElements = uiUtils.getVisibleElements;
-var scrollIntoView = uiUtils.scrollIntoView;
-var PDFThumbnailView = pdfThumbnailView.PDFThumbnailView;
 
 var THUMBNAIL_SCROLL_MARGIN = -19;
 
@@ -247,5 +232,6 @@ var PDFThumbnailViewer = (function PDFThumbnailViewerClosure() {
   return PDFThumbnailViewer;
 })();
 
-exports.PDFThumbnailViewer = PDFThumbnailViewer;
+export {
-}));
+  PDFThumbnailViewer,
+};

web/pdf_viewer.js

@@ -13,48 +13,20 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
+import {
-(function (root, factory) {
+  CSS_UNITS, DEFAULT_SCALE, DEFAULT_SCALE_VALUE, getVisibleElements,
-  if (typeof define === 'function' && define.amd) {
+  MAX_AUTO_SCALE, RendererType, SCROLLBAR_PADDING, scrollIntoView,
-    define('pdfjs-web/pdf_viewer', ['exports', 'pdfjs-web/ui_utils',
+  UNKNOWN_SCALE, VERTICAL_PADDING, watchScroll
-      'pdfjs-web/pdf_page_view', 'pdfjs-web/pdf_rendering_queue',
+} from 'pdfjs-web/ui_utils';
-      'pdfjs-web/text_layer_builder', 'pdfjs-web/annotation_layer_builder',
+import {
-      'pdfjs-web/pdf_link_service', 'pdfjs-web/dom_events', 'pdfjs-web/pdfjs'],
+  PDFRenderingQueue, RenderingStates,
-      factory);
+} from 'pdfjs-web/pdf_rendering_queue';
-  } else if (typeof exports !== 'undefined') {
+import { AnnotationLayerBuilder } from 'pdfjs-web/annotation_layer_builder';
-    factory(exports, require('./ui_utils.js'), require('./pdf_page_view.js'),
+import { domEvents } from 'pdfjs-web/dom_events';
-      require('./pdf_rendering_queue.js'), require('./text_layer_builder.js'),
+import { PDFPageView } from 'pdfjs-web/pdf_page_view';
-      require('./annotation_layer_builder.js'),
+import { SimpleLinkService } from 'pdfjs-web/pdf_link_service';
-      require('./pdf_link_service.js'), require('./dom_events.js'),
+import { TextLayerBuilder } from 'pdfjs-web/text_layer_builder';
-      require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebPDFViewer = {}), root.pdfjsWebUIUtils,
-      root.pdfjsWebPDFPageView, root.pdfjsWebPDFRenderingQueue,
-      root.pdfjsWebTextLayerBuilder, root.pdfjsWebAnnotationLayerBuilder,
-      root.pdfjsWebPDFLinkService, root.pdfjsWebDOMEvents, root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, uiUtils, pdfPageView, pdfRenderingQueue,
-                  textLayerBuilder, annotationLayerBuilder, pdfLinkService,
-                  domEvents, pdfjsLib) {
-
-var UNKNOWN_SCALE = uiUtils.UNKNOWN_SCALE;
-var SCROLLBAR_PADDING = uiUtils.SCROLLBAR_PADDING;
-var VERTICAL_PADDING = uiUtils.VERTICAL_PADDING;
-var MAX_AUTO_SCALE = uiUtils.MAX_AUTO_SCALE;
-var CSS_UNITS = uiUtils.CSS_UNITS;
-var DEFAULT_SCALE = uiUtils.DEFAULT_SCALE;
-var DEFAULT_SCALE_VALUE = uiUtils.DEFAULT_SCALE_VALUE;
-var RendererType = uiUtils.RendererType;
-var scrollIntoView = uiUtils.scrollIntoView;
-var watchScroll = uiUtils.watchScroll;
-var getVisibleElements = uiUtils.getVisibleElements;
-var PDFPageView = pdfPageView.PDFPageView;
-var RenderingStates = pdfRenderingQueue.RenderingStates;
-var PDFRenderingQueue = pdfRenderingQueue.PDFRenderingQueue;
-var TextLayerBuilder = textLayerBuilder.TextLayerBuilder;
-var AnnotationLayerBuilder = annotationLayerBuilder.AnnotationLayerBuilder;
-var SimpleLinkService = pdfLinkService.SimpleLinkService;
 
 var PresentationModeState = {
   UNKNOWN: 0,
@@ -988,6 +960,7 @@ var PDFViewer = (function pdfViewer() {
   return PDFViewer;
 })();
 
-exports.PresentationModeState = PresentationModeState;
+export {
-exports.PDFViewer = PDFViewer;
+  PresentationModeState,
-}));
+  PDFViewer,
+};

web/preferences.js

@@ -13,18 +13,6 @@
  * limitations under the License.
  */
 
-'use strict';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/preferences', ['exports'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports);
-  } else {
-    factory((root.pdfjsWebPreferences = {}));
-  }
-}(this, function (exports) {
-
 var defaultPreferences = null;
 function getDefaultPreferences() {
   if (!defaultPreferences) {
@@ -221,5 +209,6 @@ if (typeof PDFJSDev === 'undefined' ||
   };
 }
 
-exports.Preferences = Preferences;
+export {
-}));
+  Preferences,
+};

web/secondary_toolbar.js

@@ -13,21 +13,7 @@
  * limitations under the License.
  */
 
-'use strict';
+import { mozL10n, SCROLLBAR_PADDING } from 'pdfjs-web/ui_utils';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/secondary_toolbar', ['exports', 'pdfjs-web/ui_utils'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'));
-  } else {
-    factory((root.pdfjsWebSecondaryToolbar = {}), root.pdfjsWebUIUtils);
-  }
-}(this, function (exports, uiUtils) {
-
-var SCROLLBAR_PADDING = uiUtils.SCROLLBAR_PADDING;
-var mozL10n = uiUtils.mozL10n;
 
 /**
  * @typedef {Object} SecondaryToolbarOptions
@@ -241,5 +227,6 @@ var SecondaryToolbar = (function SecondaryToolbarClosure() {
   return SecondaryToolbar;
 })();
 
-exports.SecondaryToolbar = SecondaryToolbar;
+export {
-}));
+  SecondaryToolbar,
+};

web/text_layer_builder.js

@@ -13,19 +13,8 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
+import { domEvents } from 'pdfjs-web/dom_events';
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/text_layer_builder', ['exports', 'pdfjs-web/dom_events',
-        'pdfjs-web/pdfjs'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./dom_events.js'), require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebTextLayerBuilder = {}), root.pdfjsWebDOMEvents,
-      root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, domEvents, pdfjsLib) {
 
 var EXPAND_DIVS_TIMEOUT = 300; // ms
 
@@ -419,6 +408,7 @@ DefaultTextLayerFactory.prototype = {
   }
 };
 
-exports.TextLayerBuilder = TextLayerBuilder;
+export {
-exports.DefaultTextLayerFactory = DefaultTextLayerFactory;
+  TextLayerBuilder,
-}));
+  DefaultTextLayerFactory,
+};

web/toolbar.js

@@ -13,28 +13,10 @@
  * limitations under the License.
  */
 
-'use strict';
+import {
-
+  animationStarted, DEFAULT_SCALE, DEFAULT_SCALE_VALUE, localized, MAX_SCALE,
-(function (root, factory) {
+  MIN_SCALE, mozL10n, noContextMenuHandler
-  if (typeof define === 'function' && define.amd) {
+} from 'pdfjs-web/ui_utils';
-    define('pdfjs-web/toolbar', ['exports', 'pdfjs-web/ui_utils'],
-      factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./ui_utils.js'));
-  } else {
-    factory((root.pdfjsWebToolbar = {}), root.pdfjsWebUIUtils);
-  }
-}(this, function (exports, uiUtils) {
-
-var mozL10n = uiUtils.mozL10n;
-var noContextMenuHandler = uiUtils.noContextMenuHandler;
-var animationStarted = uiUtils.animationStarted;
-var localized = uiUtils.localized;
-
-var DEFAULT_SCALE_VALUE = uiUtils.DEFAULT_SCALE_VALUE;
-var DEFAULT_SCALE = uiUtils.DEFAULT_SCALE;
-var MIN_SCALE = uiUtils.MIN_SCALE;
-var MAX_SCALE = uiUtils.MAX_SCALE;
 
 var PAGE_NUMBER_LOADING_INDICATOR = 'visiblePageIsLoading';
 var SCALE_SELECT_CONTAINER_PADDING = 8;
@@ -286,5 +268,6 @@ var Toolbar = (function ToolbarClosure() {
   return Toolbar;
 })();
 
-exports.Toolbar = Toolbar;
+export {
-}));
+  Toolbar,
+};

web/ui_utils.js

@@ -13,17 +13,7 @@
  * limitations under the License.
  */
 
-'use strict';
+import * as pdfjsLib from 'pdfjs-web/pdfjs';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/ui_utils', ['exports', 'pdfjs-web/pdfjs'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports, require('./pdfjs.js'));
-  } else {
-    factory((root.pdfjsWebUIUtils = {}), root.pdfjsWebPDFJS);
-  }
-}(this, function (exports, pdfjsLib) {
 
 var CSS_UNITS = 96.0 / 72.0;
 var DEFAULT_SCALE_VALUE = 'auto';
@@ -571,30 +561,31 @@ var ProgressBar = (function ProgressBarClosure() {
   return ProgressBar;
 })();
 
-exports.CSS_UNITS = CSS_UNITS;
+export {
-exports.DEFAULT_SCALE_VALUE = DEFAULT_SCALE_VALUE;
+  CSS_UNITS,
-exports.DEFAULT_SCALE = DEFAULT_SCALE;
+  DEFAULT_SCALE_VALUE,
-exports.MIN_SCALE = MIN_SCALE;
+  DEFAULT_SCALE,
-exports.MAX_SCALE = MAX_SCALE;
+  MIN_SCALE,
-exports.UNKNOWN_SCALE = UNKNOWN_SCALE;
+  MAX_SCALE,
-exports.MAX_AUTO_SCALE = MAX_AUTO_SCALE;
+  UNKNOWN_SCALE,
-exports.SCROLLBAR_PADDING = SCROLLBAR_PADDING;
+  MAX_AUTO_SCALE,
-exports.VERTICAL_PADDING = VERTICAL_PADDING;
+  SCROLLBAR_PADDING,
-exports.RendererType = RendererType;
+  VERTICAL_PADDING,
-exports.mozL10n = mozL10n;
+  RendererType,
-exports.EventBus = EventBus;
+  mozL10n,
-exports.ProgressBar = ProgressBar;
+  EventBus,
-exports.getPDFFileNameFromURL = getPDFFileNameFromURL;
+  ProgressBar,
-exports.noContextMenuHandler = noContextMenuHandler;
+  getPDFFileNameFromURL,
-exports.parseQueryString = parseQueryString;
+  noContextMenuHandler,
-exports.getVisibleElements = getVisibleElements;
+  parseQueryString,
-exports.roundToDivide = roundToDivide;
+  getVisibleElements,
-exports.approximateFraction = approximateFraction;
+  roundToDivide,
-exports.getOutputScale = getOutputScale;
+  approximateFraction,
-exports.scrollIntoView = scrollIntoView;
+  getOutputScale,
-exports.watchScroll = watchScroll;
+  scrollIntoView,
-exports.binarySearchFirstItem = binarySearchFirstItem;
+  watchScroll,
-exports.normalizeWheelEventDelta = normalizeWheelEventDelta;
+  binarySearchFirstItem,
-exports.animationStarted = animationStarted;
+  normalizeWheelEventDelta,
-exports.localized = localized;
+  animationStarted,
-}));
+  localized,
+};

web/view_history.js

@@ -13,18 +13,6 @@
  * limitations under the License.
  */
 
-'use strict';
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define('pdfjs-web/view_history', ['exports'], factory);
-  } else if (typeof exports !== 'undefined') {
-    factory(exports);
-  } else {
-    factory((root.pdfjsWebViewHistory = {}));
-  }
-}(this, function (exports) {
-
 var DEFAULT_VIEW_HISTORY_CACHE_SIZE = 20;
 
 /**
@@ -142,5 +130,6 @@ var ViewHistory = (function ViewHistoryClosure() {
   return ViewHistory;
 })();
 
-exports.ViewHistory = ViewHistory;
+export {
-}));
+  ViewHistory,
+};