Skip to content

Commit 4a10f56

Browse files
CatchABusCatchABus
authored
Merge branch 'NativeScript:main' into android-app-resources-imp
2 parents c562af4 + 82b5e27 commit 4a10f56

File tree

41 files changed

+140
-378
lines changed

Some content is hidden

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

41 files changed

+140
-378
lines changed

‎.github/workflows/publish_npm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: '@nativescript/template-* -> npm'
22

33
on:
44
push:
5-
branches: [ 'master' ]
5+
branches: [ 'main' ]
66

77
env:
88
NPM_TAG: 'next'

‎.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: push
44

55
jobs:
66
test:
7-
runs-on: macos-latest
7+
runs-on: macos-12
88

99
name: ${{ matrix.template }} (node ${{ matrix.node }})
1010

@@ -80,7 +80,7 @@ jobs:
8080
8181
npm install
8282
npm run prepare-templates
83-
83+
8484
# - name: "Uninstall [email protected]"
8585
# run: |
8686
# SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager
@@ -117,7 +117,7 @@ jobs:
117117
# );
118118
# fs.writeFileSync(appGradlePath, contents);
119119
# EOT
120-
#
120+
#
121121
# node _fix_ndk_version.js
122122
123123
ns build android

‎packages/template-blank-ng/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "src/main.ts",
44
"displayName": "Blank",
55
"templateType": "App template",
6-
"version": "8.2.0",
6+
"version": "8.3.1",
77
"description": "Blank template for NativeScript apps using Angular",
88
"author": "NativeScript Team <[email protected]>",
99
"license": "Apache-2.0",
@@ -39,26 +39,26 @@
3939
"url": "https://github.com/NativeScript/NativeScript/issues"
4040
},
4141
"dependencies": {
42-
"@angular/animations": "~13.2.0",
43-
"@angular/common": "~13.2.0",
44-
"@angular/compiler": "~13.2.0",
45-
"@angular/core": "~13.2.0",
46-
"@angular/forms": "~13.2.0",
47-
"@angular/platform-browser": "~13.2.0",
48-
"@angular/platform-browser-dynamic": "~13.2.0",
49-
"@angular/router": "~13.2.0",
50-
"@nativescript/angular": "^13.0.0",
51-
"@nativescript/core": "~8.2.0",
42+
"@angular/animations": "~14.2.0",
43+
"@angular/common": "~14.2.0",
44+
"@angular/compiler": "~14.2.0",
45+
"@angular/core": "~14.2.0",
46+
"@angular/forms": "~14.2.0",
47+
"@angular/platform-browser": "~14.2.0",
48+
"@angular/platform-browser-dynamic": "~14.2.0",
49+
"@angular/router": "~14.2.0",
50+
"@nativescript/angular": "~14.2.0",
51+
"@nativescript/core": "~8.3.0",
5252
"@nativescript/theme": "~3.0.2",
5353
"rxjs": "~7.5.0",
5454
"zone.js": "~0.11.5"
5555
},
5656
"devDependencies": {
57-
"@angular-devkit/build-angular": "~13.2.0",
58-
"@angular/compiler-cli": "~13.2.0",
59-
"@nativescript/types": "~8.2.0",
57+
"@angular-devkit/build-angular": "~14.2.0",
58+
"@angular/compiler-cli": "~14.2.0",
59+
"@nativescript/types": "~8.3.0",
6060
"@nativescript/webpack": "~5.0.6",
61-
"@ngtools/webpack": "~13.2.0",
62-
"typescript": "~4.5.5"
61+
"@ngtools/webpack": "~14.2.0",
62+
"typescript": "~4.7.0"
6363
}
6464
}

‎packages/template-blank-react/.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# use legacy peer deps to avoid peer dependency resolution failures
2+
legacy-peer-deps=true

