Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: nx migrate @nativescript/plugin-tools and touchups #30

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
4 changes: 2 additions & 2 deletions apps/demo-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"@triniwiz/nativescript-masonkit": "file:../../dist/packages/nativescript-masonkit"
},
"devDependencies": {
"@nativescript/android": "8.5.1",
"@nativescript/ios": "8.5.2",
"@nativescript/android": "^8.6.2",
"@nativescript/ios": "^8.6.3",
"@nativescript/detox": "1.0.1",
"detox": "20.1.1",
"pixelmatch": "5.3.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"repository": "<fill-your-repository-here>",
"dependencies": {
"@nativescript/core": "file:../../node_modules/@nativescript/core",
"@triniwiz/nativescript-masonkit": "file:../../dist/packages/nativescript-masonkit"
"@triniwiz/nativescript-masonkit": "file:../../packages/nativescript-masonkit"
},
"devDependencies": {
"@nativescript/android": "^8.6.2",
Expand Down
1 change: 0 additions & 1 deletion apps/demo/src/main-page.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<StackLayout class="p-20">
<ScrollView class="h-full">
<StackLayout>
<Button text="add a package first" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
<Button text="nativescript-masonkit" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
</StackLayout>
</ScrollView>
Expand Down
87 changes: 42 additions & 45 deletions apps/demo/src/plugin-demos/nativescript-masonkit.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" class="p"
xmlns:ui="@triniwiz/nativescript-masonkit">
xmlns:ui="@triniwiz/nativescript-masonkit">
<Page.actionBar>
<ActionBar title="nativescript-masonkit" icon="" class="action-bar">
</ActionBar>
</Page.actionBar>


<!-- <ui:Flex class="flex-example" color="white">
<!-- <ui:Flex class="flex-example" color="white">
<Label text="a" class="a"/>
<Label text="b" class="b"/>
</ui:Flex> -->




<!-- https://gridbyexample.com/examples/example5/ -->
Expand All @@ -21,30 +21,30 @@
<ui:Grid class="wrapper-5">

<ui:Grid class="box a">
<Label text="A" />
<Label text="A" />
</ui:Grid>

<ui:Grid class="box b">
<Label text="B" />
<ui:Grid class="box b">
<Label text="B" />
</ui:Grid>

<ui:Grid class="box c">
<Label text="C" />
<ui:Grid class="box c">
<Label text="C" />
</ui:Grid>

<ui:Grid class="box d">
<Label text="D" />
<ui:Grid class="box d">
<Label text="D" />
</ui:Grid>
</ui:Grid>



<!--
https://gridbyexample.com/examples/example26/ -->



<!-- <ui:Container class="wrapper-6">
<!-- <ui:Container class="wrapper-6">
<ui:Container class="box a">
<Label text="This is box A."></Label>
<Label text="align-self: stretch"></Label>
Expand All @@ -66,9 +66,7 @@
</ui:Container>

<ui:Container class="box e">
<Label
textWrap="true"
text="Each of the boxes on the left has a grid area of 3 columns and 3 rows (we're counting the gutter col/row). So each covers the same size area as box A."></Label>
<Label textWrap="true" text="Each of the boxes on the left has a grid area of 3 columns and 3 rows (we're counting the gutter col/row). So each covers the same size area as box A."></Label>
<Label text="The align-self property is used to align the content inside the grid-area."></Label>
</ui:Container>

Expand Down Expand Up @@ -96,13 +94,13 @@
<ui:TSCView class="bg-red" width="100%" height="100%" flexDirection="column" backgroundColor="red" rows="auto,auto">
<Label text="First"/>
</ui:TSCView>
<ui:TSCView width="100%" height="100%" flexDirection="column" backgroundColor="blue" rows="auto,auto">
<ui:TSCView width="100%" height="100%" flexDirection="column" backgroundColor="blue" rows="auto,auto">
<Label text="Second"/>
</ui:TSCView>
<ui:TSCView width="100%" height="100%" flexDirection="column" backgroundColor="purple" rows="auto,auto">
<ui:TSCView width="100%" height="100%" flexDirection="column" backgroundColor="purple" rows="auto,auto">
<Label text="Third"/>
</ui:TSCView>
<ui:TSCView width="100%" height="100%" flexDirection="column" backgroundColor="orange" rows="auto,auto">
<ui:TSCView width="100%" height="100%" flexDirection="column" backgroundColor="orange" rows="auto,auto">
<Label text="Fourth"/>
</ui:TSCView>
</ui:TSCView> -->
Expand Down Expand Up @@ -141,8 +139,7 @@
<Button text="Test 4.3" tap="{{ testIt }}" class="btn btn-primary"/>
</ui:TSCView>

<ui:TSCView width="100%" height="100%" class="p-20" backgroundColor="purple" flexDirection="column" width="100%"
height="100%">
<ui:TSCView width="100%" height="100%" class="p-20" backgroundColor="purple" flexDirection="column" width="100%" height="100%">
<Button text="Test 1.4" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.4" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.4" tap="{{ testIt }}" class="btn btn-primary"/>
Expand All @@ -163,47 +160,47 @@
<ScrollView>
<ui:TSCView class="p-20" backgroundColor="red" flexDirection="column">
<Image width="100%" height="100%" src="https://picsum.photos/200/300"/>
<Button text="Test 1" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 1" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4" tap="{{ testIt }}" class="btn btn-primary"/>

<Image src="https://picsum.photos/200/300"/>

<ui:TSCView class="p-20" backgroundColor="green">
<Button text="Test 1.1" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.1" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.1" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.1" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 1.1" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.1" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.1" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.1" tap="{{ testIt }}" class="btn btn-primary"/>
</ui:TSCView>

<ui:TSCView class="p-20" backgroundColor="blue">
<Button text="Test 1.2" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.2" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.2" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.2" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 1.2" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.2" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.2" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.2" tap="{{ testIt }}" class="btn btn-primary"/>
</ui:TSCView>


<ui:TSCView class="p-20" backgroundColor="pink">
<Button text="Test 1.3" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.3" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.3" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.3" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 1.3" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.3" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.3" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.3" tap="{{ testIt }}" class="btn btn-primary"/>
</ui:TSCView>

<ui:TSCView width="100%" height="100%" class="p-20" backgroundColor="purple" >
<Button text="Test 1.4" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.4" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.4" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.4" tap="{{ testIt }}" class="btn btn-primary"/>
<ui:TSCView width="100%" height="100%" class="p-20" backgroundColor="purple">
<Button text="Test 1.4" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.4" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.4" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.4" tap="{{ testIt }}" class="btn btn-primary"/>
</ui:TSCView>

<ui:TSCView class="p-20" backgroundColor="yellow">
<Button text="Test 1.5" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.5" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.5" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.5" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 1.5" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 2.5" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 3.5" tap="{{ testIt }}" class="btn btn-primary"/>
<Button text="Test 4.5" tap="{{ testIt }}" class="btn btn-primary"/>
</ui:TSCView>
</ui:TSCView>
</ScrollView> -->
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"paths": {
"~/*": ["src/*"],
"@demo/shared": ["../../tools/demo/index.ts"],
"@triniwiz/*": ["../../packages/*"]
"@triniwiz/nativescript-masonkit": ["../../packages/nativescript-masonkit/index.d.ts"]
}
}
}
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"@angular/platform-browser-dynamic": "^15.0.0",
"@angular/router": "^15.0.0",
"@nativescript/angular": "^15.0.0",
"@nativescript/core": "~8.4.0",
"@nativescript/plugin-tools": "5.0.3",
"@nativescript/types": "~8.4.0",
"@nativescript/core": "~8.6.0",
"@nativescript/plugin-tools": "5.1.0",
"@nativescript/types": "~8.6.0",
"@nativescript/webpack": "~5.0.5",
"@ngtools/webpack": "^15.0.0",
"husky": "^8.0.0",
Expand All @@ -41,7 +41,6 @@
"typescript": "~4.8.0",
"zone.js": "~0.11.1",
"@angular-devkit/build-angular": "^15.0.0",
"nativescript-permissions": "1.3.11",
"cheerio": "^1.0.0-rc.12"
},
"lint-staged": {
Expand Down
5 changes: 3 additions & 2 deletions tools/assets/App_Resources/Android/app.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
//}

android {
compileSdkVersion 33
compileSdkVersion 34
buildToolsVersion "34.0.0"
defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
multiDexEnabled true
generatedDensities = []
testBuildType System.getProperty('testBuildType', 'debug')
Expand Down
5 changes: 3 additions & 2 deletions tools/assets/App_Resources/iOS/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ platform :ios, '13.0'
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
end
end
end
end
1 change: 1 addition & 0 deletions tools/assets/App_Resources/iOS/build.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
// To build for device with Xcode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
// DEVELOPMENT_TEAM = YOUR_TEAM_ID;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
IPHONEOS_DEPLOYMENT_TARGET = 13.0
1 change: 0 additions & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
],
"paths": {
"@demo/shared": ["tools/demo/index.ts"],
"@triniwiz/*": ["packages/*"],
"@triniwiz/nativescript-masonkit": ["packages/nativescript-masonkit/index.d.ts"]
}
},
Expand Down
9 changes: 0 additions & 9 deletions workspace.json

This file was deleted.