From 8fc3b8e3aa13234e549c4cd23303718a2a0bb39e Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Tue, 14 Mar 2017 17:35:36 +0100
Subject: [PATCH] Now it mostly works with some limitations:

- ambient declarations seem not to be working, thus the following
  converters have temporarily been disabled:
  - punycode
  - utf8
  - quoted-printable
---
 config/webpack.prod.js                      |  38 +++++++++++++++++
 package.json                                |   9 ++--
 src/app/app.component.ts                    |   7 ++--
 src/app/converter/punycodedecoder.ts        |   3 +-
 src/app/converter/punycodeencoder.ts        |   3 +-
 src/app/converter/quotedprintabledecoder.ts |   8 ++--
 src/app/converter/quotedprintableencoder.ts |   3 +-
 src/app/converterregistry.service.ts        |  16 ++++----
 src/app/nativelibrarywrapper.service.ts     |  12 +++---
 src/assets/css/style.css                    |  25 ++++++++++++
 src/{ => assets/fonts}/abeezee-regular.woff | Bin
 src/{ => assets/fonts}/freemono.eot         | Bin
 src/{ => assets/fonts}/freemono.svg         |   0
 src/{ => assets/fonts}/freemono.ttf         | Bin
 src/{ => assets/fonts}/freemono.woff        | Bin
 src/index.html                              |  43 +-------------------
 src/polyfills.ts                            |   2 +-
 src/tsconfig.json                           |   5 ++-
 src/vendor.ts                               |  28 ++++++-------
 systemjs.config.js                          |  43 --------------------
 20 files changed, 115 insertions(+), 130 deletions(-)
 create mode 100644 config/webpack.prod.js
 create mode 100644 src/assets/css/style.css
 rename src/{ => assets/fonts}/abeezee-regular.woff (100%)
 rename src/{ => assets/fonts}/freemono.eot (100%)
 rename src/{ => assets/fonts}/freemono.svg (100%)
 rename src/{ => assets/fonts}/freemono.ttf (100%)
 rename src/{ => assets/fonts}/freemono.woff (100%)
 delete mode 100644 systemjs.config.js

diff --git a/config/webpack.prod.js b/config/webpack.prod.js
new file mode 100644
index 0000000..eef3bf1
--- /dev/null
+++ b/config/webpack.prod.js
@@ -0,0 +1,38 @@
+var webpack = require('webpack');
+var webpackMerge = require('webpack-merge');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var commonConfig = require('./webpack.common.js');
+var helpers = require('./helpers');
+
+const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
+
+module.exports = webpackMerge(commonConfig, {
+    devtool: 'source-map',
+
+    output: {
+        path: helpers.root('dist'),
+        publicPath: '/',
+        filename: '[name].[hash].js',
+        chunkFilename: '[id].[hash].chunk.js'
+    },
+
+    plugins: [
+        new webpack.NoEmitOnErrorsPlugin(),
+        new webpack.optimize.UglifyJsPlugin({ // https://github.com/angular/angular/issues/10618
+            mangle: {
+                keep_fnames: true
+            }
+        }),
+        new ExtractTextPlugin('[name].[hash].css'),
+        new webpack.DefinePlugin({
+            'process.env': {
+                'ENV': JSON.stringify(ENV)
+            }
+        }),
+        new webpack.LoaderOptionsPlugin({
+            htmlLoader: {
+                minimize: false // workaround for ng2
+            }
+        })
+    ]
+});
diff --git a/package.json b/package.json
index a5cb45e..d63eb57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dencode.org",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "description": "Convert to and fro!",
   "keywords": [
     "dencode",
@@ -13,8 +13,11 @@
     "email": "manuel@fritteli.ch"
   },
   "license": "MIT",