‎packages/template-blank-react/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/template-blank-react",
3-
"version": "8.2.0",
3+
"version": "8.3.0",
44
"description": "Blank template for NativeScript apps using React.",
55
"author": "Jamie Birch <[email protected]>",
66
"main": "src/app.ts",
@@ -29,6 +29,7 @@
2929
"tools",
3030
"!tools/assets",
3131
".editorconfig",
32+
".npmrc",
3233
"references.d.ts",
3334
"tsconfig.json"
3435
],
@@ -41,14 +42,14 @@
4142
"template"
4243
],
4344
"dependencies": {
44-
"@nativescript/core": "~8.2.0",
45+
"@nativescript/core": "~8.3.0",
4546
"@react-navigation/core": "^5.15.3",
4647
"react": "~16.13.1",
47-
"react-nativescript": "^3.0.0-beta.1",
48+
"react-nativescript": "^3.0.0-beta.3",
4849
"react-nativescript-navigation": "3.0.0-beta.2"
4950
},
5051
"devDependencies": {
51-
"@nativescript/types": "~8.2.0",
52+
"@nativescript/types": "~8.3.0",
5253
"@nativescript/webpack": "~5.0.6",
5354
"@types/react": "16.9.34",
5455
"patch-package": "~6.4.7",

‎packages/template-blank-svelte/.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# use legacy peer deps to avoid peer dependency resolution failures
2+
legacy-peer-deps=true

‎packages/template-blank-svelte/app/app.css

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1-
/*
2-
In NativeScript, the app.css file is where you place CSS rules that
3-
you would like to apply to your entire application. Check out
4-
http://docs.nativescript.org/ui/styling for a full list of the CSS
5-
selectors and properties you can use to style UI components.
6-
7-
/*
8-
In many cases you may want to use the NativeScript core theme instead
9-
of writing your own CSS rules. For a full list of class names in the theme
10-
refer to http://docs.nativescript.org/ui/theme.
11-
The imported CSS rules must precede all other types of rules.
12-
*/
13-
@import '@nativescript/theme/css/core.css';
1+
@import '@nativescript/theme/css/core.css';
142
@import '@nativescript/theme/css/default.css';
153

16-
/* Font icon class */
174
.fab {
185
font-family: 'Font Awesome 5 Brands', 'fa-brands-400';
196
font-weight: 400;

‎packages/template-blank-svelte/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "app/app.ts",
44
"displayName": "Blank Svelte",
55
"templateType": "App template",
6-
"version": "8.2.0",
6+
"version": "8.3.0",
77
"description": "Blank template for NativeScript apps using Svelte",
88
"author": "NativeScript Team <[email protected]>",
99
"license": "Apache-2.0",
@@ -18,6 +18,7 @@
1818
"tools",
1919
"!tools/assets",
2020
".editorconfig",
21+
".npmrc",
2122
"svelte.config.js",
2223
"tsconfig.json"
2324
],
@@ -41,12 +42,12 @@
4142
"url": "https://github.com/NativeScript/NativeScript/issues"
4243
},
4344
"dependencies": {
44-
"@nativescript/core": "~8.2.0",
45+
"@nativescript/core": "~8.3.0",
4546
"@nativescript/theme": "~3.0.2",
4647
"svelte-native": "~1.0.0"
4748
},
4849
"devDependencies": {
49-
"@nativescript/types": "~8.2.0",
50+
"@nativescript/types": "~8.3.0",
5051
"@nativescript/webpack": "~5.0.6",
5152
"svelte": "~3.44.0",
5253
"svelte-loader": "^3.1.2",

‎packages/template-blank-ts/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "app/app.ts",
44
"displayName": "Blank",
55
"templateType": "App template",
6-
"version": "8.2.0",
6+
"version": "8.3.0",
77
"description": "Blank template for Vanilla NativeScript apps using TypeScript",
88
"author": "NativeScript Team <[email protected]>",
99
"license": "Apache-2.0",
@@ -38,11 +38,11 @@
3838
"url": "https://github.com/NativeScript/NativeScript/issues"
3939
},
4040
"dependencies": {
41-
"@nativescript/core": "~8.2.0",
41+
"@nativescript/core": "~8.3.0",
4242
"@nativescript/theme": "~3.0.2"
4343
},
4444
"devDependencies": {
45-
"@nativescript/types": "~8.2.0",
45+
"@nativescript/types": "~8.3.0",
4646
"@nativescript/webpack": "~5.0.6",
4747
"typescript": "~4.5.5"
4848
}

