aboutsummaryrefslogtreecommitdiff
path: root/src/background
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-04-20 03:09:25 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-04-24 16:14:29 +0200
commit82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 (patch)
tree965f6eb89b84d65a62b49008fd972c004832ccd1 /src/background
parente6e0cbc387c2a77b48e4065c229daa65bf1aa0fa (diff)
Reorganize module loading.
We now use webpack instead of SystemJS, effectively bundling modules into one file (plus commons chunks) for every entry point. This results in a much smaller extension size (almost half). Furthermore we use yarn/npm even for extension run-time dependencies. This relieves us from manually vendoring and building dependencies. It's also easier to understand for new developers familiar with node.
Diffstat (limited to 'src/background')
-rw-r--r--src/background/background.html4
-rw-r--r--src/background/background.ts19
2 files changed, 4 insertions, 19 deletions
diff --git a/src/background/background.html b/src/background/background.html
index 621e0fbb9..962542f9a 100644
--- a/src/background/background.html
+++ b/src/background/background.html
@@ -1,9 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
- <script src="../vendor/URI.js"></script>
- <script src="../vendor/system-csp-production.src.js"></script>
- <script src="background.js"></script>
+ <script src="../../dist/background-bundle.js"></script>
<meta charset="UTF-8">
<title>(wallet bg page)</title>
</head>
diff --git a/src/background/background.ts b/src/background/background.ts
index fe2359812..9b50caf9c 100644
--- a/src/background/background.ts
+++ b/src/background/background.ts
@@ -20,22 +20,9 @@
* @author Florian Dold
*/
-"use strict";
-window.addEventListener("load", () => {
-
- // TypeScript does not allow ".js" extensions in the
- // module name, so SystemJS must add it.
- System.config({
- defaultJSExtensions: true,
- });
+import {wxMain} from "./../wxBackend";
- System.import("../wxBackend")
- .then((wxMessaging: any) => {
- // Export as global for debugger
- (window as any).wx = wxMessaging;
- wxMessaging.wxMain();
- }).catch((e: Error) => {
- console.error("Loading Taler wallet background page failed.", e);
- });
+window.addEventListener("load", () => {
+ wxMain();
});