Merge branch 'master' into djenkov/public-livesync

ADjenkov · web-flow · commit 51aba237f78e · 2018-06-22T09:53:42.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -29,9 +29,7 @@ ng-sample/app/**/*.js
 
 # Webpack configuration files
 webpack.config.js
-vendor.ts
-vendor-platform.android.ts
-vendor-platform.ios.ts
+tsconfig.esm.json
 
 # IDEs and editors
 /.idea
diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json
@@ -4,31 +4,26 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.renderer",
-    "tns-android": {
-      "version": "4.1.0-2018.4.13.1"
-    }
+    "id": "org.nativescript.renderer"
   },
   "dependencies": {
-    "@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/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",
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-intl": "^3.0.0",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~6.0.0-rc.1",
+    "rxjs": "~6.1.0",
     "tns-core-modules": "next",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular-devkit/core": "~0.5.5",
-    "@angular/compiler-cli": "~6.0.0-rc.3",
-    "@ngtools/webpack": "~6.0.0-rc.3",
+    "@angular/compiler-cli": "~6.1.0-beta.1",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",
@@ -37,29 +32,17 @@
     "babylon": "6.17.4",
     "chai": "~4.1.1",
     "chai-as-promised": "~7.1.1",
-    "clean-webpack-plugin": "~0.1.19",
     "colors": "^1.1.2",
-    "copy-webpack-plugin": "~4.5.1",
-    "css-loader": "~0.28.7",
-    "extract-text-webpack-plugin": "~3.0.2",
     "lazy": "1.0.11",
     "mocha": "~3.5.0",
     "mocha-junit-reporter": "^1.13.0",
     "mocha-multi": "^0.11.0",
     "nativescript-dev-appium": "next",
     "nativescript-dev-typescript": "~0.7.1",
     "nativescript-dev-webpack": "next",
-    "nativescript-worker-loader": "~0.8.1",
-    "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.3.0",
     "tslib": "^1.7.1",
     "typescript": "~2.7.2",
-    "uglifyjs-webpack-plugin": "~1.2.4",
-    "webpack": "~4.5.0",
-    "webpack-bundle-analyzer": "^2.9.1",
-    "clean-webpack-plugin": "~0.1.19",
-    "webpack-cli": "~2.0.14",
-    "webpack-sources": "~1.1.0"
+    "@angular-devkit/build-angular": "~0.7.0-rc.0"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
diff --git a/e2e/renderer/tsconfig.json b/e2e/renderer/tsconfig.json
@@ -16,6 +16,9 @@
             "*": [
                 "./node_modules/tns-core-modules/*",
                 "./node_modules/*"
+            ],
+            "~/*": [
+                "app/*"
             ]
         }
     },
@@ -24,4 +27,4 @@
         "platforms",
         "e2e"
     ]
-}
+}
diff --git a/e2e/router/package.json b/e2e/router/package.json
@@ -4,35 +4,28 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.router",
-    "tns-android": {
-      "version": "next"
-    },
-    "tns-ios": {
-      "version": "next"
-    }
+    "id": "org.nativescript.router"
   },
   "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.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",
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-intl": "^3.0.0",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~6.0.0-rc.1",
+    "rxjs": "~6.1.0",
     "tns-core-modules": "next",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/core": "~0.5.5",
-    "@angular/compiler-cli": "~6.0.0-rc.3",
-    "@ngtools/webpack": "~6.0.0-rc.3",
+    "@angular-devkit/build-angular": "~0.7.0-rc.0",
+    "@angular/compiler-cli": "~6.1.0-beta.1",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",
@@ -41,30 +34,16 @@
     "babylon": "6.17.4",
     "chai": "~4.1.1",
     "chai-as-promised": "~7.1.1",
-    "clean-webpack-plugin": "~0.1.19",
     "colors": "^1.1.2",
-    "copy-webpack-plugin": "~4.5.1",
-    "css-loader": "~0.28.7",
-    "extract-text-webpack-plugin": "~3.0.2",
     "lazy": "1.0.11",
     "mocha": "~3.5.0",
     "mocha-junit-reporter": "^1.13.0",
     "mocha-multi": "^0.11.0",
     "nativescript-dev-appium": "next",
     "nativescript-dev-typescript": "~0.4.0",
     "nativescript-dev-webpack": "next",
-    "nativescript-worker-loader": "~0.8.1",
-    "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.3.0",
     "tslib": "^1.7.1",
-    "typescript": "~2.7.2",
-    "uglifyjs-webpack-plugin": "~1.2.4",
-    "webpack": "~4.5.0",
-    "webpack-bundle-analyzer": "^2.9.1",
-    "webpack-sources": "~1.1.0",
-    "webpack-cli": "~2.0.14",
-    "webpack-sources": "~1.1.0",
-    "clean-webpack-plugin": "~0.1.19"
+    "typescript": "~2.7.2"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
diff --git a/nativescript-angular/animations/animations.module.ts b/nativescript-angular/animations/animations.module.ts
@@ -1,5 +1,14 @@
-import { NgModule, Injectable, NgZone, Provider, RendererFactory2, Optional, SkipSelf } from "@angular/core";
-
+import {
+    NgModule,
+    Injectable,
+    Inject,
+    NgZone,
+    Provider,
+    RendererFactory2,
+    Optional,
+    SkipSelf,
+} from "@angular/core";
+import { DOCUMENT } from "@angular/common";
 import { AnimationBuilder } from "@angular/animations";
 
 import {
@@ -21,8 +30,8 @@ import { throwIfAlreadyLoaded } from "../common/utils";
 
 @Injectable()
 export class InjectableAnimationEngine extends AnimationEngine {
-    constructor(driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
-        super(driver, normalizer);
+    constructor(@Inject(DOCUMENT) doc: any, driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
+        super(doc.body, driver, normalizer);
     }
 }
 
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
@@ -43,30 +43,30 @@
     "reflect-metadata": "^0.1.8"
   },
   "peerDependencies": {
-    "@angular/platform-browser-dynamic": "~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/router": "~6.0.0",
+    "@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",
     "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.0",
-    "@angular/common": "~6.0.0",
-    "@angular/compiler": "~6.0.0",
-    "@angular/compiler-cli": "~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.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",
     "codelyzer": "^4.3.0",
     "rxjs": "~6.1.0",
     "tns-core-modules": "next",

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`	`"*": [`
`17`	`17`	`"./node_modules/tns-core-modules/*",`
`18`	`18`	`"./node_modules/*"`
	`19`	`+ ],`
	`20`	`+ "~/*": [`
	`21`	`+ "app/*"`
`19`	`22`	`]`
`20`	`23`	`}`
`21`	`24`	`},`
`@@ -24,4 +27,4 @@`
`24`	`27`	`"platforms",`
`25`	`28`	`"e2e"`
`26`	`29`	`]`
`27`		`-}`
	`30`	`+}`