Merge branch 'master' of https://github.com/worktile/ngx-micro-frontend

Author: why520crazy

README.md

@@ -1,11 +1,11 @@
-# ngx-planet [![CircleCI](https://circleci.com/gh/worktile/ngx-planet.svg?style=svg)](https://circleci.com/gh/worktile/ngx-planet)
+# ngx-planet [![CircleCI](https://circleci.com/gh/worktile/ngx-planet.svg?style=shield)](https://circleci.com/gh/worktile/ngx-planet) [![npm (scoped)](https://img.shields.io/npm/v/@worktile/planet?style=plastic)](https://www.npmjs.com/package/@worktile/planet) [![npm](https://img.shields.io/npm/dm/@worktile/planet)](https://www.npmjs.com/package/@worktile/planet)
 
 An Angular 7+ Micro Frontend library.
 
 ## Installation
 
 ```
-npm i @worktile/planet --save
+npm i @worktile/ngx-planet --save
 ```
 
 ## Demo
@@ -95,11 +95,7 @@ export class AppComponent implements OnInit {
             }
         ]);
 
-        this.router.events.subscribe((event: RouterEvent) => {
-            if (event instanceof NavigationEnd) {
-                this.planet.resetRouting(event);
-            }
-        });
+        this.planet.start();
 
         this.globalEventDispatcher.register('openADetail').subscribe(event => {
             // open a Detail
@@ -132,13 +128,14 @@ defineApplication('app1', (portalApp: PlanetPortalApplication) => {
 ## Development
 
 ```
+npm start open http://localhost:3000
+
+or
+
 npm run serve:portal // 3000
 npm run serve:app1 // 3001
 npm run serve:app2 // 3002
 
-or
-
-npm start
+// test
+npm run test
 ```
-
-open http://localhost:3000

packages/planet/src/application/planet-application.service.ts

@@ -6,19 +6,13 @@ import { coerceArray, getScriptsAndStylesFullPaths } from '../helpers';
 import { Observable, of } from 'rxjs';
 import { AssetsLoadResult, AssetsLoader } from '../assets-loader';
 
-interface InternalPlanetApplication extends PlanetApplication {
-    loaded?: boolean;
-}
-
 @Injectable({
     providedIn: 'root'
 })
 export class PlanetApplicationService {
-    private apps: InternalPlanetApplication[] = [];
+    private apps: PlanetApplication[] = [];
 
-    private appsMap: { [key: string]: InternalPlanetApplication } = {};
-
-    private currentApps: InternalPlanetApplication[] = [];
+    private appsMap: { [key: string]: PlanetApplication } = {};
 
     constructor(private http: HttpClient, private assetsLoader: AssetsLoader) {}
 
@@ -85,21 +79,4 @@ export class PlanetApplicationService {
     getApps() {
         return this.apps;
     }
-
-    loadApp(app: InternalPlanetApplication): Observable<[AssetsLoadResult[], AssetsLoadResult[]]> {
-        if (app.loaded) {
-            return of(null);
-        }
-        if (app.manifest) {
-            return this.assetsLoader.loadManifest(`${app.manifest}?t=${new Date().getTime()}`).pipe(
-                switchMap(manifestResult => {
-                    const { scripts, styles } = getScriptsAndStylesFullPaths(app, manifestResult);
-                    return this.assetsLoader.loadScriptsAndStyles(scripts, styles, app.loadSerial);
-                })
-            );
-        } else {
-            const { scripts, styles } = getScriptsAndStylesFullPaths(app);
-            return this.assetsLoader.loadScriptsAndStyles(scripts, styles, app.loadSerial);
-        }
-    }
 }