Skip to content

Commit 3c3d88e

Browse files
committed
chore: cleanup
1 parent cedae2f commit 3c3d88e

File tree

7 files changed

+32
-24
lines changed

7 files changed

+32
-24
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/tests-app-ng/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.18",
28+
"@nativescript/core": "rc",
2929
"zone.js": "^0.10.3"
3030
},
3131
"devDependencies": {
@@ -37,7 +37,7 @@
3737
"codelyzer": "^5.1.0",
3838
"filewalker": "^0.1.3",
3939
"lazy": "1.0.11",
40-
"@nativescript/webpack": "~2.0.0-alpha.3",
40+
"@nativescript/webpack": "rc",
4141
"typescript": "~3.9.0"
4242
},
4343
"scripts": {

nativescript-angular-package/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-angular",
3-
"version": "10.0.0-rc.4",
3+
"version": "10.0.0-rc.5",
44
"description": "Compatibility with old style nativescript-angular imports.",
55
"homepage": "https://www.nativescript.org/",
66
"bugs": "https://github.com/NativeScript/nativescript-angular/issues",

nativescript-angular/forms/forms.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
22
import { FormsModule } from '@angular/forms';
33
import { TextValueAccessor, CheckedValueAccessor, DateValueAccessor, TimeValueAccessor, NumberValueAccessor, SelectedIndexValueAccessor } from './value-accessors';
44

5-
export { TextValueAccessor, CheckedValueAccessor, DateValueAccessor, TimeValueAccessor, SelectedIndexValueAccessor, NumberValueAccessor };
5+
export * from './value-accessors';
66

77
@NgModule({
88
declarations: [TextValueAccessor, CheckedValueAccessor, DateValueAccessor, TimeValueAccessor, SelectedIndexValueAccessor, NumberValueAccessor],

nativescript-angular/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Initial imports and polyfills
22
import '@nativescript/core';
33
import '@nativescript/zone-js';
4-
import './dom-adapter';
5-
import 'nativescript-intl';
64
// TODO: migrate to standard zone.js if possible
75
// investigate Ivy with templated-items-comp to allow standard zone below to be used instead of patched {N} zone above
86
// import 'zone.js/dist/zone';
7+
import './dom-adapter';
8+
import 'nativescript-intl';
99
// import "./polyfills/array";
1010
import './polyfills/console';
1111

nativescript-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/angular",
3-
"version": "10.0.0-rc.4",
3+
"version": "10.0.0-rc.5",
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",

nativescript-angular/platform-common.ts

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,10 @@ export class NativeScriptPlatformRef extends PlatformRef {
177177
}
178178

179179
setRootPage(<any>launchView);
180-
args.root = launchView;
181-
182-
// Launch Angular app on next tick
183-
setTimeout(() => {
184-
if (this.appOptions && this.appOptions.launchView && this.appOptions.launchView.startAnimation) {
185-
// ensure launch animation is executed after launchView added to view stack
186-
this.appOptions.launchView.startAnimation();
187-
}
188-
this._bootstrapper().then(
180+
args.root = launchView;
181+
182+
const bootstrap = () => {
183+
this._bootstrapper().then(
189184
(moduleRef) => {
190185
if (NativeScriptDebug.isLogEnabled()) {
191186
NativeScriptDebug.bootstrapLog(`Angular bootstrap bootstrap done. uptime: ${profilingUptime()}`);
@@ -219,7 +214,20 @@ export class NativeScriptPlatformRef extends PlatformRef {
219214
if (NativeScriptDebug.isLogEnabled()) {
220215
NativeScriptDebug.bootstrapLog('bootstrapAction called, draining micro tasks queue finished! Root: ' + rootContent);
221216
}
222-
});
217+
};
218+
219+
if (this.appOptions && this.appOptions.launchView) {
220+
// Since custom LaunchView could engage with animations, Launch Angular app on next tick
221+
setTimeout(() => {
222+
if (this.appOptions.launchView.startAnimation) {
223+
// ensure launch animation is executed after launchView added to view stack
224+
this.appOptions.launchView.startAnimation();
225+
}
226+
bootstrap();
227+
});
228+
} else {
229+
bootstrap();
230+
}
223231
});
224232
const exitCallback = profile('@nativescript/angular/platform-common.exitCallback', (args: ApplicationEventData) => {
225233
const androidActivity = args.android;

0 commit comments

Comments
 (0)