Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Use Node 16
uses: actions/setup-node@v4
with:
node-version: '16.x'
node-version: '20.x'
- name: Install dependencies
run: yarn install
- name: Prettier check
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [2.4.0] - 2025-08-15

- Migrate to angular 17


## [2.3.1] - 2025-08-01

- Changed CircleCI to GitHub Action and command fix

## [Unreleased]

## [2.3.0-dev-test] - 2023-08-11

Expand Down
3 changes: 2 additions & 1 deletion demo/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Component, OnInit } from '@angular/core';
import { Component } from '@angular/core';
import { JsonapiCore } from 'ngx-jsonapi';

@Component({
selector: 'demo-app',
styleUrls: ['./app.component.scss'],
standalone: false,
templateUrl: './app.component.html'
})
export class AppComponent /* implements OnInit */ {
Expand Down
5 changes: 1 addition & 4 deletions demo/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@ import { BrowserModule } from '@angular/platform-browser';
import { RouterModule, Routes } from '@angular/router';
import { HttpClientModule } from '@angular/common/http';
import { environment } from '../environments/environment';
import { NgxJsonapiModule, JSONAPI_RIPPER_SERVICE, JSONAPI_STORE_SERVICE } from 'ngx-jsonapi';
import { NgxJsonapiModule, JSONAPI_RIPPER_SERVICE, JSONAPI_STORE_SERVICE, StoreService, JsonRipper } from 'ngx-jsonapi';

import { AppComponent } from './app.component';
import { AuthorsService } from './authors/authors.service';
import { BooksService } from './books/books.service';
import { PhotosService } from './photos/photos.service';
import { SharedModule } from './shared/shared.module';

import { StoreService } from 'ngx-jsonapi/sources/store.service';
import { JsonRipper } from 'ngx-jsonapi/services/json-ripper';

const appRoutes: Routes = [
{
path: '',
Expand Down
1 change: 1 addition & 0 deletions demo/app/authors/components/author.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { BooksService } from '../../books/books.service';

@Component({
selector: 'demo-author',
standalone: false,
templateUrl: './author.component.html'
})
export class AuthorComponent {
Expand Down
4 changes: 2 additions & 2 deletions demo/app/authors/components/authors.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Photo } from './../../../../src/tests/factories/photos.service';
import { BooksService } from './../../books/books.service';
import { Component } from '@angular/core';
import { DocumentCollection } from 'ngx-jsonapi';
import { DocumentCollection, Photo } from 'ngx-jsonapi';
import { AuthorsService, Author } from './../authors.service';
import { ActivatedRoute } from '@angular/router';

@Component({
selector: 'demo-authors',
standalone: false,
templateUrl: './authors.component.html'
})
export class AuthorsComponent {
Expand Down
1 change: 1 addition & 0 deletions demo/app/books/components/book.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { PhotosService } from '../../photos/photos.service';

@Component({
selector: 'demo-book',
standalone: false,
templateUrl: './book.component.html'
})
export class BookComponent {
Expand Down
1 change: 1 addition & 0 deletions demo/app/books/components/books.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Observable } from 'rxjs';

@Component({
selector: 'demo-books',
standalone: false,
templateUrl: './books.component.html'
})
export class BooksComponent {
Expand Down
1 change: 1 addition & 0 deletions demo/app/photos/photos.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Photo } from './photos.service';

@Component({
selector: 'demo-photos',
standalone: false,
templateUrl: './photos.component.html'
})
export class PhotosComponent {
Expand Down
2 changes: 2 additions & 0 deletions demo/app/shared/collection-info.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Component, Input } from '@angular/core';
import { DocumentCollection } from 'ngx-jsonapi';

@Component({
selector: 'demo-collection-info',
standalone: false,
templateUrl: './collection-info.component.html'
})
export class CollectionInfoComponent {
Expand Down
2 changes: 2 additions & 0 deletions demo/app/shared/collection-paginator.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Component, Input } from '@angular/core';
import { DocumentCollection } from 'ngx-jsonapi';

@Component({
selector: 'demo-collection-paginator',
standalone: false,
templateUrl: './collection-paginator.component.html'
})
export class CollectionPaginatorComponent {
Expand Down
4 changes: 3 additions & 1 deletion demo/app/shared/resource-info.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { DocumentResource } from './../../../src/document-resource';
import { DocumentResource } from 'ngx-jsonapi';
import { Component, Input } from '@angular/core';

@Component({
selector: 'demo-resource-info',
standalone: false,
templateUrl: './resource-info.component.html'
})
export class ResourceInfoComponent {
Expand Down
3 changes: 2 additions & 1 deletion demo/app/systems/systems.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { DocumentCollection } from 'ngx-jsonapi';
import { System, SystemsService } from './systems.service';
Expand All @@ -7,6 +7,7 @@ import { System, SystemsService } from './systems.service';
// eslint-disable-next-line @angular-eslint/component-selector
selector: 'bc-systems',
templateUrl: './systems.component.html',
standalone: false,
styles: []
})
export class SystemsComponent {
Expand Down
2 changes: 1 addition & 1 deletion demo/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './polyfills.ts';
import './polyfills';

import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { enableProdMode } from '@angular/core';
Expand Down
4 changes: 2 additions & 2 deletions demo/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"baseUrl": ".",
"rootDir": "../",
"paths": {
"ngx-jsonapi": ["../src"],
"ngx-jsonapi/*": ["../src/*"]
"ngx-jsonapi": ["../projects/ngx-jsonapi-lib/src/public_api"],
"ngx-jsonapi/*": ["../projects/ngx-jsonapi-lib/src/lib/*"]
},
"useDefineForClassFields": false
},
Expand Down
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"ci": "yarn postinstall && yarn run build && yarn run test -w 1 --coverage && cat ./coverage/lcov.info | coveralls",
"watch:tests": "chokidar 'src/**/*.ts' --initial -c 'nyc --reporter=text --reporter=html yarn test'",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
"release": "yarn run build:jsonapi && cd dist/ngx-jsonapi && yarn publish",
"release": "yarn run build:jsonapi && cd dist && yarn publish",
"release-v2": "yarn ng build ngx-jsonapi-lib && cd dist/ngx-jsonapi && yarn publish",
"prettier": "yarn prettier-ts && yarn prettier-md && yarn prettier-scss",
"prettier-ts": "yarn prettier-ts:show --write",
Expand Down Expand Up @@ -101,23 +101,23 @@
"esbuild-wasm": "0.14.54"
},
"devDependencies": {
"@angular-devkit/build-angular": "16.2.0",
"@angular-eslint/builder": "16.2.0",
"@angular-eslint/eslint-plugin": "16.2.0",
"@angular-eslint/eslint-plugin-template": "16.2.0",
"@angular-eslint/schematics": "16.2.0",
"@angular-eslint/template-parser": "16.2.0",
"@angular/animations": "16.2.0",
"@angular/cli": "16.2.0",
"@angular/common": "16.2.0",
"@angular/compiler": "16.2.0",
"@angular/compiler-cli": "16.2.0",
"@angular/core": "16.2.0",
"@angular/forms": "16.2.0",
"@angular/platform-browser": "16.2.0",
"@angular/platform-browser-dynamic": "16.2.0",
"@angular/platform-server": "16.2.0",
"@angular/router": "16.2.0",
"@angular-devkit/build-angular": "^17.0.0",
"@angular-eslint/builder": "^17.0.0",
"@angular-eslint/eslint-plugin": "^17.0.0",
"@angular-eslint/eslint-plugin-template": "^17.0.0",
"@angular-eslint/schematics": "^17.0.0",
"@angular-eslint/template-parser": "^17.0.0",
"@angular/animations": "^17.0.0",
"@angular/cli": "^17.0.0",
"@angular/common": "^17.0.0",
"@angular/compiler": "^17.0.0",
"@angular/compiler-cli": "^17.0.0",
"@angular/core": "^17.0.0",
"@angular/forms": "^17.0.0",
"@angular/platform-browser": "^17.0.0",
"@angular/platform-browser-dynamic": "^17.0.0",
"@angular/platform-server": "^17.0.0",
"@angular/router": "^17.0.0",
"@types/faker": "4.1.5",
"@types/fs-extra": "2.1.0",
"@types/glob": "5.0.33",
Expand All @@ -137,7 +137,7 @@
"eslint": "8",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-import": "2.24.2",
"eslint-plugin-jsdoc": "36.0.8",
"eslint-plugin-jsdoc": "^54.0.0",
"eslint-plugin-no-null": "1.0.2",
"eslint-plugin-prefer-arrow": "1.2.3",
"eslint-plugin-prettier": "5.0.0",
Expand Down Expand Up @@ -174,7 +174,7 @@
"ts-jest": "29.1.1",
"ts-mockito": "2.3.1",
"ts-node": "3.1.0",
"typescript": "4.9.5",
"typescript": "5.3.3",
"uglify-js": "3.1.9",
"zone.js": "~0.13.1"
},
Expand All @@ -185,5 +185,5 @@
"tsickle": "0.39.1",
"tslib": "2.0.0"
},
"version": "2.3.1"
"version": "2.4.0"
}
13 changes: 10 additions & 3 deletions projects/ngx-jsonapi-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-jsonapi",
"version": "2.3.1",
"version": "2.4.0",
"description": "JSON API library for Angular",
"module": "ngx-jsonapi/@ngx-jsonapi/ngx-jsonapi.es5.js",
"es2015": "ngx-jsonapi/@ngx-jsonapi/ngx-jsonapi.js",
Expand All @@ -18,8 +18,15 @@
"license": "MIT",
"homepage": "https://github.com/reyesoft/ngx-jsonapi#readme",
"peerDependencies": {
"@angular/common": "^16.2.0",
"@angular/core": "^16.2.0",
"@angular/animations": "^16.2.0 || ^17.0.0",
"@angular/common": "^16.2.0 || ^17.0.0",
"@angular/compiler": "^16.2.0 || ^17.0.0",
"@angular/core": "^16.2.0 || ^17.0.0",
"@angular/forms": "^16.2.0 || ^17.0.0",
"@angular/platform-browser": "^16.2.0 || ^17.0.0",
"@angular/platform-browser-dynamic": "^16.2.0 || ^17.0.0",
"@angular/platform-server": "^16.2.0 || ^17.0.0",
"@angular/router": "^16.2.0 || ^17.0.0",
"lodash-es": "^4.17",
"dexie": "^2.0.4"
},
Expand Down
3 changes: 3 additions & 0 deletions projects/ngx-jsonapi-lib/src/public_api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@ export * from './lib/decorators/autoregister';
export { Core as JsonapiCore, JSONAPI_RIPPER_SERVICE, JSONAPI_STORE_SERVICE } from './lib/core';
export * from './lib/resource';
export * from './lib/document-resource';
export * from './lib/tests/factories/photos.service';
export * from './lib/document-collection';
export * from './lib/service';
export * from './lib/sources/store.service';
export * from './lib/services/json-ripper';
Loading