Skip to content

Commit 64cc47a

Browse files
NathanWalkerNathanWalker
committed
chore: nx migrate @nativescript/plugin-tools
1 parent c54bb91 commit 64cc47a

File tree

12 files changed

+28993
-109
lines changed

12 files changed

+28993
-109
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
# dependencies
99
node_modules
10-
package-lock.json
1110
yarn.lock
1211

1312
# IDEs and editors

‎apps/demo-angular/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"main": "./src/main.ts",
33
"dependencies": {
4-
"@nativescript/core": "file:../../node_modules/@nativescript/core",
4+
"@nativescript/core": "*",
55
"@nativescript/rive": "file:../../dist/packages/rive",
66
"@nativescript/flutter": "file:../../dist/packages/flutter",
77
"@nativescript/ionic-portals": "file:../../dist/packages/ionic-portals",
@@ -10,7 +10,7 @@
1010
"@nativescript/ui-charts": "file:../../dist/packages/ui-charts"
1111
},
1212
"devDependencies": {
13-
"@nativescript/android": "~8.8.0",
14-
"@nativescript/ios": "~8.8.0"
13+
"@nativescript/android": "~8.9.0",
14+
"@nativescript/ios": "~8.9.0"
1515
}
1616
}

‎apps/demo-angular/project.json‎

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,8 @@
1212
"production": true,
1313
"uglify": true,
1414
"release": true,
15-
"forDevice": true
16-
},
17-
"dependsOn": [
18-
{
19-
"target": "build.all",
20-
"dependencies": true
21-
}
22-
]
23-
},
24-
"ios": {
25-
"executor": "@nativescript/nx:build",
26-
"options": {
27-
"platform": "ios"
28-
},
29-
"dependsOn": [
30-
{
31-
"target": "build.all",
32-
"dependencies": true
33-
}
34-
]
35-
},
36-
"android": {
37-
"executor": "@nativescript/nx:build",
38-
"options": {
39-
"platform": "android"
15+
"forDevice": true,
16+
"tsConfig": "apps/demo-angular/tsconfig.json"
4017
},
4118
"dependsOn": [
4219
{
@@ -46,13 +23,21 @@
4623
]
4724
},
4825
"clean": {
49-
"executor": "@nativescript/nx:build",
50-
"options": {
51-
"clean": true
52-
}
26+
"executor": "@nativescript/nx:clean",
27+
"options": {}
5328
},
5429
"lint": {
5530
"executor": "@nx/eslint:lint"
31+
},
32+
"debug": {
33+
"executor": "@nativescript/nx:debug",
34+
"options": {
35+
"noHmr": true,
36+
"uglify": false,
37+
"release": false,
38+
"forDevice": false,
39+
"prepare": false
40+
}
5641
}
5742
}
5843
}

‎apps/demo-angular/src/app.scss‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
@import 'nativescript-theme-core/scss/light';
22
@import 'nativescript-theme-core/scss/index';
33

4-
button, label, stack-layout {
5-
horizontal-align: center;
4+
button,
5+
label,
6+
stack-layout {
7+
horizontal-align: center;
68
}
79

810
button {
9-
font-size: 36;
11+
font-size: 36;
1012
}
1113

1214
.title {
13-
font-size: 30;
14-
margin: 20;
15+
font-size: 30;
16+
margin: 20;
1517
}
1618

1719
.message {
18-
font-size: 20;
19-
color: #284848;
20-
text-align: center;
21-
margin: 0 20;
22-
}
20+
font-size: 20;
21+
color: #284848;
22+
text-align: center;
23+
margin: 0 20;
24+
}
25+
26+
.rounded {
27+
border-radius: 20;
28+
}

‎apps/demo/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "SEE LICENSE IN <your-license-filename>",
55
"repository": "<fill-your-repository-here>",
66
"dependencies": {
7-
"@nativescript/core": "file:../../node_modules/@nativescript/core",
7+
"@nativescript/core": "*",
88
"@nativescript/rive": "file:../../packages/rive",
99
"@nativescript/flutter": "file:../../packages/flutter",
1010
"@nativescript/ionic-portals": "file:../../packages/ionic-portals",
@@ -13,7 +13,7 @@
1313
"@nativescript/ui-charts": "file:../../packages/ui-charts"
1414
},
1515
"devDependencies": {
16-
"@nativescript/android": "~8.8.0",
17-
"@nativescript/ios": "~8.8.0"
16+
"@nativescript/android": "~8.9.0",
17+
"@nativescript/ios": "~8.9.0"
1818
}
1919
}

