Skip to content
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [2.6.0-dev-test] - 2025-07-15

- Migrate to angular 19

## [2.5.0-dev-test] - 2025-07-15

- Migrate to angular 18
Expand Down
144 changes: 72 additions & 72 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,90 +51,90 @@
}
]
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ngx-jsonapi:build"
},
"configurations": {
"production": {
"browserTarget": "ngx-jsonapi:build:production"
}
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"buildTarget": "ngx-jsonapi:build"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ngx-jsonapi:build"
"configurations": {
"production": {
"buildTarget": "ngx-jsonapi:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"buildTarget": "ngx-jsonapi:build"
}
}
},
"ngx-jsonapi-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "ngx-jsonapi:serve"
}
}
},
"ngx-jsonapi-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "ngx-jsonapi:serve"
}
}
},
"ngx-jsonapi-lib": {
"projectType": "library",
"root": "projects/ngx-jsonapi-lib",
"sourceRoot": "projects/ngx-jsonapi-lib/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "projects/ngx-jsonapi-lib/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/ngx-jsonapi-lib/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "projects/ngx-jsonapi-lib/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
}
},
"ngx-jsonapi-lib": {
"projectType": "library",
"root": "projects/ngx-jsonapi-lib",
"sourceRoot": "projects/ngx-jsonapi-lib/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "projects/ngx-jsonapi-lib/ng-package.json"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "projects/ngx-jsonapi-lib/tsconfig.spec.json",
"polyfills": [
"zone.js",
"zone.js/testing"
]
"configurations": {
"production": {
"tsConfig": "projects/ngx-jsonapi-lib/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "projects/ngx-jsonapi-lib/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "projects/ngx-jsonapi-lib/tsconfig.spec.json",
"polyfills": [
"zone.js",
"zone.js/testing"
]
}
}
}
}
},
"schematics": {
"@schematics/angular:component": {
"inlineStyle": true,
"inlineTemplate": true,
"flat": true,
"skipTests": true,
"prefix": "bc",
"style": "css"
},
"schematics": {
"@schematics/angular:component": {
"inlineStyle": true,
"inlineTemplate": true,
"flat": true,
"skipTests": true,
"prefix": "bc",
"style": "css"
},
"@schematics/angular:directive": {
"prefix": "bc"
}
},
"cli": {
"analytics": false
"@schematics/angular:directive": {
"prefix": "bc"
}
},
"cli": {
"analytics": false
}
}
8 changes: 6 additions & 2 deletions demo/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import { Component, OnInit } from '@angular/core';
import { Component } from '@angular/core';
import { JsonapiCore } from 'ngx-jsonapi';
import { RouterModule } from '@angular/router';
import { CommonModule } from '@angular/common';

