diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index ae4c3ffbb..a5928b3de 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~6.0.0", - "@angular/common": "~6.0.0", - "@angular/compiler": "~6.0.0", - "@angular/core": "~6.0.0", - "@angular/forms": "~6.0.0", - "@angular/http": "~6.0.0", - "@angular/platform-browser": "~6.0.0", - "@angular/platform-browser-dynamic": "~6.0.0", - "@angular/router": "~6.0.0", + "@angular/animations": "~6.1.0-beta.3", + "@angular/common": "~6.1.0-beta.3", + "@angular/compiler": "~6.1.0-beta.3", + "@angular/core": "~6.1.0-beta.3", + "@angular/forms": "~6.1.0-beta.3", + "@angular/http": "~6.1.0-beta.3", + "@angular/platform-browser": "~6.1.0-beta.3", + "@angular/platform-browser-dynamic": "~6.1.0-beta.3", + "@angular/router": "~6.1.0-beta.3", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", @@ -31,7 +31,7 @@ }, "devDependencies": { "@angular-devkit/core": "~0.7.0-beta.1", - "@angular/compiler-cli": "~6.0.0", + "@angular/compiler-cli": "~6.1.0-beta.3", "@ngtools/webpack": "~6.1.0-beta.1", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index 387be6a3b..c88ab01e4 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -7,14 +7,14 @@ "id": "org.nativescript.renderer" }, "dependencies": { - "@angular/common": "~6.0.6", - "@angular/compiler": "~6.0.6", - "@angular/core": "~6.0.6", - "@angular/forms": "~6.0.6", - "@angular/http": "~6.0.6", - "@angular/platform-browser": "~6.0.6", - "@angular/platform-browser-dynamic": "~6.0.6", - "@angular/router": "~6.0.6", + "@angular/common": "~6.1.0-beta.3", + "@angular/compiler": "~6.1.0-beta.3", + "@angular/core": "~6.1.0-beta.3", + "@angular/forms": "~6.1.0-beta.3", + "@angular/http": "~6.1.0-beta.3", + "@angular/platform-browser": "~6.1.0-beta.3", + "@angular/platform-browser-dynamic": "~6.1.0-beta.3", + "@angular/router": "~6.1.0-beta.3", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index 83bad1742..28e98d89c 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~6.0.0-rc.3", - "@angular/common": "~6.0.0-rc.3", - "@angular/compiler": "~6.0.0-rc.3", - "@angular/core": "~6.0.0-rc.3", - "@angular/forms": "~6.0.0-rc.3", - "@angular/http": "~6.0.0-rc.3", - "@angular/platform-browser": "~6.0.0-rc.3", - "@angular/platform-browser-dynamic": "~6.0.0-rc.3", - "@angular/router": "~6.0.0-rc.3", + "@angular/animations": "~6.1.0-beta.3", + "@angular/common": "~6.1.0-beta.3", + "@angular/compiler": "~6.1.0-beta.3", + "@angular/core": "~6.1.0-beta.3", + "@angular/forms": "~6.1.0-beta.3", + "@angular/http": "~6.1.0-beta.3", + "@angular/platform-browser": "~6.1.0-beta.3", + "@angular/platform-browser-dynamic": "~6.1.0-beta.3", + "@angular/router": "~6.1.0-beta.3", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", diff --git a/e2e/router/package.json b/e2e/router/package.json index 88e436722..ce41b6f37 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -7,15 +7,15 @@ "id": "org.nativescript.router" }, "dependencies": { - "@angular/animations": "~6.0.6", - "@angular/common": "~6.0.6", - "@angular/compiler": "~6.0.6", - "@angular/core": "~6.0.6", - "@angular/forms": "~6.0.6", - "@angular/http": "~6.0.6", - "@angular/platform-browser": "~6.0.6", - "@angular/platform-browser-dynamic": "~6.0.6", - "@angular/router": "~6.0.6", + "@angular/animations": "~6.1.0-beta.3", + "@angular/common": "~6.1.0-beta.3", + "@angular/compiler": "~6.1.0-beta.3", + "@angular/core": "~6.1.0-beta.3", + "@angular/forms": "~6.1.0-beta.3", + "@angular/http": "~6.1.0-beta.3", + "@angular/platform-browser": "~6.1.0-beta.3", + "@angular/platform-browser-dynamic": "~6.1.0-beta.3", + "@angular/router": "~6.1.0-beta.3", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json index 6eaad8d05..9170b6728 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~6.0.0-rc.3", - "@angular/common": "~6.0.0-rc.3", - "@angular/compiler": "~6.0.0-rc.3", - "@angular/core": "~6.0.0-rc.3", - "@angular/forms": "~6.0.0-rc.3", - "@angular/http": "~6.0.0-rc.3", - "@angular/platform-browser": "~6.0.0-rc.3", - "@angular/platform-browser-dynamic": "~6.0.0-rc.3", - "@angular/router": "~6.0.0-rc.3", + "@angular/animations": "~6.1.0-beta.3", + "@angular/common": "~6.1.0-beta.3", + "@angular/compiler": "~6.1.0-beta.3", + "@angular/core": "~6.1.0-beta.3", + "@angular/forms": "~6.1.0-beta.3", + "@angular/http": "~6.1.0-beta.3", + "@angular/platform-browser": "~6.1.0-beta.3", + "@angular/platform-browser-dynamic": "~6.1.0-beta.3", + "@angular/router": "~6.1.0-beta.3", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -30,7 +30,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~6.0.0-rc.3", + "@angular/compiler-cli": "~6.1.0-beta.3", "@ngtools/webpack": "~1.9.4", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", diff --git a/nativescript-angular/nativescript.module.ts b/nativescript-angular/nativescript.module.ts index 311c82227..2d64b8f42 100644 --- a/nativescript-angular/nativescript.module.ts +++ b/nativescript-angular/nativescript.module.ts @@ -18,6 +18,11 @@ import { SkipSelf, } from "@angular/core"; +import { + ViewportScroller, + ɵNullViewportScroller as NullViewportScroller, +} from "@angular/common"; + import { NativeScriptCommonModule } from "./common"; import { NativeScriptRendererFactory } from "./renderer"; import { DetachedLoader } from "./common/detached-loader"; @@ -36,6 +41,7 @@ export function errorHandlerFactory() { SystemJsNgModuleLoader, { provide: ErrorHandler, useFactory: errorHandlerFactory }, { provide: RendererFactory2, useExisting: NativeScriptRendererFactory }, + { provide: ViewportScroller, useClass: NullViewportScroller }, ], entryComponents: [ DetachedLoader, diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index f71b39bb8..a755ad58c 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-angular", - "version": "6.0.6", + "version": "6.1.0-beta.3", "description": "An Angular renderer that lets you build mobile apps with NativeScript.", "homepage": "https://www.nativescript.org/", "bugs": "https://github.com/NativeScript/nativescript-angular/issues", @@ -43,30 +43,30 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/platform-browser-dynamic": "~6.0.6", - "@angular/common": "~6.0.6", - "@angular/compiler": "~6.0.6", - "@angular/core": "~6.0.6", - "@angular/forms": "~6.0.6", - "@angular/http": "~6.0.6", - "@angular/platform-browser": "~6.0.6", - "@angular/router": "~6.0.6", + "@angular/platform-browser-dynamic": "~6.1.0-beta.3", + "@angular/common": "~6.1.0-beta.3", + "@angular/compiler": "~6.1.0-beta.3", + "@angular/core": "~6.1.0-beta.3", + "@angular/forms": "~6.1.0-beta.3", + "@angular/http": "~6.1.0-beta.3", + "@angular/platform-browser": "~6.1.0-beta.3", + "@angular/router": "~6.1.0-beta.3", "rxjs": "~6.0.0 || >=6.1.0", "tns-core-modules": "^4.0.0 || >4.0.0- || >4.1.0-", "zone.js": "^0.8.26", "typescript": "~2.7.2" }, "devDependencies": { - "@angular/animations": "~6.0.6", - "@angular/common": "~6.0.6", - "@angular/compiler": "~6.0.6", - "@angular/compiler-cli": "~6.0.6", - "@angular/core": "~6.0.6", - "@angular/forms": "~6.0.6", - "@angular/http": "~6.0.6", - "@angular/platform-browser": "~6.0.6", - "@angular/platform-browser-dynamic": "~6.0.6", - "@angular/router": "~6.0.6", + "@angular/animations": "~6.1.0-beta.3", + "@angular/common": "~6.1.0-beta.3", + "@angular/compiler": "~6.1.0-beta.3", + "@angular/compiler-cli": "~6.1.0-beta.3", + "@angular/core": "~6.1.0-beta.3", + "@angular/forms": "~6.1.0-beta.3", + "@angular/http": "~6.1.0-beta.3", + "@angular/platform-browser": "~6.1.0-beta.3", + "@angular/platform-browser-dynamic": "~6.1.0-beta.3", + "@angular/router": "~6.1.0-beta.3", "codelyzer": "^4.3.0", "rxjs": "~6.1.0", "tns-core-modules": "next", diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts index 9aa9d0eaf..b74fcf983 100644 --- a/nativescript-angular/platform-common.ts +++ b/nativescript-angular/platform-common.ts @@ -66,17 +66,12 @@ export class NativeScriptSanitizer extends Sanitizer { } } -// Add a fake polyfill for the document object -(global).document = (global).document || { - getElementById: () => { return undefined; } -}; - -const doc = (global).document; -doc.body = Object.assign(doc.body || {}, { - isOverride: true, -}); - export class NativeScriptDocument { + // Required by the AnimationDriver + public body: any = { + isOverride: true, + }; + createElement(tag: string) { throw new Error("NativeScriptDocument is not DOM Document. There is no createElement() method."); } @@ -85,7 +80,7 @@ export class NativeScriptDocument { export const COMMON_PROVIDERS = [ defaultPageFactoryProvider, { provide: Sanitizer, useClass: NativeScriptSanitizer, deps: [] }, - { provide: DOCUMENT, useValue: doc }, + { provide: DOCUMENT, useClass: NativeScriptDocument, deps: [] }, ]; export class NativeScriptPlatformRef extends PlatformRef { diff --git a/nativescript-angular/platform.ts b/nativescript-angular/platform.ts index eb9666917..207cfc49e 100644 --- a/nativescript-angular/platform.ts +++ b/nativescript-angular/platform.ts @@ -17,10 +17,6 @@ import { ɵplatformCoreDynamic as platformCoreDynamic } from "@angular/platform-browser-dynamic"; -import { - ɵINTERNAL_BROWSER_PLATFORM_PROVIDERS as INTERNAL_BROWSER_PLATFORM_PROVIDERS -} from "@angular/platform-browser"; - import { COMPILER_OPTIONS, PlatformRef, @@ -47,7 +43,6 @@ import { NativeScriptElementSchemaRegistry } from "./schema-registry"; import { FileSystemResourceLoader } from "./resource-loader"; export const NS_COMPILER_PROVIDERS: StaticProvider[] = [ - INTERNAL_BROWSER_PLATFORM_PROVIDERS, { provide: COMPILER_OPTIONS, useValue: { diff --git a/tests/package.json b/tests/package.json index cab801bde..30973dd1b 100644 --- a/tests/package.json +++ b/tests/package.json @@ -26,15 +26,15 @@ ], "homepage": "http://nativescript.org", "dependencies": { - "@angular/animations": "~6.0.0-rc.3", - "@angular/common": "~6.0.0-rc.3", - "@angular/compiler": "~6.0.0-rc.3", - "@angular/core": "~6.0.0-rc.3", - "@angular/forms": "~6.0.0-rc.3", - "@angular/http": "~6.0.0-rc.3", - "@angular/platform-browser": "~6.0.0-rc.3", - "@angular/platform-browser-dynamic": "~6.0.0-rc.3", - "@angular/router": "~6.0.0-rc.3", + "@angular/animations": "~6.1.0-beta.3", + "@angular/common": "~6.1.0-beta.3", + "@angular/compiler": "~6.1.0-beta.3", + "@angular/core": "~6.1.0-beta.3", + "@angular/forms": "~6.1.0-beta.3", + "@angular/http": "~6.1.0-beta.3", + "@angular/platform-browser": "~6.1.0-beta.3", + "@angular/platform-browser-dynamic": "~6.1.0-beta.3", + "@angular/router": "~6.1.0-beta.3", "nativescript-angular": "../nativescript-angular", "nativescript-unit-test-runner": "^0.3.4", "rxjs": "~6.0.0-rc.1",