From 82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 20 Apr 2017 03:09:25 +0200 Subject: 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. --- src/helpers.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/helpers.ts') diff --git a/src/helpers.ts b/src/helpers.ts index d9b62aa22..7b9470271 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -21,10 +21,8 @@ * @author Florian Dold */ -/// - import {AmountJson, Amounts} from "./types"; -import URI = uri.URI; +import URI = require("urijs"); export function substituteFulfillmentUrl(url: string, vars: any) { url = url.replace("${H_contract}", vars.H_contract); @@ -45,7 +43,7 @@ export function amountToPretty(amount: AmountJson): string { * See http://api.taler.net/wallet.html#general */ export function canonicalizeBaseUrl(url: string) { - let x: URI = new URI(url); + let x = new URI(url); if (!x.protocol()) { x.protocol("https"); } -- cgit v1.2.3