chore: cleanup

NathanWalker · NathanWalker · commit cedae2fb5041 · 2020-07-17T19:02:32.000-07:00
diff --git a/e2e/animation-examples/app/app.module.ts b/e2e/animation-examples/app/app.module.ts
@@ -52,13 +52,13 @@ export function asyncBoot(): Function {
     /**
      * Uncomment to test APP_INITIALIZER 
      */
-    // providers: [
-    //   {
-    //     provide: APP_INITIALIZER,
-    //     useFactory: asyncBoot,
-    //     multi: true
-    //   },
-    // ],
+    providers: [
+      {
+        provide: APP_INITIALIZER,
+        useFactory: asyncBoot,
+        multi: true
+      },
+    ],
     schemas: [NO_ERRORS_SCHEMA],
 })
 export class AppModule {}
diff --git a/e2e/animation-examples/app/main.ts b/e2e/animation-examples/app/main.ts
@@ -1,4 +1,4 @@
-import { platformNativeScript, NativeScriptDebug } from "@nativescript/angular";
+import { platformNativeScriptDynamic, NativeScriptDebug } from "@nativescript/angular";
 import { Trace, GridLayout, GridUnitType, ItemSpec, VerticalAlignment } from "@nativescript/core";
 
 import { AppModule } from "./app.module";
@@ -87,7 +87,7 @@ class LaunchAnimation extends GridLayout {
   }
 }
 
