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

Upgraded to tauri v2, Angular v18 #6

Open
wants to merge 6 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
6 changes: 3 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"ignorePatterns": [
"src-tauri/**/*", // ignore nodeJs files
"dist/**/*",
"release/**/*"
"release/**/*",
"src/environments/*.ts"
],
"overrides": [
{
Expand All @@ -19,8 +20,7 @@
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
sudo apt-get install -y libgtk-3-dev libappindicator3-dev librsvg2-dev patchelf libsoup-3.0 libwebkit2gtk-4.1-dev

- name: Install Dependencies
run: npm i && npm i -D cli-truncate
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ testem.log
.DS_Store
Thumbs.db

package-lock.json

# Tauri
src-tauri/target
src-tauri/WixTools
src-tauri/gen
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@

# Introduction

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

Currently runs with:

- Angular v16.2.12
- Tauri 1.5.3
- Angular v18.2.7
- Tauri 2.0.0

With this sample, you can:

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

/!\ Angular CLI needs Node 16 or later to work correctly.
/!\ Angular CLI needs Node 22 or later to work correctly.

## Getting Started

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

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

``` bash
npm install -g @angular/cli@^16
npm install -g @angular/cli@^18
```

## To build for development
Expand Down
6 changes: 3 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,18 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "angular-tauri:build:production"
"buildTarget": "angular-tauri:build:production"
},
"development": {
"browserTarget": "angular-tauri:build:development"
"buildTarget": "angular-tauri:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "angular-tauri:build"
"buildTarget": "angular-tauri:build"
}
},
"test": {
Expand Down
Loading