Merge pull request #8462 from yurydelendik/rm=umd

Removes last UMDs from the modules.

web/annotation_layer_builder.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { AnnotationLayer } from './pdfjs';
+import { AnnotationLayer } from 'pdfjs-lib';
 import { mozL10n } from './ui_utils';
 import { SimpleLinkService } from './pdf_link_service';
 

web/app.js

@@ -23,7 +23,7 @@ import {
   build, createBlob, getDocument, getFilenameFromUrl, InvalidPDFException,
   MissingPDFException, OPS, PDFJS, shadow, UnexpectedResponseException,
   UNSUPPORTED_FEATURES, version,
-} from './pdfjs';
+} from 'pdfjs-lib';
 import { CursorTool, PDFCursorTools } from './pdf_cursor_tools';
 import { PDFRenderingQueue, RenderingStates } from './pdf_rendering_queue';
 import { PDFSidebar, SidebarView } from './pdf_sidebar';

web/chromecom.js

@@ -17,7 +17,7 @@
 import { DefaultExternalServices, PDFViewerApplication } from './app';
 import { BasePreferences } from './preferences';
 import { DownloadManager } from './download_manager';
-import { PDFJS } from './pdfjs';
+import { PDFJS } from 'pdfjs-lib';
 
 if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('CHROME')) {
   throw new Error('Module "pdfjs-web/chromecom" shall not be used outside ' +

web/download_manager.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { createObjectURL, createValidAbsoluteUrl, PDFJS } from './pdfjs';
+import { createObjectURL, createValidAbsoluteUrl, PDFJS } from 'pdfjs-lib';
 
 if (typeof PDFJSDev !== 'undefined' && !PDFJSDev.test('CHROME || GENERIC')) {
   throw new Error('Module "pdfjs-web/download_manager" shall not be used ' +

web/firefox_print_service.js

@@ -15,7 +15,7 @@
 
 import { CSS_UNITS } from './ui_utils';
 import { PDFPrintServiceFactory } from './app';
-import { shadow } from './pdfjs';
+import { shadow } from 'pdfjs-lib';
 
 // Creates a placeholder with div and canvas with right size for the page.
 function composePage(pdfDocument, pageNumber, size, printContainer) {

web/firefoxcom.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { createObjectURL, PDFDataRangeTransport, shadow } from './pdfjs';
+import { createObjectURL, PDFDataRangeTransport, shadow } from 'pdfjs-lib';
 import { BasePreferences } from './preferences';
 import { PDFViewerApplication } from './app';
 

web/password_prompt.js

@@ -14,7 +14,7 @@
  */
 
 import { mozL10n } from './ui_utils';
-import { PasswordResponses } from './pdfjs';
+import { PasswordResponses } from 'pdfjs-lib';
 
 /**
  * @typedef {Object} PasswordPromptOptions

web/pdf_attachment_viewer.js

@@ -16,7 +16,7 @@
 import {
   createObjectURL, createPromiseCapability, getFilenameFromUrl, PDFJS,
   removeNullCharacters
-} from './pdfjs';
+} from 'pdfjs-lib';
 
 /**
  * @typedef {Object} PDFAttachmentViewerOptions

web/pdf_document_properties.js

@@ -14,7 +14,7 @@
  */
 
 import { cloneObj, getPDFFileNameFromURL, mozL10n } from './ui_utils';
-import { createPromiseCapability } from './pdfjs';
+import { createPromiseCapability } from 'pdfjs-lib';
 
 const DEFAULT_FIELD_CONTENT = '-';
 

web/pdf_find_controller.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { createPromiseCapability } from './pdfjs';
+import { createPromiseCapability } from 'pdfjs-lib';
 import { scrollIntoView } from './ui_utils';
 
 var FindStates = {

web/pdf_outline_viewer.js

@@ -15,7 +15,7 @@
 
 import {
   addLinkAttributes, PDFJS, removeNullCharacters
-} from './pdfjs';
+} from 'pdfjs-lib';
 
 const DEFAULT_TITLE = '\u2013';
 

web/pdf_page_view.js

@@ -20,7 +20,7 @@ import {
 import {
   createPromiseCapability, CustomStyle, PDFJS, RenderingCancelledException,
   SVGGraphics
-} from './pdfjs';
+} from 'pdfjs-lib';
 import { getGlobalEventBus } from './dom_events';
 import { RenderingStates } from './pdf_rendering_queue';
 

web/pdf_print_service.js

@@ -15,7 +15,7 @@
 
 import { CSS_UNITS, mozL10n } from './ui_utils';
 import { PDFPrintServiceFactory, PDFViewerApplication } from './app';
-import { PDFJS } from './pdfjs';
+import { PDFJS } from 'pdfjs-lib';
 
 let activeService = null;
 let overlayManager = null;

web/pdf_thumbnail_view.js

@@ -13,7 +13,9 @@
  * limitations under the License.
  */
 
-import { createPromiseCapability, RenderingCancelledException } from './pdfjs';
+import {
+  createPromiseCapability, RenderingCancelledException
+} from 'pdfjs-lib';
 import { getOutputScale, mozL10n } from './ui_utils';
 import { RenderingStates } from './pdf_rendering_queue';
 

web/pdf_viewer.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { createPromiseCapability, PDFJS } from './pdfjs';
+import { createPromiseCapability, PDFJS } from 'pdfjs-lib';
 import {
   CSS_UNITS, DEFAULT_SCALE, DEFAULT_SCALE_VALUE, getVisibleElements,
   MAX_AUTO_SCALE, RendererType, SCROLLBAR_PADDING, scrollIntoView,

web/pdfjs.js

@@ -16,38 +16,15 @@
 
 'use strict';
 
-if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('PRODUCTION')) {
-  var pdfjsLib;
-  // The if below protected by __pdfjsdev_webpack__ check from webpack parsing.
-  if (typeof __pdfjsdev_webpack__ === 'undefined') {
-    if (typeof window !== 'undefined' && window['pdfjs-dist/build/pdf']) {
-      pdfjsLib = window['pdfjs-dist/build/pdf'];
-    } else if (typeof require === 'function') {
-      if (PDFJSDev.test('LIB')) {
-        pdfjsLib = require('../pdf.js');
-      } else {
-        pdfjsLib = require('../build/pdf.js');
-      }
-    } else {
-      throw new Error('Neither `require` nor `window` found');
-    }
+var pdfjsLib;
+// The if below protected by __pdfjsdev_webpack__ check from webpack parsing.
+if (typeof __pdfjsdev_webpack__ === 'undefined') {
+  if (typeof window !== 'undefined' && window['pdfjs-dist/build/pdf']) {
+    pdfjsLib = window['pdfjs-dist/build/pdf'];
+  } else if (typeof require === 'function') {
+    pdfjsLib = require('../build/pdf.js');
+  } else {
+    throw new Error('Neither `require` nor `window` found');
   }
-  module.exports = pdfjsLib;
-} else {
-  (function (root, factory) {
-    if (typeof define === 'function' && define.amd) {
-      define('pdfjs-web/pdfjs', ['exports', 'pdfjs/main_loader'], factory);
-    } else if (typeof exports !== 'undefined') {
-      factory(exports, require('../src/main_loader.js'));
-    } else {
-      factory((root.pdfjsWebPDFJS = {}), root.pdfjsMainLoader);
-    }
-  }(this, function (exports, mainLoader) {
-    // Re-export all mainLoader members.
-    for (var i in mainLoader) {
-      if (Object.prototype.hasOwnProperty.call(mainLoader, i)) {
-        exports[i] = mainLoader[i];
-      }
-    }
-  }));
 }
+module.exports = pdfjsLib;

web/text_layer_builder.js

@@ -14,7 +14,7 @@
  */
 
 import { getGlobalEventBus } from './dom_events';
-import { renderTextLayer } from './pdfjs';
+import { renderTextLayer } from 'pdfjs-lib';
 
 var EXPAND_DIVS_TIMEOUT = 300; // ms
 

web/ui_utils.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { PDFJS } from './pdfjs';
+import { PDFJS } from 'pdfjs-lib';
 
 var CSS_UNITS = 96.0 / 72.0;
 var DEFAULT_SCALE_VALUE = 'auto';