start spring cleaning, use rollup instead of both webpack and rollup

3 files changed, 7 insertions, 13 deletions

diff --git a/src/headless/clk.ts b/src/headless/clk.ts
index 7d7417ea9..7c99384bb 100644
--- a/src/headless/clk.ts
+++ b/src/headless/clk.ts
@@ -17,9 +17,9 @@
 /**
  * Imports.
  */
-import process = require("process");
-import path = require("path");
-import readline = require("readline");
+import process from "process";
+import path from "path";
+import readline from "readline";
 
 class Converter<T> {}
 
diff --git a/src/headless/helpers.ts b/src/headless/helpers.ts
index 92452e78f..053332b37 100644
--- a/src/headless/helpers.ts
+++ b/src/headless/helpers.ts
@@ -28,7 +28,7 @@ import { openTalerDatabase } from "../db";
 import { HttpRequestLibrary } from "../util/http";
 import * as amounts from "../util/amounts";
 import { Bank } from "./bank";
-import fs = require("fs");
+import fs from "fs";
 import { NodeThreadCryptoWorkerFactory } from "../crypto/workers/nodeThreadWorker";
 import { WalletNotification, NotificationType } from "../types/notifications";
 import { Database } from "../util/query";
diff --git a/src/headless/taler-wallet-cli.ts b/src/headless/taler-wallet-cli.ts
index d183ef316..c7909948f 100644
--- a/src/headless/taler-wallet-cli.ts
+++ b/src/headless/taler-wallet-cli.ts
@@ -14,13 +14,13 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-import os = require("os");
-import fs = require("fs");
+import os from "os";
+import fs from "fs";
 import { getDefaultNodeWallet, withdrawTestBalance } from "./helpers";
 import { MerchantBackendConnection } from "./merchant";
 import { runIntegrationTest, runIntegrationTestBasic } from "./integrationtest";
 import { Wallet } from "../wallet";
-import qrcodeGenerator = require("qrcode-generator");
+import qrcodeGenerator from "qrcode-generator";
 import * as clk from "./clk";
 import { BridgeIDBFactory, MemoryBackend } from "idb-bridge";
 import { Logger } from "../util/logging";
@@ -29,17 +29,11 @@ import { decodeCrock } from "../crypto/talerCrypto";
 import { OperationFailedAndReportedError } from "../operations/errors";
 import { Bank } from "./bank";
 import { classifyTalerUri, TalerUriType } from "../util/taleruri";
-import util = require("util");
 import { Configuration } from "../util/talerconfig";
 import { setDangerousTimetravel } from "../util/time";
 import { makeCodecForList, codecForString } from "../util/codec";
 import { NodeHttpLib } from "./NodeHttpLib";
 
-// Backwards compatibility with nodejs<0.11, where TextEncoder and TextDecoder
-// are not globals yet.
-(global as any).TextEncoder = util.TextEncoder;
-(global as any).TextDecoder = util.TextDecoder;
-
 const logger = new Logger("taler-wallet-cli.ts");
 
 const defaultWalletDbPath = os.homedir + "/" + ".talerwalletdb.json";