Skip to content
This repository has been archived by the owner on Feb 28, 2022. It is now read-only.

update to use latest dependencies #1

Closed
wants to merge 1 commit into from
Closed

update to use latest dependencies #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 24 additions & 19 deletions lib/index.ts
View file
Open in desktop
@@ -1,22 +1,23 @@
import { Store } from '@ngrx/store';
import { ComponentRef } from 'angular2/core';

import { ComponentRef } from '@angular/core';
import 'rxjs/add/operator/take';

export function hotModuleReplacement(
bootloader: (state?: any) => Promise<ComponentRef>,
bootloader: (state?: any) => Promise<ComponentRef<any>>,
/* tslint:disable:no-reserved-keywords */
module: any
) {
let COMPONENT_REF: ComponentRef;
let DATA = !!module.hot.data ?
module.hot.data.state :
undefined;
/* tslint:disable:no-reserved-keywords */
): any {
let disposed: boolean = false;
let COMPONENT_REF: ComponentRef<any>;
let DATA = !!module.hot.data ? module.hot.data.state : undefined;

console.log('APP STATE', DATA);

console.time('bootstrap');

if (document.readyState === 'complete') {
bootloader(DATA)
.then((cmpRef: ComponentRef) => COMPONENT_REF = cmpRef)
.then((cmpRef: ComponentRef<any>) => COMPONENT_REF = cmpRef)
.then((cmpRef => (console.timeEnd('bootstrap'), cmpRef)));
} else {
document.addEventListener('DOMContentLoaded', () => {
Expand All @@ -26,14 +27,17 @@ export function hotModuleReplacement(
});
}

function saveState(appState: Store<any>) {
return appState.getState();
function saveState(appState: Store<any>): any {
let state: any;
appState.take(1).subscribe(s => state = s);
return state;
}

function beforeunload(event) {
function beforeunload(event: any): any {
const appState: Store<any> = COMPONENT_REF.injector.get(Store);
return saveState(appState);
}

(<any>window).WEBPACK_HMR_beforeunload = () => {
window.removeEventListener('beforeunload', beforeunload);
};
Expand All @@ -42,7 +46,7 @@ export function hotModuleReplacement(

window.addEventListener('beforeunload', beforeunload);

module.hot.dispose(data => {
module.hot.dispose((data: any) => {
console.time('dispose');
const componentNode = COMPONENT_REF.location.nativeElement;
const newNode = document.createElement(componentNode.tagName);
Expand All @@ -55,13 +59,14 @@ export function hotModuleReplacement(
const appState: Store<any> = COMPONENT_REF.injector.get(Store);
const state = saveState(appState);

(<any>Object).assign(data, { state });

COMPONENT_REF.dispose();

(<any>Object).assign(data, { state });
COMPONENT_REF.destroy();
newNode.style.display = currentDisplay;

window.removeEventListener('beforeunload', beforeunload);
if (!disposed) {
window.removeEventListener('beforeunload', beforeunload);
}
disposed = true;
console.timeEnd('dispose');
});
}
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Expand Up @@ -13,9 +13,10 @@
"author": "Mike Ryan",
"license": "MIT",
"peerDependencies": {
"@ngrx/store": "^1.3.0",
"angular2": "^2.0.0-beta.8",
"rxjs": "^5.0.0-beta.2"
"@angular/core": "2.0.0-rc.2",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd use ^ here. Getting UNMET PEER DEPENDENCY on rc.4

"@ngrx/core": "^1.0.0",
"@ngrx/store": "^2.0.0",
"rxjs": "5.0.0-beta.6"
},
"devDependencies": {
"typescript": "^1.8.9"
Expand Down