-  "homepage": "https://test.friedli.info/~manuel/dencode",
-  "repository": "https://gittr.ch/manuel/dencode.org.git",
+  "homepage": "https://manuel.pages.gittr.ch/dencode.org",
+  "repository": {
+    "type": "git",
+    "url": "https://gittr.ch/manuel/dencode.org.git"
+  },
   "dependencies": {
     "@angular/common": "~2.4.0",
     "@angular/compiler": "~2.4.0",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 97a015e..6755491 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -5,11 +5,12 @@ import {Converter} from "./converter/converter";
 import {NativeLibraryWrapperService} from "./nativelibrarywrapper.service";
 import {Step} from "./step";
 
+import "../assets/css/style.css";
+
 @Component({
-    moduleId: module.id,
     selector: "den-app",
-    templateUrl: "app.component.html",
-    styleUrls: ["app.component.css"],
+    templateUrl: "./app.component.html",
+    styleUrls: ["./app.component.css"],
     providers: [ConverterRegistryService, InputComponentManagerService, NativeLibraryWrapperService]
 })
 export class AppComponent extends OnInit {
diff --git a/src/app/converter/punycodedecoder.ts b/src/app/converter/punycodedecoder.ts
index e61a8b4..15fc909 100644
--- a/src/app/converter/punycodedecoder.ts
+++ b/src/app/converter/punycodedecoder.ts
@@ -15,6 +15,7 @@ export class PunycodeDecoder implements Converter {
     }
 
     convert(input: string): string {
-        return this.nativeLibraryWrapperService.punycode.decode(input);
+        // return this.nativeLibraryWrapperService.punycode.decode(input);
+        return "";
     }
 }
diff --git a/src/app/converter/punycodeencoder.ts b/src/app/converter/punycodeencoder.ts
index 66345d6..202d822 100644
--- a/src/app/converter/punycodeencoder.ts
+++ b/src/app/converter/punycodeencoder.ts
@@ -15,6 +15,7 @@ export class PunycodeEncoder implements Converter {
     }
 
     convert(input: string): string {
-        return this.nativeLibraryWrapperService.punycode.encode(input);
+        // return this.nativeLibraryWrapperService.punycode.encode(input);
+        return "";
     }
 }
diff --git a/src/app/converter/quotedprintabledecoder.ts b/src/app/converter/quotedprintabledecoder.ts
index d998038..bc1e857 100644
--- a/src/app/converter/quotedprintabledecoder.ts
+++ b/src/app/converter/quotedprintabledecoder.ts
@@ -14,10 +14,10 @@ export class QuotedPrintableDecoder implements Converter {
     }
 
     convert(input:string):string {
-        try {
-            return this.nativeLibraryWrapperService.utf8.decode(this.nativeLibraryWrapperService.quotedPrintable.decode(input));
-        } catch (error) {
+        // try {
+        //     return this.nativeLibraryWrapperService.utf8.decode(this.nativeLibraryWrapperService.quotedPrintable.decode(input));
+        // } catch (error) {
             throw new Error("The input can not be interpreted as quoted-printable. May be corrupt?");
-        }
+        // }
     }
 }
diff --git a/src/app/converter/quotedprintableencoder.ts b/src/app/converter/quotedprintableencoder.ts
index 048dbc6..c97c9d7 100644
--- a/src/app/converter/quotedprintableencoder.ts
+++ b/src/app/converter/quotedprintableencoder.ts
@@ -14,6 +14,7 @@ export class QuotedPrintableEncoder implements Converter {
     }
 
     convert(input:string):string {
-        return this.nativeLibraryWrapperService.quotedPrintable.encode(this.nativeLibraryWrapperService.utf8.encode(input));
+        // return this.nativeLibraryWrapperService.quotedPrintable.encode(this.nativeLibraryWrapperService.utf8.encode(input));
+        return "";
     }
 }
diff --git a/src/app/converterregistry.service.ts b/src/app/converterregistry.service.ts
index af6e30b..1fea66c 100644
--- a/src/app/converterregistry.service.ts
+++ b/src/app/converterregistry.service.ts
@@ -12,11 +12,11 @@ import {DecToHexConverter} from "./converter/dectohexconverter";
 import {HexToDecConverter} from "./converter/hextodecconverter";
 import {DecToBinConverter} from "./converter/dectobinconverter";
 import {BinToDecConverter} from "./converter/bintodecconverter";
-import {QuotedPrintableDecoder} from "./converter/quotedprintabledecoder";
-import {QuotedPrintableEncoder} from "./converter/quotedprintableencoder";
+// import {QuotedPrintableDecoder} from "./converter/quotedprintabledecoder";
+// import {QuotedPrintableEncoder} from "./converter/quotedprintableencoder";
 import {NativeLibraryWrapperService} from "./nativelibrarywrapper.service";