@Component({
selector: 'demo-app',
styleUrls: ['./app.component.scss'],
standalone: true,
imports: [RouterModule, CommonModule],
templateUrl: './app.component.html'
})
export class AppComponent /* implements OnInit */ {
export class AppComponent {
public loading: string = '';

public constructor(
Expand Down
2 changes: 1 addition & 1 deletion demo/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ const appRoutes: Routes = [
BrowserModule,
HttpClientModule,
SharedModule,
AppComponent,
RouterModule.forRoot(appRoutes, { useHash: true }),
NgxJsonapiModule.forRoot({
url: environment.api_saldo,
})
],
declarations: [AppComponent],
bootstrap: [AppComponent]
})
export class AppModule {}
7 changes: 3 additions & 4 deletions demo/app/authors/authors.module.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { AuthorComponent } from './components/author.component';
import { AuthorsComponent } from './components/authors.component';
import { AuthorsRoutingModule } from './authors-routing.module';
import { SharedModule } from '../shared/shared.module';
import { AuthorComponent } from './components/author.component';
import { AuthorsComponent } from './components/authors.component';

@NgModule({
imports: [CommonModule, SharedModule, AuthorsRoutingModule],
declarations: [AuthorComponent, AuthorsComponent]
imports: [CommonModule, SharedModule, AuthorsRoutingModule, AuthorComponent, AuthorsComponent]
})
export class AuthorsModule {}
5 changes: 5 additions & 0 deletions demo/app/authors/components/author.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ import { Resource } from 'ngx-jsonapi';
import { PhotosService } from '../../photos/photos.service';
import { AuthorsService, Author } from '../authors.service';
import { BooksService } from '../../books/books.service';
import { CommonModule } from '@angular/common';
import { CollectionInfoComponent } from '../../shared/collection-info.component';
import { ResourceInfoComponent } from '../../shared/resource-info.component';

@Component({
selector: 'demo-author',
standalone: true,
imports: [CommonModule, CollectionInfoComponent, ResourceInfoComponent],
templateUrl: './author.component.html'
})
export class AuthorComponent {
Expand Down
5 changes: 5 additions & 0 deletions demo/app/authors/components/authors.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ import { Component } from '@angular/core';
import { DocumentCollection } from 'ngx-jsonapi';
import { AuthorsService, Author } from './../authors.service';
import { ActivatedRoute } from '@angular/router';
import { CommonModule } from '@angular/common';
import { CollectionInfoComponent } from '../../shared/collection-info.component';
import { CollectionPaginatorComponent } from '../../shared/collection-paginator.component';

@Component({
selector: 'demo-authors',
standalone: true,
imports: [CommonModule, CollectionInfoComponent, CollectionPaginatorComponent],
templateUrl: './authors.component.html'
})
export class AuthorsComponent {
Expand Down
7 changes: 3 additions & 4 deletions demo/app/books/books.module.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { BookComponent } from './components/book.component';
import { BooksComponent } from './components/books.component';
import { BooksRoutingModule } from './books-routing.module';
import { SharedModule } from '../shared/shared.module';
import { BookComponent } from './components/book.component';
import { BooksComponent } from './components/books.component';

@NgModule({
imports: [CommonModule, SharedModule, BooksRoutingModule],
declarations: [BookComponent, BooksComponent]
imports: [CommonModule, SharedModule, BooksRoutingModule, BookComponent, BooksComponent]
})
export class BooksModule {}
4 changes: 4 additions & 0 deletions demo/app/books/components/book.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import { Component } from '@angular/core';
import { CommonModule } from '@angular/common';
import { ActivatedRoute } from '@angular/router';
import { Resource } from 'ngx-jsonapi';
import { AuthorsService } from '../../authors/authors.service';
import { BooksService, Book } from './../books.service';
import { PhotosService } from '../../photos/photos.service';
import { ResourceInfoComponent } from '../../shared/resource-info.component';

@Component({
selector: 'demo-book',
imports: [CommonModule, ResourceInfoComponent],
standalone: true,
templateUrl: './book.component.html'
})
export class BookComponent {
Expand Down
5 changes: 5 additions & 0 deletions demo/app/books/components/books.component.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import { Component } from '@angular/core';
import { CommonModule } from '@angular/common';
import { Resource, DocumentCollection } from 'ngx-jsonapi';
import { BooksService, Book } from './../books.service';
import { AuthorsService } from './../../authors/authors.service';
import { PhotosService } from '../../photos/photos.service';
import { ActivatedRoute } from '@angular/router';
import { Observable } from 'rxjs';
import { CollectionInfoComponent } from '../../shared/collection-info.component';
import { CollectionPaginatorComponent } from '../../shared/collection-paginator.component';

@Component({
selector: 'demo-books',
imports: [CommonModule, CollectionInfoComponent, CollectionPaginatorComponent],
standalone: true,
templateUrl: './books.component.html'
})
export class BooksComponent {
Expand Down
3 changes: 3 additions & 0 deletions demo/app/shared/collection-info.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { Component, Input } from '@angular/core';
import { CommonModule } from '@angular/common';
import { DocumentCollection } from 'ngx-jsonapi';
@Component({
selector: 'demo-collection-info',
imports: [CommonModule],
standalone: true,
templateUrl: './collection-info.component.html'
})
export class CollectionInfoComponent {
Expand Down
4 changes: 4 additions & 0 deletions demo/app/shared/collection-paginator.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { Component, Input } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { DocumentCollection } from 'ngx-jsonapi';
@Component({
selector: 'demo-collection-paginator',
standalone: true,
imports: [CommonModule, RouterModule],
templateUrl: './collection-paginator.component.html'
})
export class CollectionPaginatorComponent {
Expand Down
3 changes: 3 additions & 0 deletions demo/app/shared/resource-info.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { Component, Input } from '@angular/core';
import { CommonModule } from '@angular/common';
import { DocumentResource } from 'ngx-jsonapi';
@Component({
selector: 'demo-resource-info',
imports: [CommonModule],
standalone: true,
templateUrl: './resource-info.component.html'
})
export class ResourceInfoComponent {
Expand Down
5 changes: 2 additions & 3 deletions demo/app/shared/shared.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import { ResourceInfoComponent } from './resource-info.component';
import { CollectionPaginatorComponent } from './collection-paginator.component';
import { RouterModule } from '@angular/router';
@NgModule({
imports: [CommonModule, RouterModule],
exports: [CollectionInfoComponent, ResourceInfoComponent, CollectionPaginatorComponent],
declarations: [CollectionInfoComponent, ResourceInfoComponent, CollectionPaginatorComponent]
imports: [CommonModule, RouterModule, CollectionInfoComponent, ResourceInfoComponent, CollectionPaginatorComponent],
exports: [CollectionInfoComponent, ResourceInfoComponent, CollectionPaginatorComponent]
})
export class SharedModule {}
9 changes: 6 additions & 3 deletions demo/app/systems/systems.component.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { Component, OnInit } from '@angular/core';
import { Component } from '@angular/core';
import { CommonModule } from '@angular/common';
import { ActivatedRoute } from '@angular/router';
import { DocumentCollection } from 'ngx-jsonapi';
import { System, SystemsService } from './systems.service';
import { CollectionInfoComponent } from '../shared/collection-info.component';
import { CollectionPaginatorComponent } from '../shared/collection-paginator.component';

@Component({
selector: 'bc-systems',
templateUrl: './systems.component.html',
styles: [
]
standalone: true,
imports: [CommonModule, CollectionInfoComponent, CollectionPaginatorComponent]
})
export class SystemsComponent {
public systems: DocumentCollection<System>;
Expand Down
4 changes: 1 addition & 3 deletions demo/app/systems/systems.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ export class SystemsRoutingModule { }


@NgModule({
declarations: [
SystemsComponent
],
imports: [
CommonModule,
SharedModule,
SystemsComponent,
SystemsRoutingModule
],
providers: [SystemsService]
Expand Down
Loading