Skip to content

Commit cedae2f

Browse files
NathanWalkerNathanWalker
committed
chore: cleanup
1 parent 93b1eb1 commit cedae2f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+295
-239
lines changed

‎e2e/animation-examples/app/app.module.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ export function asyncBoot(): Function {
5252
/**
5353
* Uncomment to test APP_INITIALIZER
5454
*/
55-
// providers: [
56-
// {
57-
// provide: APP_INITIALIZER,
58-
// useFactory: asyncBoot,
59-
// multi: true
60-
// },
61-
// ],
55+
providers: [
56+
{
57+
provide: APP_INITIALIZER,
58+
useFactory: asyncBoot,
59+
multi: true
60+
},
61+
],
6262
schemas: [NO_ERRORS_SCHEMA],
6363
})
6464
export class AppModule {}

‎e2e/animation-examples/app/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { platformNativeScript, NativeScriptDebug } from "@nativescript/angular";
1+
import { platformNativeScriptDynamic, NativeScriptDebug } from "@nativescript/angular";
22
import { Trace, GridLayout, GridUnitType, ItemSpec, VerticalAlignment } from "@nativescript/core";
33

44
import { AppModule } from "./app.module";
@@ -87,7 +87,7 @@ class LaunchAnimation extends GridLayout {
8787
}
8888
}
8989