-import {PunycodeEncoder} from "./converter/punycodeencoder";
-import {PunycodeDecoder} from "./converter/punycodedecoder";
+// import {PunycodeEncoder} from "./converter/punycodeencoder";
+// import {PunycodeDecoder} from "./converter/punycodedecoder";
 
 @Injectable()
 export class ConverterRegistryService {
@@ -48,14 +48,14 @@ export class ConverterRegistryService {
         this.registerConverter(new URIComponentDecoder());
         this.registerConverter(new HTMLEntitiesEncoder());
         this.registerConverter(new HTMLEntitiesDecoder());
-        this.registerConverter(new QuotedPrintableEncoder(this.wrapper));
-        this.registerConverter(new QuotedPrintableDecoder(this.wrapper));
+        // this.registerConverter(new QuotedPrintableEncoder(this.wrapper));
+        // this.registerConverter(new QuotedPrintableDecoder(this.wrapper));
         this.registerConverter(new DecToHexConverter());
         this.registerConverter(new HexToDecConverter());
         this.registerConverter(new DecToBinConverter());
         this.registerConverter(new BinToDecConverter());
-        this.registerConverter(new PunycodeEncoder(this.wrapper));
-        this.registerConverter(new PunycodeDecoder(this.wrapper));
+        // this.registerConverter(new PunycodeEncoder(this.wrapper));
+        // this.registerConverter(new PunycodeDecoder(this.wrapper));
     }
 
     private registerConverter(converter:Converter):void {
diff --git a/src/app/nativelibrarywrapper.service.ts b/src/app/nativelibrarywrapper.service.ts
index 2a905b9..1ee1437 100644
--- a/src/app/nativelibrarywrapper.service.ts
+++ b/src/app/nativelibrarywrapper.service.ts
@@ -6,13 +6,13 @@ declare var punycode:any;
 
 @Injectable()
 export class NativeLibraryWrapperService {
-    public utf8:any;
-    public quotedPrintable:any;
-    public punycode:any;
+    // public utf8:any;
+    // public quotedPrintable:any;
+    // public punycode:any;
 
     constructor() {
-        this.utf8 = utf8;
-        this.quotedPrintable = quotedPrintable;
-        this.punycode = punycode;
+        // this.utf8 = utf8;
+        // this.quotedPrintable = quotedPrintable;
+        // this.punycode = punycode;
     }
 }
diff --git a/src/assets/css/style.css b/src/assets/css/style.css
new file mode 100644
index 0000000..f539881
--- /dev/null
+++ b/src/assets/css/style.css
@@ -0,0 +1,25 @@
+@font-face {
+    font-family: "ABeeZee";
+    font-stretch: normal;
+    font-style: normal;
+    font-variant: normal;
+    font-weight: normal;
+    src: local("ABeeZee Regular"),
+    local("ABeeZee-Regular"),
+    local("ABeeZee"),
+    url("../fonts/abeezee-regular.woff") format("woff");
+}
+
+body {
+    font-family: "ABeeZee", sans-serif;
+    margin: 0;
+    padding: 1em 0 0 0;
+}
+
+h1 {
+    text-align: center;
+}
+
+.apploader {
+    text-align: center;
+}
diff --git a/src/abeezee-regular.woff b/src/assets/fonts/abeezee-regular.woff
similarity index 100%
rename from src/abeezee-regular.woff
rename to src/assets/fonts/abeezee-regular.woff
diff --git a/src/freemono.eot b/src/assets/fonts/freemono.eot
similarity index 100%
rename from src/freemono.eot
rename to src/assets/fonts/freemono.eot
diff --git a/src/freemono.svg b/src/assets/fonts/freemono.svg
similarity index 100%
rename from src/freemono.svg
rename to src/assets/fonts/freemono.svg
diff --git a/src/freemono.ttf b/src/assets/fonts/freemono.ttf
similarity index 100%
rename from src/freemono.ttf
rename to src/assets/fonts/freemono.ttf
diff --git a/src/freemono.woff b/src/assets/fonts/freemono.woff
similarity index 100%
rename from src/freemono.woff
rename to src/assets/fonts/freemono.woff
diff --git a/src/index.html b/src/index.html
index 5473fad..962167d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,50 +1,9 @@
 <!DOCTYPE html>
-<!--
-  ~ Copyright (C) Schweizerische Bundesbahnen SBB, 2017.
-  -->
-
 <html>
 <head>
     <meta charset="UTF-8"/>
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/>
     <title>Decode? Encode? DENcode!</title>
-    <!--<script type="text/javascript" src="node_modules/core-js/client/shim.js"></script>-->
-    <!--<script type="text/javascript" src="node_modules/zone.js/dist/zone.js"></script>-->
-    <!--<script type="text/javascript" src="node_modules/reflect-metadata/Reflect.js"></script>-->
-    <!--<script type="text/javascript" src="node_modules/systemjs/dist/system.src.js"></script>-->
-    <!--<script type="text/javascript" src="node_modules/utf8/utf8.js"></script>-->
-    <!--<script type="text/javascript" src="node_modules/quoted-printable/quoted-printable.js"></script>-->
-    <!--<script type="text/javascript" src="node_modules/punycode/punycode.js"></script>-->
-
-    <!--<script type="text/javascript" src="systemjs.config.js"></script>-->
-    <!--<script type="text/javascript">-->
-        <!--System.import("app").catch(function (err) {-->
-            <!--console.log(err);-->
-        <!--});-->
-    <!--</script>-->
-    <style>
-        @font-face {
-            font-family: "ABeeZee";
-            font-stretch: normal;
-            font-style: normal;
-            font-variant: normal;
-            font-weight: normal;
-            src: local("ABeeZee Regular"),
-            local("ABeeZee-Regular"),
-            local("ABeeZee"),
-            url("abeezee-regular.woff") format("woff");
-        }
-
-        body {
-            font-family: "ABeeZee", sans-serif;
-            margin: 0;
-            padding: 1em 0 0 0;
-        }
-
-        h1 {
-            text-align: center;
-        }
-    </style>
 </head>
 <body>
 <h1>Decode? Encode? DENcode!</h1>
@@ -53,7 +12,7 @@
     Browser. You won't regret it!
 </noscript>
 <den-app>
-    <div style="text-align:center;">Please hold on, we're starting the turbines ...</div>
+    <div class="apploader">Please hold on, we're starting the turbines ...</div>
 </den-app>
 </body>
 </html>
diff --git a/src/polyfills.ts b/src/polyfills.ts
index 24bba2f..4311901 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -1,7 +1,7 @@
 import "core-js/es6";
 import "core-js/es7/reflect";
 import "zone.js/dist/zone";
-require('zone.js/dist/zone');
+require("zone.js/dist/zone");
 
 if (process.env.ENV === 'production') {
     // Production
diff --git a/src/tsconfig.json b/src/tsconfig.json
index d23f0db..da26a70 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -12,6 +12,9 @@
       "dom"
     ],
     "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true
+    "suppressImplicitAnyIndexErrors": true,
+    "typeRoots": [
+      "../node_modules/@types/"
+    ]
   }
 }
