diff --git a/package-lock.json b/package-lock.json index 746a589..667836f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "@babel/preset-typescript": "^7.24.7", "@types/jasmine": "~4.3.1", "@types/jasminewd2": "~2.0.10", - "@types/node": "^12.11.1", + "@types/node": "^18.19.1", "@types/webpack-env": "^1.18.5", "@typescript-eslint/eslint-plugin": "^7.12.0", "@typescript-eslint/parser": "^7.12.0", @@ -6362,10 +6362,13 @@ } }, "node_modules/@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", - "dev": true + "version": "18.19.64", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.64.tgz", + "integrity": "sha512-955mDqvO2vFf/oL7V3WiUtiz+BugyX8uVbaT2H8oj3+8dRyH2FLiNdowe7eNqRM7IOIZvzDH76EoAT+gwm6aIQ==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/node-forge": { "version": "1.3.11", diff --git a/package.json b/package.json index 2653ab9..49ccbd0 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,9 @@ "scripts": { "ng": "ng", "start": "ng serve --project ngx-repository-app", - "build:all": "ng build --project ngx-repository && ng build --project ngx-http-repository && ng build --project ngx-firestore-repository", - "build:ngx-repository": "ng build --project ngx-repository --configuration production && cp README.md dist/ngx-repository", + "build:all": "tsc -p projects/utils/tsconfig.lib.json && ng build --project ngx-repository && ng build --project ngx-http-repository && ng build --project ngx-firestore-repository", + "build:utils": "tsc -p projects/utils/tsconfig.lib.json", + "build:ngx-repository": "npm run build:utils && ng build --project ngx-repository --configuration production && cp README.md dist/ngx-repository", "build:ngx-http-repository": "npm run build:ngx-repository && ng build --project ngx-http-repository --configuration production && cp README.md dist/ngx-http-repository", "build:ngx-firestore-repository": "npm run build:ngx-repository && ng build --project ngx-firestore-repository --configuration production && cp README.md dist/ngx-firestore-repository", "test:ngx-repository": "ng test --project ngx-repository --code-coverage", @@ -72,7 +73,7 @@ "@babel/preset-typescript": "^7.24.7", "@types/jasmine": "~4.3.1", "@types/jasminewd2": "~2.0.10", - "@types/node": "^12.11.1", + "@types/node": "^18.19.1", "@types/webpack-env": "^1.18.5", "@typescript-eslint/eslint-plugin": "^7.12.0", "@typescript-eslint/parser": "^7.12.0", diff --git a/projects/ngx-repository/src/lib/core/response/processor/path-column-response.processor.ts b/projects/ngx-repository/src/lib/core/response/processor/path-column-response.processor.ts index 0529e79..c0deb6e 100644 --- a/projects/ngx-repository/src/lib/core/response/processor/path-column-response.processor.ts +++ b/projects/ngx-repository/src/lib/core/response/processor/path-column-response.processor.ts @@ -4,8 +4,8 @@ import { PATH_COLUMN_METADATA_KEY } from '../../decorator/path-column.decorator' import { Path } from '../../request/path'; import { ResponseProcessor } from './response.processor'; import { PathColumnContextConfiguration } from '../../configuration/context/path-column-context.configuration'; -import { PathRequest } from '@paddls/ngx-repository'; import { isObject, isUndefined } from '@paddls/utils'; +import { PathRequest } from '../../request/path.request'; @Injectable() export class PathColumnResponseProcessor implements ResponseProcessor { diff --git a/projects/utils/package.json b/projects/utils/package.json index 1087748..ad0c688 100644 --- a/projects/utils/package.json +++ b/projects/utils/package.json @@ -4,7 +4,7 @@ "description": "", "main": "karma.conf.js", "scripts": { - "build": "tsc" + "build": "tsc -p tsconfig.lib.json" }, "keywords": [], "author": "Oscar GUERIN", diff --git a/projects/utils/tsconfig.lib.json b/projects/utils/tsconfig.lib.json index 64db39e..5012121 100644 --- a/projects/utils/tsconfig.lib.json +++ b/projects/utils/tsconfig.lib.json @@ -4,7 +4,7 @@ "target": "ES6", "module": "CommonJS", "declaration": true, - "outDir": "../../out-tsc/lib", + "outDir": "../../dist/utils", "strict": true }, "include": [ diff --git a/tsconfig.json b/tsconfig.json index b246b0b..5f3b8d2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,16 +20,28 @@ ], "paths": { "@paddls/ngx-repository": [ - "projects/ngx-repository/src/public-api" + "dist/ngx-repository" + ], + "@paddls/ngx-repository/*": [ + "dist/ngx-repository/*" ], "@paddls/ngx-http-repository": [ - "projects/ngx-http-repository/src/public-api" + "dist/ngx-http-repository" + ], + "@paddls/ngx-http-repository/*": [ + "dist/ngx-http-repository/*" ], "@paddls/ngx-firestore-repository": [ - "projects/ngx-firestore-repository/src/public-api" + "dist/ngx-firestore-repository" + ], + "@paddls/ngx-firestore-repository/*": [ + "dist/ngx-firestore-repository/*" ], "@paddls/utils": [ - "projects/utils" + "dist/utils" + ], + "@paddls/utils/*": [ + "dist/utils/*" ] }, "useDefineForClassFields": false