‎packages/template-blank-vue-ts/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@nativescript/template-blank-vue-ts",
33
"main": "app/app.ts",
44
"displayName": "Blank Vue Typescript",
5-
"version": "8.2.0",
5+
"version": "8.3.0",
66
"description": "Blank Typescript template for NativeScript apps using Vue.",
77
"author": "NativeScript Team <[email protected]>",
88
"license": "Apache-2.0",
@@ -41,12 +41,12 @@
4141
"category-general"
4242
],
4343
"dependencies": {
44-
"@nativescript/core": "~8.2.0",
44+
"@nativescript/core": "~8.3.0",
4545
"@nativescript/theme": "~3.0.2",
4646
"nativescript-vue": "~2.9.0"
4747
},
4848
"devDependencies": {
49-
"@nativescript/types": "~8.2.0",
49+
"@nativescript/types": "~8.3.0",
5050
"@nativescript/webpack": "~5.0.6",
5151
"@types/node": "~17.0.21",
5252
"nativescript-vue-template-compiler": "~2.9.0",

‎packages/template-blank-vue/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@nativescript/template-blank-vue",
33
"main": "app/app.js",
44
"displayName": "Blank",
5-
"version": "8.2.0",
5+
"version": "8.3.0",
66
"description": "Blank template for NativeScript apps using Vue.",
77
"author": "NativeScript Team <[email protected]>",
88
"license": "Apache-2.0",
@@ -40,7 +40,7 @@
4040
"category-general"
4141
],
4242
"dependencies": {
43-
"@nativescript/core": "~8.2.0",
43+
"@nativescript/core": "~8.3.0",
4444
"@nativescript/theme": "~3.0.2",
4545
"nativescript-vue": "~2.9.0"
4646
},

‎packages/template-blank/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "app/app.js",
44
"displayName": "Blank",
55
"templateType": "App template",
6-
"version": "8.2.0",
6+
"version": "8.3.0",
77
"description": "Blank template for Vanilla NativeScript apps using JavaScript",
88
"author": "NativeScript Team <[email protected]>",
99
"license": "Apache-2.0",
@@ -38,7 +38,7 @@
3838
"url": "https://github.com/NativeScript/NativeScript/issues"
3939
},
4040
"dependencies": {
41-
"@nativescript/core": "~8.2.0",
41+
"@nativescript/core": "~8.3.0",
4242
"@nativescript/theme": "~3.0.2"
4343
},
4444
"devDependencies": {

‎packages/template-drawer-navigation-ng/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "src/main.ts",
44
"displayName": "Navigation Drawer",
55
"templateType": "App template",
6-
"version": "8.2.0",
6+
"version": "8.3.1",
77
"description": "Side navigation template",
88
"author": "NativeScript Team <[email protected]>",
99
"license": "Apache-2.0",
@@ -41,27 +41,27 @@
4141
"url": "https://github.com/NativeScript/NativeScript/issues"
4242
},
4343
"dependencies": {
44-
"@angular/animations": "~13.2.0",
45-
"@angular/common": "~13.2.0",
46-
"@angular/compiler": "~13.2.0",
47-
"@angular/core": "~13.2.0",
48-
"@angular/forms": "~13.2.0",
49-
"@angular/platform-browser": "~13.2.0",
50-
"@angular/platform-browser-dynamic": "~13.2.0",
51-
"@angular/router": "~13.2.0",
52-
"@nativescript/angular": "^13.0.0",
53-
"@nativescript/core": "~8.2.0",
44+
"@angular/animations": "~14.2.0",
45+
"@angular/common": "~14.2.0",
46+
"@angular/compiler": "~14.2.0",
47+
"@angular/core": "~14.2.0",
48+
"@angular/forms": "~14.2.0",
49+
"@angular/platform-browser": "~14.2.0",
50+
"@angular/platform-browser-dynamic": "~14.2.0",
51+
"@angular/router": "~14.2.0",
52+
"@nativescript/angular": "~14.2.0",
53+
"@nativescript/core": "~8.3.0",
5454
"@nativescript/theme": "~3.0.2",
5555
"nativescript-ui-sidedrawer": "~10.0.2",
5656
"rxjs": "~7.5.0",
5757
"zone.js": "~0.11.5"
5858
},
5959
"devDependencies": {
60-
"@angular-devkit/build-angular": "~13.2.0",
61-
"@angular/compiler-cli": "~13.2.0",
62-
"@nativescript/types": "~8.2.0",
60+
"@angular-devkit/build-angular": "~14.2.0",
61+
"@angular/compiler-cli": "~14.2.0",
62+
"@nativescript/types": "~8.3.0",
6363
"@nativescript/webpack": "~5.0.6",
64-
"@ngtools/webpack": "~13.2.0",
65-
"typescript": "~4.5.5"
64+
"@ngtools/webpack": "~14.2.0",
65+
"typescript": "~4.7.0"
6666
}
6767
}