‎apps/demo/project.json‎

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,8 @@
1212
"production": true,
1313
"uglify": true,
1414
"release": true,
15-
"forDevice": true
16-
},
17-
"dependsOn": [
18-
{
19-
"target": "build.all",
20-
"dependencies": true
21-
}
22-
]
23-
},
24-
"ios": {
25-
"executor": "@nativescript/nx:build",
26-
"options": {
27-
"platform": "ios",
28-
"noHmr": true
15+
"forDevice": true,
16+
"tsConfig": "apps/demo/tsconfig.json"
2917
},
3018
"dependsOn": [
3119
{
@@ -44,27 +32,22 @@
4432
"debug": false
4533
}
4634
},
47-
"android": {
48-
"executor": "@nativescript/nx:build",
49-
"options": {
50-
"platform": "android",
51-
"noHmr": true
52-
},
53-
"dependsOn": [
54-
{
55-
"target": "build.all",
56-
"dependencies": true
57-
}
58-
]
59-
},
6035
"clean": {
61-
"executor": "@nativescript/nx:build",
62-
"options": {
63-
"clean": true
64-
}
36+
"executor": "@nativescript/nx:clean",
37+
"options": {}
6538
},
6639
"lint": {
6740
"executor": "@nx/eslint:lint"
41+
},
42+
"debug": {
43+
"executor": "@nativescript/nx:debug",
44+
"options": {
45+
"noHmr": true,
46+
"uglify": false,
47+
"release": false,
48+
"forDevice": false,
49+
"prepare": false
50+
}
6851
}
6952
}
7053
}

‎apps/demo/src/app.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,7 @@ TextView {
5454
.v-top {
5555
vertical-align: top;
5656
}
57+
58+
.rounded {
59+
border-radius: 20;
60+
}

‎apps/demo/src/main-page.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<StackLayout class="p-20">
66
<ScrollView class="h-full">
77
<StackLayout>
8-
<Button text="flutter" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
9-
<Button text="ionic-portals" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
10-
<Button text="jetpack-compose" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
11-
<Button text="rive" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
12-
<Button text="swift-ui" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
13-
<Button text="ui-charts" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
8+
<Button text="flutter" tap="{{ viewDemo }}" class="btn btn-primary view-demo rounded"/>
9+
<Button text="ionic-portals" tap="{{ viewDemo }}" class="btn btn-primary view-demo rounded"/>
10+
<Button text="jetpack-compose" tap="{{ viewDemo }}" class="btn btn-primary view-demo rounded"/>
11+
<Button text="rive" tap="{{ viewDemo }}" class="btn btn-primary view-demo rounded"/>
12+
<Button text="swift-ui" tap="{{ viewDemo }}" class="btn btn-primary view-demo rounded"/>
13+
<Button text="ui-charts" tap="{{ viewDemo }}" class="btn btn-primary view-demo rounded"/>
1414
</StackLayout>
1515
</ScrollView>
1616
</StackLayout>

‎nx.json‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,21 @@
3838
"useDaemonProcess": false,
3939
"parallel": 1,
4040
"useInferencePlugins": false,
41-
"defaultBase": "master"
41+
"defaultBase": "master",
42+
"release": {
43+
"releaseTagPattern": "{version}-{projectName}",
44+
"projects": ["packages/*"],
45+
"projectsRelationship": "independent",
46+
"changelog": {
47+
"workspaceChangelog": false,
48+
"projectChangelogs": {
49+
"renderOptions": {
50+
"authors": true,
51+
"commitReferences": true,
52+
"versionTitleDate": true
53+
}
54+
}
55+
}
56+
},
57+
"useLegacyCache": true
4258
}

0 commit comments

Comments
 (0)