Skip to content

Commit a4c398c

Browse files
author
Maxime GRIS
authored
Merge pull request #6 from david-x-chen/main
Upgraded to tauri v2, Angular v18
2 parents c165c20 + bb452e7 commit a4c398c

11 files changed

Lines changed: 1326 additions & 33633 deletions

File tree

.eslintrc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"ignorePatterns": [
44
"src-tauri/**/*", // ignore nodeJs files
55
"dist/**/*",
6-
"release/**/*"
6+
"release/**/*",
7+
"src/environments/*.ts"
78
],
89
"overrides": [
910
{
@@ -19,8 +20,7 @@
1920
"createDefaultProgram": true
2021
},
2122
"extends": [
22-
"plugin:@angular-eslint/ng-cli-compat",
23-
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
23+
"plugin:@angular-eslint/recommended",
2424
"plugin:@angular-eslint/template/process-inline-templates"
2525
],
2626
"rules": {

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
if: matrix.platform == 'ubuntu-latest'
5757
run: |
5858
sudo apt-get update
59-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
59+
sudo apt-get install -y libgtk-3-dev libappindicator3-dev librsvg2-dev patchelf libsoup-3.0 libwebkit2gtk-4.1-dev
6060
6161
- name: Install Dependencies
6262
run: npm i && npm i -D cli-truncate

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ testem.log
4444
.DS_Store
4545
Thumbs.db
4646

47+
package-lock.json
4748

4849
# Tauri
4950
src-tauri/target
5051
src-tauri/WixTools
52+
src-tauri/gen

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212

1313
# Introduction
1414

15-
Bootstrap and package your project with Angular 16 (Typescript + SASS + Hot Reload) and Tauri (Rust) for creating Desktop applications.
15+
Bootstrap and package your project with Angular 18 (Typescript + SASS + Hot Reload) and Tauri (Rust) for creating Desktop applications.
1616

1717
Currently runs with:
1818

19-
- Angular v16.2.12
20-
- Tauri 1.5.3
19+
- Angular v18.2.7
20+
- Tauri 2.0.0
2121

2222
With this sample, you can:
2323

2424
- Run your app in a local development environment with Tauri & Hot reload
2525
- Run your app in a production environment
2626
- Package your app into an executable file for Linux, Windows & Mac
2727

28-
/!\ Angular CLI needs Node 16 or later to work correctly.
28+
/!\ Angular CLI needs Node 22 or later to work correctly.
2929

3030
## Getting Started
3131

@@ -52,10 +52,10 @@ Please follow [Angular-cli documentation](https://github.com/angular/angular-cli
5252
npm install -g @angular/cli
5353
```
5454

55-
Older @angular/cli references may grab angular version 15. To update to angular version 16 specifically for the global cli run:
55+
Older @angular/cli references may grab angular version 16. To update to angular version 18 specifically for the global cli run:
5656

5757
``` bash
58-
npm install -g @angular/cli@^16
58+
npm install -g @angular/cli@^18
5959
```
6060

6161
## To build for development

angular.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@
7575
"builder": "@angular-devkit/build-angular:dev-server",
7676
"configurations": {
7777
"production": {
78-
"browserTarget": "angular-tauri:build:production"
78+
"buildTarget": "angular-tauri:build:production"
7979
},
8080
"development": {
81-
"browserTarget": "angular-tauri:build:development"
81+
"buildTarget": "angular-tauri:build:development"
8282
}
8383
},
8484
"defaultConfiguration": "development"
8585
},
8686
"extract-i18n": {
8787
"builder": "@angular-devkit/build-angular:extract-i18n",
8888
"options": {
89-
"browserTarget": "angular-tauri:build"
89+
"buildTarget": "angular-tauri:build"
9090
}
9191
},
9292
"test": {

0 commit comments

Comments
 (0)