Merge remote-tracking branch 'origin/dev' into dev

.gitignore

@@ -32,3 +32,4 @@ messages.xlf
 messages.xlf.bak
 locale/*.xlf.bak
 /.vscode/
+/main.js

.idea/vcs.xml

- vs<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />

main.js

-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const platform_browser_dynamic_1 = require("@angular/platform-browser-dynamic");
-const app_module_1 = require("./app/app.module");
-platform_browser_dynamic_1.platformBrowserDynamic().bootstrapModule(app_module_1.AppModule);
-//# sourceMappingURL=main.js.map
\ No newline at end of file

main.ts

 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { AppModule } from './app/app.module';
+import { AppModule } from 'app/app.module';
 
 platformBrowserDynamic().bootstrapModule(AppModule);

tsconfig.json

@@ -13,6 +13,7 @@
     "noImplicitAny": false,
     "suppressImplicitAnyIndexErrors": true,
     "strictNullChecks": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "baseUrl": "."
   }
 }