90-
platformNativeScript({
90+
platformNativeScriptDynamic({
9191
launchView: new LaunchAnimation(),
9292
// backgroundColor: 'purple'
9393
}).bootstrapModule(AppModule);

‎e2e/animation-examples/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"nativescript": {
77
"id": "org.nativescript.ng4animations",
88
"tns-ios": {
9-
"version": "6.5.1"
9+
"version": "6.5.2"
1010
},
1111
"tns-android": {
1212
"version": "latest"
@@ -25,7 +25,7 @@
2525
"nativescript-theme-core": "~1.0.2",
2626
"reflect-metadata": "~0.1.8",
2727
"rxjs": "~6.5.5",
28-
"@nativescript/core": "~7.0.0-rc.12",
28+
"@nativescript/core": "rc",
2929
"zone.js": "^0.10.3"
3030
},
3131
"devDependencies": {
@@ -43,7 +43,7 @@
4343
"mochawesome": "~6.1.1",
4444
"node-sass": "~4.14.1",
4545
"nativescript-css-loader": "~0.26.0",
46-
"@nativescript/webpack": "~2.0.0-alpha.3",
46+
"@nativescript/webpack": "rc",
4747
"typescript": "~3.9.0"
4848
},
4949
"scripts": {

‎e2e/tests-app-ng/app/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { platformNativeScript } from "@nativescript/angular";
1+
import { platformNativeScriptDynamic } from "@nativescript/angular";
22

33
import { AppModule } from "./app.module";
44
import { Trace } from "@nativescript/core";
55

66
Trace.enable();
77

8-
platformNativeScript().bootstrapModule(AppModule);
8+
platformNativeScriptDynamic().bootstrapModule(AppModule);

‎e2e/tests-app-ng/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"nativescript": {
77
"id": "org.nativescript.testsappng",
88
"tns-ios": {
9-
"version": "6.5.0"
9+
"version": "6.5.2"
1010
},
1111
"tns-android": {
1212
"version": "6.5.0"
@@ -25,7 +25,7 @@
2525
"nativescript-theme-core": "^1.0.4",
2626
"reflect-metadata": "~0.1.8",
2727
"rxjs": "~6.5.5",
28-
"@nativescript/core": "~7.0.0-rc.12",
28+
"@nativescript/core": "~7.0.0-rc.18",
2929
"zone.js": "^0.10.3"
3030
},
3131
"devDependencies": {
@@ -35,7 +35,6 @@
3535
"babel-types": "6.24.1",
3636
"babylon": "6.17.0",
3737
"codelyzer": "^5.1.0",
38-
"copy-webpack-plugin": "~6.0.3",
3938
"filewalker": "^0.1.3",
4039
"lazy": "1.0.11",
4140
"@nativescript/webpack": "~2.0.0-alpha.3",

‎nativescript-angular-package/.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*.tgz
2+
dist
23

34
*.ts
45
!*.d.ts

‎nativescript-angular-package/app-host-view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/app-host-view";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/common";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/dom-adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/dom-adapter";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/element-registry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/element-registry";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/forms/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/forms"
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/http-client/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/http-client"
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/index.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
11
export * from "@nativescript/angular";
2-
export * from "@nativescript/angular/forms";
3-
export * from "@nativescript/angular/router";
4-
export * from "@nativescript/angular/file-system/ns-file-system";
5-
export * from "@nativescript/angular/modal-dialog";
6-
export * from "@nativescript/angular/forms/value-accessors/base-value-accessor";
7-
export * from "@nativescript/angular/trace";
8-
export * from "@nativescript/angular/renderer";
9-
export * from "@nativescript/angular/view-util";

‎nativescript-angular-package/lang-facade.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/lang-facade";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/modal-dialog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/modal-dialog"
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/nativescript.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/nativescript.module";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/package.json

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nativescript-angular",
3-
"version": "9.0.0",
4-
"description": "An Angular renderer that lets you build mobile apps with NativeScript.",
3+
"version": "10.0.0-rc.4",
4+
"description": "Compatibility with old style nativescript-angular imports.",
55
"homepage": "https://www.nativescript.org/",
66
"bugs": "https://github.com/NativeScript/nativescript-angular/issues",
77
"author": {
@@ -22,24 +22,38 @@
2222
"type": "git",
2323
"url": "https://github.com/NativeScript/nativescript-angular.git"
2424
},
25-
"dependencies": {
26-
"@nativescript/angular": "file:../nativescript-angular"
25+
"ngPackage": {
26+
"lib": {
27+
"entryFile": "index.ts",
28+
"umdModuleIds": {
29+
"@nativescript/core": "ns-core",
30+
"@nativescript/angular": "ns-angular"
31+
}
32+
},
33+
"whitelistedNonPeerDependencies": [
34+
"."
35+
]
2736
},
2837
"devDependencies": {
29-
"@angular/animations": "~9.1.0",
30-
"@angular/common": "~9.1.0",
31-
"@angular/compiler": "~9.1.0",
32-
"@angular/compiler-cli": "~9.1.0",
33-
"@angular/core": "~9.1.0",
34-
"@angular/forms": "~9.1.0",
35-
"@angular/platform-browser": "~9.1.0",
36-
"@angular/platform-browser-dynamic": "~9.1.0",
37-
"@angular/router": "~9.1.0",
38+
"@angular/animations": "~10.0.0",
39+
"@angular/common": "~10.0.0",
40+
"@angular/compiler": "~10.0.0",
41+
"@angular/compiler-cli": "~10.0.0",
42+
"@angular/core": "~10.0.0",
43+
"@angular/forms": "~10.0.0",
44+
"@angular/platform-browser": "~10.0.0",
45+
"@angular/platform-browser-dynamic": "~10.0.0",
46+
"@angular/router": "~10.0.0",
47+
"@nativescript/angular": "rc",
48+
"@nativescript/core": "rc",
49+
"ng-packagr": "^10.0.1",
3850
"rxjs": "~6.5.5",
39-
"@nativescript/core": "next",
40-
"typescript": "~3.8.3"
51+
"typescript": "~3.9.0"
4152
},
4253
"scripts": {
54+
"setup": "npx rimraf hooks node_modules package-lock.json && npm i",
55+
"build": "ng-packagr -p package.json",
56+
"build.pack": "npm run tsc && npm run build && cd dist && npm pack",
4357
"ngc": "ngc -p tsconfig.json",
4458
"tsc": "tsc",
4559
"pack-with-scoped-version": "cd ../build/pack-scripts && npm i && npx ts-node pack-compat.ts"

‎nativescript-angular-package/platform-common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/platform-common";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/platform-providers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/platform-providers";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/platform.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/platform";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/renderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/renderer";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/resource-loader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/resource-loader";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/router/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/router";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/router/router.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
export { LocationState } from "@nativescript/angular/router/ns-location-strategy";
21
export * from "@nativescript/angular/router/router.module";

‎nativescript-angular-package/schema-registry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/schema-registry";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/testing/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/testing"
1+
export * from "@nativescript/angular/testing";

‎nativescript-angular-package/testing/src/nativescript_test_component_renderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/testing/src/nativescript_test_component_renderer";
1+
export * from "@nativescript/angular/testing";

‎nativescript-angular-package/testing/src/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/testing/src/util";
1+
export * from "@nativescript/angular/testing";

‎nativescript-angular-package/trace.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/trace";
1+
export * from "@nativescript/angular";

‎nativescript-angular-package/tsconfig.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
{
22
"compilerOptions": {
3-
"target": "es2015",
4-
"module": "commonjs",
3+
"target": "es2017",
4+
"module": "esnext",
55
"moduleResolution": "node",
66
"sourceMap": true,
77
"emitDecoratorMetadata": true,
88
"experimentalDecorators": true,
99
"noImplicitUseStrict": true,
1010
"noEmitHelpers": true,
1111
"declaration": true,
12-
"removeComments": false,
12+
"removeComments": true,
1313
"noEmitOnError": true,
1414
"skipLibCheck": true,
15+
"skipDefaultLibCheck": true,
1516
"noImplicitAny": false,
1617
"lib": [
1718
"es2017",
@@ -24,12 +25,14 @@
2425
"genDir": ".",
2526
"skipMetadataEmit": false,
2627
"skipTemplateCodegen": true,
27-
"strictMetadataEmit": true
28+
"strictMetadataEmit": true,
29+
"enableIvy": true
2830
},
2931
"include": [
3032
"**/*.ts"
3133
],
32-
"exclude":[
33-
"node_modules/*"
34+
"exclude": [
35+
"node_modules",
36+
"dist"
3437
]
35-
}
38+
}

‎nativescript-angular-package/value-accessors/base-value-accessor.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
// This file is only for compatibility with pre 4.4.0 releases.
2-
// Please use "nativescript-angular/forms/value-accessors/base-value-accessor"
3-
export * from "@nativescript/angular/forms/value-accessors/base-value-accessor";
2+
export * from "@nativescript/angular";

‎nativescript-angular-package/view-util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "@nativescript/angular/view-util";
1+
export * from "@nativescript/angular";

‎nativescript-angular/.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*.tgz
2+
dist
23

34
*.ts
45
!*.d.ts

‎nativescript-angular/animations/animations.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { AnimationDriver, ɵAnimationStyleNormalizer as AnimationStyleNormalizer
77
import { ɵAnimationRendererFactory as AnimationRendererFactory, ɵBrowserAnimationBuilder as BrowserAnimationBuilder } from '@angular/platform-browser/animations';
88

99
// import { NativeScriptModule } from "../nativescript.module";
10-
import { NativeScriptRendererFactory } from '../renderer';
10+
import { NativeScriptRendererFactory } from '../renderer-factory';
1111
import { NativeScriptAnimationDriver } from './animation-driver';
1212
import { throwIfAlreadyLoaded } from '../common/utils';
1313
import { NativeScriptCommonModule } from '../common';

‎nativescript-angular/directives/templated-items-comp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface SetupItemViewArgs {
1717
context: ItemContext;
1818
}
1919

20-
@Injectable()
20+
@Directive()
2121
export abstract class TemplatedItemsComponent implements DoCheck, OnDestroy, AfterContentInit {
2222
public abstract get nativeElement(): TemplatedItemsView;
2323

‎nativescript-angular/index.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ export * from './router';
2626
export * from './frame.service';
2727
export { NativeScriptDebug } from './trace';
2828

29-
export { ViewClass, ViewClassMeta, ViewResolver, getViewClass, getViewMeta, isKnownView, registerElement } from './element-registry';
29+
export { NativeScriptRenderer } from './renderer';
30+
export { EmulatedRenderer } from './renderer-emulated';
31+
export { NativeScriptRendererFactory } from './renderer-factory';
32+
export { ViewClass, ViewClassMeta, ViewResolver, getViewClass, getViewMeta, isKnownView, registerElement, NgView, CommentNode, getSingleViewRecursive } from './element-registry';

‎nativescript-angular/nativescript.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ApplicationModule, ErrorHandler, NO_ERRORS_SCHEMA, NgModule, RendererFa
33
import { ViewportScroller, ɵNullViewportScroller as NullViewportScroller } from '@angular/common';
44

55
import { NativeScriptCommonModule } from './common';
6-
import { NativeScriptRendererFactory } from './renderer';
6+
import { NativeScriptRendererFactory } from './renderer-factory';
77
import { DetachedLoader } from './common/detached-loader';
88
import { throwIfAlreadyLoaded } from './common/utils';
99
import { FrameService } from './frame.service';

‎nativescript-angular/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/angular",
3-
"version": "10.0.0-alpha.0",
3+
"version": "10.0.0-rc.4",
44
"description": "An Angular renderer that lets you build mobile apps with NativeScript.",
55
"homepage": "https://www.nativescript.org/",
66
"bugs": "https://github.com/NativeScript/nativescript-angular/issues",
@@ -58,6 +58,7 @@
5858
},
5959
"dependencies": {
6060
"@nativescript/zone-js": "~1.0.0",
61+
"nativescript-angular": "rc",
6162
"nativescript-intl": "^4.0.0"
6263
},
6364
"peerDependencies": {
@@ -79,7 +80,7 @@
7980
"@angular/platform-browser": "~10.0.0",
8081
"@angular/platform-browser-dynamic": "~10.0.0",
8182
"@angular/router": "~10.0.0",
82-
"@nativescript/core": "~7.0.0-rc.12",
83+
"@nativescript/core": "rc",
8384
"codelyzer": "^5.2.0",
8485
"conventional-changelog-cli": "^2.0.34",
8586
"husky": "^4.2.5",

0 commit comments

Comments
 (0)