diff --git a/src/vendor.ts b/src/vendor.ts
index 0ea4119..c7c86fe 100644
--- a/src/vendor.ts
+++ b/src/vendor.ts
@@ -1,17 +1,13 @@
-import "@angular/core";
-import "@angular/platform-browser";
-import "@angular/platform-browser-dynamic";
-import "@angular/forms";
-// import {Component, Injectable, NgModule, OnInit} from "@angular/core";
-// import {BrowserModule} from "@angular/platform-browser";
-// import {platformBrowserDynamic} from "@angular/platform-browser-dynamic";
-// import {FormsModule} from "@angular/forms";
+import {Component, Injectable, NgModule, OnInit} from "@angular/core";
+import {BrowserModule} from "@angular/platform-browser";
+import {platformBrowserDynamic} from "@angular/platform-browser-dynamic";
+import {FormsModule} from "@angular/forms";
 
-// // Angular
-// import '@angular/platform-browser-dynamic';
-// import '@angular/common';
-// import '@angular/http';
-// import '@angular/router';
-//
-// // RxJS
-// import 'rxjs';
+import "rxjs";
+
+import "utf8";
+import "quoted-printable";
+import "punycode";
+require("utf8");
+require("quoted-printable");
+require("punycode");
diff --git a/systemjs.config.js b/systemjs.config.js
deleted file mode 100644
index 5ac6290..0000000
--- a/systemjs.config.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * System configuration for Angular 2 samples
- * Adjust as necessary for your application needs.
- */
-(function (global) {
-    System.config({
-        paths: {
-            // paths serve as alias
-            'npm:': 'node_modules/'
-        },
-        // map tells the System loader where to look for things
-        map: {
-            // our app is within the app folder
-            app: 'app',
-            // angular bundles
-            '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
-            '@angular/common': 'npm:@angular/common/bundles/common.umd.js',
-            '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
-            '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
-            '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
-//            '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
-//            '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
-           '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
-            // other libraries
-            'rxjs': 'npm:rxjs'//,
-//            'angular2-in-memory-web-api': 'npm:angular2-in-memory-web-api',
-        },
-        // packages tells the System loader how to load when no filename and/or no extension
-        packages: {
-            app: {
-                main: './main.js',
-                defaultExtension: 'js'
-            },
-            rxjs: {
-                defaultExtension: 'js'
-            },
-            'angular2-in-memory-web-api': {
-                main: './index.js',
-                defaultExtension: 'js'
-            }
-        }
-    });
-})(this);
\ No newline at end of file