‎packages/template-drawer-navigation-ng/src/app/app.component.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
RadSideDrawer is a UI component part of the Progress NativeScript UI set of components.
3-
Learn more about the RadSideDrawer UI component and how it can be customized in this documentation article:
4-
https://docs.nativescript.org/angular/ui/professional-ui-components/ng-SideDrawer/getting-started
5-
-->
61
<RadSideDrawer [drawerTransition]="sideDrawerTransition">
72
<GridLayout tkDrawerContent rows="auto, *" class="nt-drawer__content">
83
<StackLayout row="0" class="nt-drawer__header">

‎packages/template-drawer-navigation-ts/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "src/main.ts",
44
"displayName": "Navigation Drawer",
55
"templateType": "App template",
6-
"version": "8.2.0",
6+
"version": "8.3.0",
77
"description": "Side navigation template",
88
"author": "NativeScript Team <[email protected]>",
99
"license": "Apache-2.0",
@@ -40,13 +40,13 @@
4040
"url": "https://github.com/NativeScript/NativeScript/issues"
4141
},
4242
"dependencies": {
43-
"@nativescript/core": "~8.2.0",
43+
"@nativescript/core": "~8.3.0",
4444
"@nativescript/theme": "~3.0.2",
4545
"nativescript-ui-sidedrawer": "~10.0.2",
4646
"rxjs": "~7.5.0"
4747
},
4848
"devDependencies": {
49-
"@nativescript/types": "~8.2.0",
49+
"@nativescript/types": "~8.3.0",
5050
"@nativescript/webpack": "~5.0.6",
5151
"typescript": "~4.5.5"
5252
}

‎packages/template-drawer-navigation-ts/src/app-root/app-root.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
RadSideDrawer is a UI component part of the Progress NativeScript UI set of components.
3-
Learn more about the RadSideDrawer UI component and how it can be customized in this documentation article:
4-
https://docs.nativescript.org/ui/professional-ui-components/SideDrawer/getting-started
5-
-->
61
<nsDrawer:RadSideDrawer
72
id="sideDrawer"
83
xmlns:nsDrawer="nativescript-ui-sidedrawer"

‎packages/template-drawer-navigation-vue/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "app/app.js",
44
"displayName": "Navigation Drawer",
55
"templateType": "App template",
6-
"version": "8.2.0",
6+
"version": "8.3.0",
77
"description": "Side navigation template using Vue.",
88
"author": "NativeScript Team <[email protected]>",
99
"license": "Apache-2.0",
@@ -41,7 +41,7 @@
4141
"url": "https://github.com/NativeScript/NativeScript/issues"
4242
},
4343
"dependencies": {
44-
"@nativescript/core": "~8.2.0",
44+
"@nativescript/core": "~8.3.0",
4545
"@nativescript/theme": "~3.0.2",
4646
"nativescript-ui-sidedrawer": "~10.0.2",
4747
"nativescript-vue": "~2.9.0",

‎packages/template-drawer-navigation/app/app-root/app-root.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
RadSideDrawer is a UI component part of the Progress NativeScript UI set of components.
3-
Learn more about the RadSideDrawer UI component and how it can be customized in this documentation article:
4-
https://docs.nativescript.org/ui/professional-ui-components/SideDrawer/getting-started
5-
-->
61
<nsDrawer:RadSideDrawer
72
id="sideDrawer"
83
xmlns:nsDrawer="nativescript-ui-sidedrawer"

0 commit comments

Comments
 (0)