NativeScript · tbozhikov · Oct 23, 2019 · Oct 17, 2019 · Oct 17, 2019 · Oct 7, 2019
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ node_modules
 platforms
 hooks
 tags
+dist
 **/*.js.map
 **/*.metadata.json
 
@@ -14,6 +15,15 @@ tags
 !/nativescript-angular/gulpfile.js
 !/nativescript-angular/zone-js/dist/*.js
 
+/nativescript-angular-package/**/*.d.ts
+/nativescript-angular-package/**/*.js
+
+!/nativescript-angular-package/global.d.ts
+!/nativescript-angular-package/postinstall.js
+!/nativescript-angular-package/hooks/**/*.js
+!/nativescript-angular-package/gulpfile.js
+!/nativescript-angular-package/zone-js/dist/*.js
+
 .tscache
 .nvm
 .vscode
@@ -46,3 +56,4 @@ tsconfig.tns.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="8.20.0"></a>
+# [8.20.0](https://github.com/NativeScript/nativescript-angular/compare/8.2.2...8.20.0) (2019-10-23)
+
+### Features
+* add scoped package @nativescript/angular ([#2014](https://github.com/NativeScript/nativescript-angular/pull/2014))
+
+### Bug Fixes
+
+* **animations:** resolve issue with "query animations" on iOS 13 ([#2022](https://github.com/NativeScript/nativescript-angular/issues/2022)) ([c382682](https://github.com/NativeScript/nativescript-angular/commit/c382682))
+
 <a name="8.2.2"></a>
 ## [8.2.2](https://github.com/NativeScript/nativescript-angular/compare/8.2.1...8.2.2) (2019-10-16)
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -101,8 +101,9 @@ In this case the commits should be merge firstly from release in master branch a
 2. Execute `npm i` to install dependencies:
 ```
 cd nativescript-angular && npm i
+cd nativescript-angular-package && npm i
 ```
-3. Execute [`npm version`](https://docs.npmjs.com/cli/version) to bump the version:
+3. Execute [`npm version`](https://docs.npmjs.com/cli/version) to bump the version in both `nativescript-angular` and `nativescript-angular-package` folders:
 ```
 npm --no-git-tag-version version [patch|minor|major] -m "release: cut the %s release"
 ```

diff --git a/build/pack-scripts/pack-compat.ts b/build/pack-scripts/pack-compat.ts
@@ -0,0 +1,45 @@
+import * as path from "path";
+import * as fs from "fs-extra";
+import { execSync } from "child_process";
+
+// var myArgs = process.argv.slice(2);
+var scopedVersion = process.argv[2];
+console.log(`Packing nativescript-angular package with @nativescript/angular: ${scopedVersion}`);
+
+const distFolderPath = path.resolve("../../dist");
+const tempFolderPath = path.resolve("./temp-compat");
+const outFileName = "nativescript-angular-compat.tgz";
+
+const nsAngularPackagePath = path.resolve("../../nativescript-angular-package");
+const packageJsonPath = path.resolve(`${nsAngularPackagePath}/package.json`);
+console.log("Getting package.json from", packageJsonPath);
+
+let npmInstallParams = "";
+if (scopedVersion.indexOf(".tgz") > 0) {
+    // rewrite dependency in package.json
+    const packageJsonObject = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: "utf8" }));
+    packageJsonObject.dependencies["@nativescript/angular"] = scopedVersion;
+    fs.writeFileSync(packageJsonPath, JSON.stringify(packageJsonObject, null, 4));
+} else {
+    npmInstallParams = `@nativescript/angular@${scopedVersion}`;
+}
+
+execSync(`npm install --save-exact ${npmInstallParams}`, {
+    cwd: nsAngularPackagePath
+});
+
+// ensure empty temp and existing dist folders
+fs.emptyDirSync(tempFolderPath);
+fs.ensureDirSync(distFolderPath);
+
+// create .tgz in temp folder
+execSync(`npm pack ${nsAngularPackagePath}`, {
+    cwd: tempFolderPath
+});
+
+// assume we have a single file built in temp folder, take its name
+const currentFileName = fs.readdirSync(tempFolderPath)[0];
+
+// move built file and remove temp folder
+fs.moveSync(`${tempFolderPath}/${currentFileName}`, `${distFolderPath}/${outFileName}`, { overwrite: true });
+fs.removeSync(`${tempFolderPath}`);
diff --git a/build/pack-scripts/pack-scoped.ts b/build/pack-scripts/pack-scoped.ts
@@ -0,0 +1,31 @@
+import * as path from "path";
+import * as fs from "fs-extra";
+import { execSync } from "child_process";
+
+console.log(`Packing @nativescript/angular package`);
+
+const distFolderPath = path.resolve("../../dist");
+const tempFolderPath = path.resolve("./temp-scoped");
+const outFileName = "nativescript-angular-scoped.tgz";
+
+const nsAngularPackagePath = path.resolve("../../nativescript-angular");
+
+execSync(`npm install --save-exact`, {
+    cwd: nsAngularPackagePath
+});
+
+// ensure empty temp and dist folders
+fs.emptyDirSync(tempFolderPath);
+fs.ensureDirSync(distFolderPath);
+
+// create .tgz in temp folder
+execSync(`npm pack ${nsAngularPackagePath}`, {
+    cwd: tempFolderPath
+});
+
+// assume we have a single file built in temp folder, take its name
+const currentFileName = fs.readdirSync(tempFolderPath)[0];
+
+// move built file and remove temp folder
+fs.moveSync(`${tempFolderPath}/${currentFileName}`, `${distFolderPath}/${outFileName}`, { overwrite: true });
+fs.removeSync(`${tempFolderPath}`);
diff --git a/build/pack-scripts/package.json b/build/pack-scripts/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "build",
+  "version": "1.0.0",
+  "description": "",
+  "main": "prepublish-next.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "^12.7.12",
+    "fs-extra": "^8.1.0",
+    "rimraf": "^3.0.0",
+    "ts-node": "^8.4.1",
+    "typescript": "^3.6.4"
+  }
+}
diff --git a/build/pack-scripts/tsconfig.json b/build/pack-scripts/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "noEmitHelpers": true,
+        "noEmitOnError": true,
+        "lib": [
+            "es6",
+            "dom",
+            "es2015.iterable"
+        ],
+        "types": [
+            "node"
+        ],
+        "typeRoots": [ "./node_modules/@types" ]
+    },
+    "include": [
+        "./**/*.ts"
+    ],
+    "exclude": [
+        "node_modules"
+    ]
+}
diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json
@@ -21,7 +21,7 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "nativescript-angular": "file:../../nativescript-angular",
+    "nativescript-angular": "file:../../nativescript-angular-package",
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^6.4.0",