-platformNativeScript({
+platformNativeScriptDynamic({
   launchView: new LaunchAnimation(),
   // backgroundColor: 'purple'
 }).bootstrapModule(AppModule);
diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json
@@ -6,7 +6,7 @@
   "nativescript": {
     "id": "org.nativescript.ng4animations",
     "tns-ios": {
-      "version": "6.5.1"
+      "version": "6.5.2"
     },
     "tns-android": {
       "version": "latest"
@@ -25,7 +25,7 @@
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
     "rxjs": "~6.5.5",
-    "@nativescript/core": "~7.0.0-rc.12",
+    "@nativescript/core": "rc",
     "zone.js": "^0.10.3"
   },
   "devDependencies": {
@@ -43,7 +43,7 @@
     "mochawesome": "~6.1.1",
     "node-sass": "~4.14.1",
     "nativescript-css-loader": "~0.26.0",
-    "@nativescript/webpack": "~2.0.0-alpha.3",
+    "@nativescript/webpack": "rc",
     "typescript": "~3.9.0"
   },
   "scripts": {
diff --git a/e2e/tests-app-ng/app/main.ts b/e2e/tests-app-ng/app/main.ts
@@ -1,8 +1,8 @@
-import { platformNativeScript } from "@nativescript/angular";
+import { platformNativeScriptDynamic } from "@nativescript/angular";
 
 import { AppModule } from "./app.module";
 import { Trace } from "@nativescript/core";
 
 Trace.enable();
 
-platformNativeScript().bootstrapModule(AppModule);
+platformNativeScriptDynamic().bootstrapModule(AppModule);
diff --git a/e2e/tests-app-ng/package.json b/e2e/tests-app-ng/package.json
@@ -6,7 +6,7 @@
   "nativescript": {
     "id": "org.nativescript.testsappng",
     "tns-ios": {
-      "version": "6.5.0"
+      "version": "6.5.2"
     },
     "tns-android": {
       "version": "6.5.0"
@@ -25,7 +25,7 @@
     "nativescript-theme-core": "^1.0.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "~6.5.5",
-    "@nativescript/core": "~7.0.0-rc.12",
+    "@nativescript/core": "~7.0.0-rc.18",
     "zone.js": "^0.10.3"
   },
   "devDependencies": {
@@ -35,7 +35,6 @@
     "babel-types": "6.24.1",
     "babylon": "6.17.0",
     "codelyzer": "^5.1.0",
-    "copy-webpack-plugin": "~6.0.3",
     "filewalker": "^0.1.3",
     "lazy": "1.0.11",
     "@nativescript/webpack": "~2.0.0-alpha.3",
diff --git a/nativescript-angular-package/.npmignore b/nativescript-angular-package/.npmignore
@@ -1,4 +1,5 @@
 *.tgz
+dist
 
 *.ts
 !*.d.ts
diff --git a/nativescript-angular-package/app-host-view.ts b/nativescript-angular-package/app-host-view.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/app-host-view";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/common.ts b/nativescript-angular-package/common.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/common";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/dom-adapter.ts b/nativescript-angular-package/dom-adapter.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/dom-adapter";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/element-registry.ts b/nativescript-angular-package/element-registry.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/element-registry";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/forms/index.ts b/nativescript-angular-package/forms/index.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/forms"
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/http-client/index.ts b/nativescript-angular-package/http-client/index.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/http-client"
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/index.ts b/nativescript-angular-package/index.ts
@@ -1,9 +1 @@
 export * from "@nativescript/angular";
-export * from "@nativescript/angular/forms";
-export * from "@nativescript/angular/router";
-export * from "@nativescript/angular/file-system/ns-file-system";
-export * from "@nativescript/angular/modal-dialog";
-export * from "@nativescript/angular/forms/value-accessors/base-value-accessor";
-export * from "@nativescript/angular/trace";
-export * from "@nativescript/angular/renderer";
-export * from "@nativescript/angular/view-util";
diff --git a/nativescript-angular-package/lang-facade.ts b/nativescript-angular-package/lang-facade.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/lang-facade";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/modal-dialog.ts b/nativescript-angular-package/modal-dialog.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/modal-dialog"
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/nativescript.module.ts b/nativescript-angular-package/nativescript.module.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/nativescript.module";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/package.json b/nativescript-angular-package/package.json
@@ -1,7 +1,7 @@
 {
     "name": "nativescript-angular",
-    "version": "9.0.0",
-    "description": "An Angular renderer that lets you build mobile apps with NativeScript.",
+    "version": "10.0.0-rc.4",
+    "description": "Compatibility with old style nativescript-angular imports.",
     "homepage": "https://www.nativescript.org/",
     "bugs": "https://github.com/NativeScript/nativescript-angular/issues",
     "author": {
@@ -22,24 +22,38 @@
         "type": "git",
         "url": "https://github.com/NativeScript/nativescript-angular.git"
     },
-    "dependencies": {
-        "@nativescript/angular": "file:../nativescript-angular"
+    "ngPackage": {
+        "lib": {
+            "entryFile": "index.ts",
+            "umdModuleIds": {
+                "@nativescript/core": "ns-core",
+                "@nativescript/angular": "ns-angular"
+            }
+        },
+        "whitelistedNonPeerDependencies": [
+            "."
+        ]
     },
     "devDependencies": {
-        "@angular/animations": "~9.1.0",
-        "@angular/common": "~9.1.0",
-        "@angular/compiler": "~9.1.0",
-        "@angular/compiler-cli": "~9.1.0",
-        "@angular/core": "~9.1.0",
-        "@angular/forms": "~9.1.0",
-        "@angular/platform-browser": "~9.1.0",
-        "@angular/platform-browser-dynamic": "~9.1.0",
-        "@angular/router": "~9.1.0",
+        "@angular/animations": "~10.0.0",
+        "@angular/common": "~10.0.0",
+        "@angular/compiler": "~10.0.0",
+        "@angular/compiler-cli": "~10.0.0",
+        "@angular/core": "~10.0.0",
+        "@angular/forms": "~10.0.0",
+        "@angular/platform-browser": "~10.0.0",
+        "@angular/platform-browser-dynamic": "~10.0.0",
+        "@angular/router": "~10.0.0",
+        "@nativescript/angular": "rc",
+        "@nativescript/core": "rc",
+        "ng-packagr": "^10.0.1",
         "rxjs": "~6.5.5",
-        "@nativescript/core": "next",
-        "typescript": "~3.8.3"
+        "typescript": "~3.9.0"
     },
     "scripts": {
+        "setup": "npx rimraf hooks node_modules package-lock.json && npm i",
+        "build": "ng-packagr -p package.json",
+        "build.pack": "npm run tsc && npm run build && cd dist && npm pack",
         "ngc": "ngc -p tsconfig.json",
         "tsc": "tsc",
         "pack-with-scoped-version": "cd ../build/pack-scripts && npm i && npx ts-node pack-compat.ts"
diff --git a/nativescript-angular-package/platform-common.ts b/nativescript-angular-package/platform-common.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/platform-common";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/platform-providers.ts b/nativescript-angular-package/platform-providers.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/platform-providers";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/platform.ts b/nativescript-angular-package/platform.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/platform";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/renderer.ts b/nativescript-angular-package/renderer.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/renderer";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/resource-loader.ts b/nativescript-angular-package/resource-loader.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/resource-loader";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/router/index.ts b/nativescript-angular-package/router/index.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/router";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/router/router.module.ts b/nativescript-angular-package/router/router.module.ts
@@ -1,2 +1 @@
-export { LocationState } from "@nativescript/angular/router/ns-location-strategy";
 export * from "@nativescript/angular/router/router.module";
diff --git a/nativescript-angular-package/schema-registry.ts b/nativescript-angular-package/schema-registry.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/schema-registry";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/testing/index.ts b/nativescript-angular-package/testing/index.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/testing"
+export * from "@nativescript/angular/testing";
diff --git a/nativescript-angular-package/testing/src/nativescript_test_component_renderer.ts b/nativescript-angular-package/testing/src/nativescript_test_component_renderer.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/testing/src/nativescript_test_component_renderer";
+export * from "@nativescript/angular/testing";
diff --git a/nativescript-angular-package/testing/src/util.ts b/nativescript-angular-package/testing/src/util.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/testing/src/util";
+export * from "@nativescript/angular/testing";
diff --git a/nativescript-angular-package/trace.ts b/nativescript-angular-package/trace.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/trace";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/tsconfig.json b/nativescript-angular-package/tsconfig.json
@@ -1,17 +1,18 @@
 {
   "compilerOptions": {
-    "target": "es2015",
-    "module": "commonjs",
+    "target": "es2017",
+    "module": "esnext",
     "moduleResolution": "node",
     "sourceMap": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "noImplicitUseStrict": true,
     "noEmitHelpers": true,
     "declaration": true,
-    "removeComments": false,
+    "removeComments": true,
     "noEmitOnError": true,
     "skipLibCheck": true,
+    "skipDefaultLibCheck": true,
     "noImplicitAny": false,
     "lib": [
       "es2017",
@@ -24,12 +25,14 @@
     "genDir": ".",
     "skipMetadataEmit": false,
     "skipTemplateCodegen": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "enableIvy": true
   },
   "include": [
     "**/*.ts"
   ],
-  "exclude":[
-    "node_modules/*"
+  "exclude": [
+    "node_modules",
+    "dist"
   ]
-}
+}
diff --git a/nativescript-angular-package/value-accessors/base-value-accessor.ts b/nativescript-angular-package/value-accessors/base-value-accessor.ts
@@ -1,3 +1,2 @@
 // This file is only for compatibility with pre 4.4.0 releases.
-// Please use "nativescript-angular/forms/value-accessors/base-value-accessor"
-export * from "@nativescript/angular/forms/value-accessors/base-value-accessor";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular-package/view-util.ts b/nativescript-angular-package/view-util.ts
@@ -1 +1 @@
-export * from "@nativescript/angular/view-util";
+export * from "@nativescript/angular";
diff --git a/nativescript-angular/.npmignore b/nativescript-angular/.npmignore
@@ -1,4 +1,5 @@
 *.tgz
+dist
 
 *.ts
 !*.d.ts
diff --git a/nativescript-angular/animations/animations.module.ts b/nativescript-angular/animations/animations.module.ts
@@ -7,7 +7,7 @@ import { AnimationDriver, ɵAnimationStyleNormalizer as AnimationStyleNormalizer
 import { ɵAnimationRendererFactory as AnimationRendererFactory, ɵBrowserAnimationBuilder as BrowserAnimationBuilder } from '@angular/platform-browser/animations';
 
 // import { NativeScriptModule } from "../nativescript.module";
-import { NativeScriptRendererFactory } from '../renderer';
+import { NativeScriptRendererFactory } from '../renderer-factory';
 import { NativeScriptAnimationDriver } from './animation-driver';
 import { throwIfAlreadyLoaded } from '../common/utils';
 import { NativeScriptCommonModule } from '../common';
diff --git a/nativescript-angular/directives/templated-items-comp.ts b/nativescript-angular/directives/templated-items-comp.ts
@@ -17,7 +17,7 @@ export interface SetupItemViewArgs {
 	context: ItemContext;
 }
 
-@Injectable()
+@Directive()
 export abstract class TemplatedItemsComponent implements DoCheck, OnDestroy, AfterContentInit {
 	public abstract get nativeElement(): TemplatedItemsView;
 
diff --git a/nativescript-angular/index.ts b/nativescript-angular/index.ts
@@ -26,4 +26,7 @@ export * from './router';
 export * from './frame.service';
 export { NativeScriptDebug } from './trace';
 
-export { ViewClass, ViewClassMeta, ViewResolver, getViewClass, getViewMeta, isKnownView, registerElement } from './element-registry';
+export { NativeScriptRenderer } from './renderer';
+export { EmulatedRenderer } from './renderer-emulated';
+export { NativeScriptRendererFactory } from './renderer-factory';
+export { ViewClass, ViewClassMeta, ViewResolver, getViewClass, getViewMeta, isKnownView, registerElement, NgView, CommentNode, getSingleViewRecursive } from './element-registry';
diff --git a/nativescript-angular/nativescript.module.ts b/nativescript-angular/nativescript.module.ts
@@ -3,7 +3,7 @@ import { ApplicationModule, ErrorHandler, NO_ERRORS_SCHEMA, NgModule, RendererFa
 import { ViewportScroller, ɵNullViewportScroller as NullViewportScroller } from '@angular/common';
 
 import { NativeScriptCommonModule } from './common';
-import { NativeScriptRendererFactory } from './renderer';
+import { NativeScriptRendererFactory } from './renderer-factory';
 import { DetachedLoader } from './common/detached-loader';
 import { throwIfAlreadyLoaded } from './common/utils';
 import { FrameService } from './frame.service';
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/angular",
-  "version": "10.0.0-alpha.0",
+  "version": "10.0.0-rc.4",
   "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",
@@ -58,6 +58,7 @@
   },
   "dependencies": {
     "@nativescript/zone-js": "~1.0.0",
+    "nativescript-angular": "rc",
     "nativescript-intl": "^4.0.0"
   },
   "peerDependencies": {
@@ -79,7 +80,7 @@
     "@angular/platform-browser": "~10.0.0",
     "@angular/platform-browser-dynamic": "~10.0.0",
     "@angular/router": "~10.0.0",
-    "@nativescript/core": "~7.0.0-rc.12",
+    "@nativescript/core": "rc",
     "codelyzer": "^5.2.0",
     "conventional-changelog-cli": "^2.0.34",
     "husky": "^4.2.5",
diff --git a/nativescript-angular/platform-providers.ts b/nativescript-angular/platform-providers.ts
diff --git a/nativescript-angular/platform.ts b/nativescript-angular/platform.ts
diff --git a/nativescript-angular/renderer-emulated.ts b/nativescript-angular/renderer-emulated.ts
diff --git a/nativescript-angular/renderer-factory.ts b/nativescript-angular/renderer-factory.ts
diff --git a/nativescript-angular/renderer.ts b/nativescript-angular/renderer.ts
diff --git a/nativescript-angular/router/router.module.ts b/nativescript-angular/router/router.module.ts
diff --git a/nativescript-angular/testing/package.json b/nativescript-angular/testing/package.json
diff --git a/nativescript-angular/testing/src/nativescript-testing.module.ts b/nativescript-angular/testing/src/nativescript-testing.module.ts
diff --git a/nativescript-angular/testing/src/nativescript_test_component_renderer.ts b/nativescript-angular/testing/src/nativescript_test_component_renderer.ts
diff --git a/nativescript-angular/testing/src/public_api.ts b/nativescript-angular/testing/src/public_api.ts
diff --git a/nativescript-angular/testing/src/test-root-view.ts b/nativescript-angular/testing/src/test-root-view.ts
diff --git a/nativescript-angular/testing/src/util.ts b/nativescript-angular/testing/src/util.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { platformNativeScript, NativeScriptDebug } from "@nativescript/angular";`
	`1`	`+import { platformNativeScriptDynamic, NativeScriptDebug } from "@nativescript/angular";`
`2`	`2`	`import { Trace, GridLayout, GridUnitType, ItemSpec, VerticalAlignment } from "@nativescript/core";`
`3`	`3`
`4`	`4`	`import { AppModule } from "./app.module";`
`@@ -87,7 +87,7 @@ class LaunchAnimation extends GridLayout {`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-platformNativeScript({`
	`90`	`+platformNativeScriptDynamic({`
`91`	`91`	`launchView: new LaunchAnimation(),`
`92`	`92`	`// backgroundColor: 'purple'`
`93`	`93`	`}).bootstrapModule(AppModule);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`*.tgz`
	`2`	`+dist`
`2`	`3`
`3`	`4`	`*.ts`
`4`	`5`	`!*.d.ts`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export * from "@nativescript/angular/app-host-view";`
	`1`	`+export * from "@nativescript/angular";`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export * from "@nativescript/angular/common";`
	`1`	`+export * from "@nativescript/angular";`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export * from "@nativescript/angular/dom-adapter";`
	`1`	`+export * from "@nativescript/angular";`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export * from "@nativescript/angular/element-registry";`
	`1`	`+export * from "@nativescript/angular";`