Skip to content

Commit e6c1d56

Browse files
authored
Merge pull request #99 from nstudio/fix/imports
fix: imports and cleanup to latest deps
2 parents 0fe7406 + f97c2c9 commit e6c1d56

37 files changed

+213
-905
lines changed

demo-angular/angular.json

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { NativeScriptConfig } from '@nativescript/core';
2+
3+
export default {
4+
id: 'org.nativescript.demotemp',
5+
appPath: 'src',
6+
appResourcesPath: 'App_Resources',
7+
android: {
8+
v8Flags: '--expose_gc',
9+
markingMode: 'none',
10+
},
11+
} as NativeScriptConfig;

demo-angular/nsconfig.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

demo-angular/package.json

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,36 @@
33
"license": "SEE LICENSE IN <your-license-filename>",
44
"readme": "NativeScript Application",
55
"repository": "<fill-your-repository-here>",
6-
"nativescript": {
7-
"id": "org.nativescript.demotemp",
8-
"tns-android": {
9-
"version": "6.5.0"
10-
}
11-
},
126
"dependencies": {
13-
"@angular/animations": "8.0.0",
14-
"@angular/common": "8.0.0",
15-
"@angular/compiler": "8.0.0",
16-
"@angular/core": "8.0.0",
17-
"@angular/forms": "8.0.0",
18-
"@angular/http": "8.0.0-beta.10",
19-
"@angular/platform-browser": "8.0.0",
20-
"@angular/platform-browser-dynamic": "8.0.0",
21-
"@angular/router": "8.0.0",
22-
"nativescript-angular": "8.0.2",
7+
"@angular/animations": "~14.2.0",
8+
"@angular/common": "~14.2.0",
9+
"@angular/compiler": "~14.2.0",
10+
"@angular/core": "~14.2.0",
11+
"@angular/forms": "~14.2.0",
12+
"@angular/platform-browser": "~14.2.0",
13+
"@angular/platform-browser-dynamic": "~14.2.0",
14+
"@angular/router": "~14.2.0",
2315
"@nativescript-community/ui-lottie": "file:../plugin",
2416
"nativescript-theme-core": "~1.0.4",
25-
"reflect-metadata": "~0.1.8",
26-
"rxjs": "~6.4.0",
27-
"@nativescript/core": "6.5.0",
28-
"zone.js": "0.10.2"
17+
"rxjs": "~7.5.0",
18+
"@nativescript/core": "~8.4.0",
19+
"zone.js": "~0.11.5",
20+
"@nativescript/angular": "~14.2.0"
2921
},
3022
"devDependencies": {
3123
"jasmine-core": "3.3.0",
3224
"karma": "4.0.1",
3325
"karma-jasmine": "1.1.2",
3426
"karma-nativescript-launcher": "0.4.0",
35-
"@angular/compiler-cli": "8.0.0",
36-
"@nativescript/schematics": "~0.5.1",
37-
"@ngtools/webpack": "8.0.0",
38-
"nativescript-dev-webpack": "1.0.1",
27+
"@angular/compiler-cli": "~14.2.0",
28+
"@ngtools/webpack": "~14.2.0",
3929
"tslint": "~5.13.1",
40-
"typescript": "3.4.5"
30+
"typescript": "~4.8.4",
31+
"@nativescript/webpack": "~5.0.0"
4132
},
4233
"scripts": {
4334
"build.plugin": "cd ../src && npm run build",
4435
"ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**' --exclude '**/platforms/**'"
45-
}
36+
},
37+
"main": "./src/main.ts"
4638
}

demo-angular/src/app.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import '~nativescript-theme-core/css/core.light.css';
1+
@import 'nativescript-theme-core/css/core.light.css';

demo-angular/src/app/app-routing.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { Routes } from '@angular/router';
3-
import { NativeScriptRouterModule } from 'nativescript-angular/router';
3+
import { NativeScriptRouterModule } from '@nativescript/angular';
44
import { HomeComponent } from './home/home.component';
55

66
const routes: Routes = [

demo-angular/src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
NgModule,
33
NO_ERRORS_SCHEMA
44
} from '@angular/core';
5-
import { NativeScriptModule } from 'nativescript-angular/nativescript.module';
5+
import { NativeScriptModule } from '@nativescript/angular';
66
import { NativeScriptLottieModule } from '@nativescript-community/ui-lottie/angular';
77
import { AppRoutingModule } from './app-routing.module';
88
import { AppComponent } from './app.component';

demo-angular/src/app/home/home-routing.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { Routes } from '@angular/router';
3-
import { NativeScriptRouterModule } from 'nativescript-angular/router';
3+
import { NativeScriptRouterModule } from '@nativescript/angular';
44

55
import { HomeComponent } from './home.component';
66

demo-angular/src/app/home/home.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component } from '@angular/core';
22
import { LottieView } from '@nativescript-community/ui-lottie';
3-
import { Color } from '@nativescript/core/color';
3+
import { Color } from '@nativescript/core';
44

55
const ANDROID_WAVE_KEYPATHS = [
66
['Shirt', 'Group 5', 'Fill 1'],

demo-angular/src/app/home/home.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
2-
import { NativeScriptCommonModule } from 'nativescript-angular/common';
2+
import { NativeScriptCommonModule } from '@nativescript/angular';
33
import { HomeRoutingModule } from './home-routing.module';
44
import { HomeComponent } from './home.component';
55

0 commit comments

Comments
 (0)