Browse Source

Fix merge errors

Steven Silvester 8 years ago
parent
commit
b64144067b
1 changed files with 0 additions and 69 deletions
  1. 0 69
      packages/application/src/loader.ts

+ 0 - 69
packages/application/src/loader.ts

@@ -186,75 +186,6 @@ class ModuleLoader {
     throw err;
   }
 
-  /**
-   * Inject data into a module (`__webpack_require.i`).
-   *
-   * @param data - The source data.
-   *
-   * @returns The original data (no-op).
-   */
-  inject(data: any): any {
-    return data;
-  }
-
-  /**
-   * A getter function for harmony exports (`__webpack_require.d`).
-   *
-   * @param exports - The module exports.
-   *
-   * @param name - The property name.
-   *
-   * @param getter - The getter function.
-   */
-  harmonyExports(exports: any , name: string, getter: () => any): void {
-    if (!this.hasOwnPropertyCall(exports, name)) {
-      Object.defineProperty(exports, name, {
-        configurable: false,
-        enumerable: true,
-        get: getter
-      });
-    }
-  };
-
-  /**
-   * An Object.prototype.hasOwnProperty.call - (`__webpack_require.o`).
-   *
-   * @param object - The target object.
-   *
-   * @param property - The target property.
-   *
-   * @returns Whether the object has the property.
-   */
-  hasOwnPropertyCall(object: any, property: string): boolean {
-    return Object.prototype.hasOwnProperty.call(object, property);
-  }
-
-  /**
-   * Default export function for compatibility with non-harmony modules
-   *   (`__webpack_require.n`).
-   *
-   * @param module - The target module.
-   *
-   * @returns The default export of the module.
-   */
-  getDefaultExport(module: any): any {
-    let getter = module && module.__esModule ?
-      function getDefault() { return module['default']; } :
-      function getModuleExports() { return module; };
-    this.harmonyExports(getter, 'a', getter);
-    return getter;
-  };
-
-  /**
-   * An on error function for async loading - (`__webpack_require.oe`).
-   *
-   * @param err - The original error.
-   */
-  asyncLoadError(err: Error): void {
-    console.error(err);
-    throw err;
-  }
-
   /**
    * Extract the entry point plugins of an extension.
    *