From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/main.ts | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main.ts b/src/main.ts
index 91ec6da..eac1183 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,12 +1,36 @@
-import { enableProdMode } from '@angular/core';
+import { enableProdMode, ViewEncapsulation } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
+import { hmrBootstrap } from './hmr';
+
+import { preloaderFinished } from '@delon/theme';
+preloaderFinished();
+
if (environment.production) {
enableProdMode();
}
-platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.log(err));
+const bootstrap = () => {
+ return platformBrowserDynamic().bootstrapModule(AppModule, {
+ defaultEncapsulation: ViewEncapsulation.Emulated,
+ preserveWhitespaces: false
+ });
+};
+
+if (environment.hmr) {
+ if (module['hot']) {
+ hmrBootstrap(module, bootstrap);
+ } else {
+ console.error('HMR is not enabled for webpack-dev-server!');
+ console.log('Are you using the --hmr flag for ng serve?');
+ }
+} else {
+ bootstrap().then(() => {
+ if ((<any>window).appBootstrap) {
+ (<any>window).appBootstrap();
+ }
+ });
+}
--
Gitblit v1.8.0