Merge pull request #67 from DimitarTodorov/master

fix: various AoT errors

demo-ng/app/app.module.ts

@@ -7,7 +7,7 @@ import { LoginComponent } from './login/login.component';
 import { MainPageComponent } from './main-page/main-page.component';
 
 import { SocketIOModule } from 'nativescript-socketio/angular';
-import { isAndroid } from 'tns-core-modules/platform/platform';
+import { server } from './environment';
 import { TimeFromNow } from './timeFromNow.pipe';
 
 // Uncomment and add to NgModule imports if you need to use two-way binding
@@ -16,8 +16,6 @@ import { TimeFromNow } from './timeFromNow.pipe';
 // Uncomment and add to NgModule imports  if you need to use the HTTP wrapper
 // import { NativeScriptHttpModule } from "nativescript-angular/http";
 
-const server = isAndroid ? 'http://10.0.2.2:3001?test=123&platform=android' : 'http://localhost:3001?test=123&platform=ios';
-
 @NgModule({
     bootstrap: [
         AppComponent

demo-ng/app/environment.android.ts

@@ -0,0 +1 @@
+export const server = 'http://10.0.2.2:3001?test=123&platform=android';

demo-ng/app/environment.d.ts

@@ -0,0 +1 @@
+export const server: string;

demo-ng/app/environment.ios.ts

@@ -0,0 +1 @@
+export const server = 'http://localhost:3001?test=123&platform=ios';

demo-ng/app/main-page/main-page.component.html

@@ -2,7 +2,7 @@
 </ActionBar>
 
 <GridLayout columns="2*,*" rows="auto,auto, *" class="page">
-    <Button colSpan="2" width="50%" height="44" text="Log Out" (tap)="logout($event)" borderWidth="1"  borderRadius="8" borderColor="black" textAlignment="center" horizontalAlignment="center"></Button>
+    <Button colSpan="2" width="50%" height="44" text="Log Out" (tap)="logout()" borderWidth="1"  borderRadius="8" borderColor="black" textAlignment="center" horizontalAlignment="center"></Button>
     <TextField #messageEl hint="Enter text" row="1"></TextField>
     <Button col="1" text="Add" (tap)="sendText(messageEl.text)" row="1"></Button>
 

demo-ng/package.json

@@ -33,14 +33,14 @@
   },
   "devDependencies": {
     "@angular/compiler-cli": "~6.1.0",
-    "@ngtools/webpack": "~6.1.0",
+    "@ngtools/webpack": "~6.2.0-rc.0",
     "babel-traverse": "6.26.0",
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
     "lazy": "1.0.11",
     "nativescript-dev-sass": "^1.6.0",
     "nativescript-dev-typescript": "^0.5.0",
-    "nativescript-dev-webpack": "^0.15.1",
+    "nativescript-dev-webpack": "rc",
     "typescript": "~2.8.2",
     "tslint": "~5.4.3"
   },

demo-ng/tsconfig.json

@@ -30,7 +30,6 @@
         "node_modules",
         "../src/node_modules",
         "platforms",
-        "**/*.aot.ts",
         "**/*.spec.ts"
     ]
 }

demo-ng/tsconfig.tns.json

@@ -0,0 +1,7 @@
+{
+    "extends": "./tsconfig",
+    "compilerOptions": {
+        "module": "es2015",
+        "moduleResolution": "node"
+    }
+}

src/angular/index.ts

@@ -23,7 +23,7 @@ export type SocketIOOptions = Partial<IOOptions>;
 export const SOCKETIO_URL = new InjectionToken<string>('SOCKETIO_URL');
 export const SOCKETIO_OPTIONS = new InjectionToken<SocketIOOptions>('SOCKETIO_OPTIONS');
 
-function socketIOFactory(url: string, options: SocketIOOptions) {
+export function socketIOFactory(url: string, options: SocketIOOptions) {
     return new SocketIO(url, options);
 }