diff --git a/e2e/animation-examples/tsconfig.json b/e2e/animation-examples/tsconfig.json
@@ -15,18 +15,22 @@
         "paths": {
             "*": [
                 "./node_modules/tns-core-modules/*",
-                "./node_modules/*"
+                "./node_modules/*",
+                "./node_modules/nativescript-angular/node_modules/*"
             ],
             "~/*": [
                 "app/*"
             ]
         }
     },
     "include": [
+        "../../nativescript-angular-package",
         "../../nativescript-angular",
         "**/*"
     ],
     "exclude": [
+        "../../nativescript-angular-package/node_modules",
+        "../../nativescript-angular-package/**/*.d.ts",
         "../../nativescript-angular/node_modules",
         "../../nativescript-angular/**/*.d.ts",
         "node_modules",

diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json
@@ -21,7 +21,7 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "nativescript-angular": "file:../../nativescript-angular",
+    "nativescript-angular": "file:../../nativescript-angular-package",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^6.4.0",

diff --git a/e2e/modal-navigation-ng/tsconfig.json b/e2e/modal-navigation-ng/tsconfig.json
@@ -15,18 +15,22 @@
         "paths": {
             "*": [
                 "./node_modules/tns-core-modules/*",
-                "./node_modules/*"
+                "./node_modules/*",
+                "./node_modules/nativescript-angular/node_modules/*"
             ],
             "~/*": [
                 "app/*"
             ]
         }
     },
     "include": [
+        "../../nativescript-angular-package",
         "../../nativescript-angular",
         "**/*"
     ],
     "exclude": [
+        "../../nativescript-angular-package/node_modules",
+        "../../nativescript-angular-package/**/*.d.ts",
         "../../nativescript-angular/node_modules",
         "../../nativescript-angular/**/*.d.ts",
         "node_modules",

diff --git a/e2e/nested-router-tab-view/app/app.module.ts b/e2e/nested-router-tab-view/app/app.module.ts
@@ -13,7 +13,7 @@ import { routerTraceCategory } from "nativescript-angular/trace";
 // addCategories(routerTraceCategory);
 traceEnable();
 
-class MyErrorHandler implements ErrorHandler {
+export class MyErrorHandler implements ErrorHandler {
     handleError(error) {
         console.log("### ErrorHandler Error: " + error.toString());
         console.log("### ErrorHandler Stack: " + error.stack);

diff --git a/e2e/nested-router-tab-view/app/modal-second/modal-second.component.html b/e2e/nested-router-tab-view/app/modal-second/modal-second.component.html
@@ -3,7 +3,7 @@
     <Label class="action-bar-title" text="Modal Second"></Label>
 </ActionBar>
 
-<GridLayout #rootLayout rows="auto, auto" (loaded)="onLoaded($event)">
+<GridLayout #rootLayout rows="auto, auto" (loaded)="onLoaded()">
     <Button text="Go Back(activatedRoute)" (tap)="goBack()"></Button>
     <Button row="1" text="Close Modal" (tap)="close(rootLayout)"></Button>
 </GridLayout>
diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "nativescript-angular": "file:../../nativescript-angular",
+    "nativescript-angular": "file:../../nativescript-angular-package",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^6.4.0",

diff --git a/e2e/nested-router-tab-view/tsconfig.json b/e2e/nested-router-tab-view/tsconfig.json
@@ -15,18 +15,22 @@
         "paths": {
             "*": [
                 "./node_modules/tns-core-modules/*",
-                "./node_modules/*"
+                "./node_modules/*",
+                "./node_modules/nativescript-angular/node_modules/*"
             ],
             "~/*": [
                 "app/*"
             ]
         }
     },
     "include": [
+        "../../nativescript-angular-package",
         "../../nativescript-angular",
         "**/*"
     ],
     "exclude": [
+        "../../nativescript-angular-package/node_modules",
+        "../../nativescript-angular-package/**/*.d.ts",
         "../../nativescript-angular/node_modules",
         "../../nativescript-angular/**/*.d.ts",
         "node_modules",

diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "nativescript-angular": "file:../../nativescript-angular",
+    "nativescript-angular": "file:../../nativescript-angular-package",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^6.4.0",

diff --git a/e2e/renderer/tsconfig.json b/e2e/renderer/tsconfig.json
@@ -15,18 +15,22 @@
         "paths": {
             "*": [
                 "./node_modules/tns-core-modules/*",
-                "./node_modules/*"
+                "./node_modules/*",
+                "./node_modules/nativescript-angular/node_modules/*"
             ],
             "~/*": [
                 "app/*"
             ]
         }
     },
     "include": [
+        "../../nativescript-angular-package",
         "../../nativescript-angular",
         "**/*"
     ],
     "exclude": [
+        "../../nativescript-angular-package/node_modules",
+        "../../nativescript-angular-package/**/*.d.ts",
         "../../nativescript-angular/node_modules",
         "../../nativescript-angular/**/*.d.ts",
         "node_modules",

diff --git a/e2e/routable-animations/package.json b/e2e/routable-animations/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "nativescript-angular": "next",
+    "nativescript-angular": "file:../../nativescript-angular-package",
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^6.4.0",

diff --git a/e2e/routable-animations/tsconfig.json b/e2e/routable-animations/tsconfig.json
@@ -15,18 +15,22 @@
         "paths": {
             "*": [
                 "./node_modules/tns-core-modules/*",
-                "./node_modules/*"
+                "./node_modules/*",
+                "./node_modules/nativescript-angular/node_modules/*"
             ],
             "~/*": [
                 "app/*"
             ]
         }
     },
     "include": [
+        "../../nativescript-angular-package",
         "../../nativescript-angular",
         "**/*"
     ],
     "exclude": [
+        "../../nativescript-angular-package/node_modules",
+        "../../nativescript-angular-package/**/*.d.ts",
         "../../nativescript-angular/node_modules",
         "../../nativescript-angular/**/*.d.ts",
         "node_modules",

diff --git a/e2e/router-tab-view/app/app.component.ts b/e2e/router-tab-view/app/app.component.ts
@@ -1,9 +1,8 @@
-import { Component, OnInit, AfterViewInit, AfterContentInit, ViewChild } from "@angular/core";
+import { Component, ViewChild } from "@angular/core";
 import { TabViewDirective } from "nativescript-angular/directives";
 import { Router, NavigationEnd } from "@angular/router";
 import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
 
-
 @Component({
     selector: "ns-app",
     templateUrl: "app.component.html",

diff --git a/e2e/router-tab-view/app/app.module.ts b/e2e/router-tab-view/app/app.module.ts
@@ -5,13 +5,12 @@ import { AppComponent } from "./app.component";
 
 import { DataService } from "./data.service";
 
-import { enable as traceEnable, addCategories } from "tns-core-modules/trace";
-import { routerTraceCategory } from "nativescript-angular/trace";
+import { enable as traceEnable } from "tns-core-modules/trace";
 
 // addCategories(routerTraceCategory);
 traceEnable();
 
-class MyErrorHandler implements ErrorHandler {
+export class MyErrorHandler implements ErrorHandler {
     handleError(error) {
         console.log("### ErrorHandler Error: " + error.toString());
         console.log("### ErrorHandler Stack: " + error.stack);

diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "nativescript-angular": "file:../../nativescript-angular",
+    "nativescript-angular": "file:../../nativescript-angular-package",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^6.4.0",