From cbb721d5388c757387b038a918732f85d667d5df Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sun, 26 Jan 2025 09:24:49 +0100 Subject: [PATCH] final fix --- backend/package.json | 6 +++--- backend/tsconfig.json | 7 +++++-- backend/yarn.lock | 11 ++++++++--- config/package.json | 5 ++--- config/tsconfig.json | 2 +- config/yarn.lock | 8 ++++---- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/backend/package.json b/backend/package.json index 47b4f4d78..cf2081f47 100644 --- a/backend/package.json +++ b/backend/package.json @@ -33,8 +33,8 @@ "email-templates": "^10.0.1", "express": "^4.17.1", "express-slow-down": "^2.0.1", - "gradido-config": "../config", - "gradido-database": "../database", + "gradido-config": "file:../config", + "gradido-database": "file:../database", "graphql": "^15.5.1", "graphql-request": "5.0.0", "graphql-type-json": "0.3.2", @@ -65,7 +65,7 @@ "@types/jest": "^27.0.2", "@types/joi": "^17.2.3", "@types/lodash.clonedeep": "^4.5.6", - "@types/node": "^16.10.3", + "@types/node": "^17.0.21", "@types/nodemailer": "^6.4.4", "@types/sodium-native": "^2.3.5", "@types/uuid": "^8.3.4", diff --git a/backend/tsconfig.json b/backend/tsconfig.json index feb433fda..cd310e8a3 100644 --- a/backend/tsconfig.json +++ b/backend/tsconfig.json @@ -15,7 +15,7 @@ // "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ "outDir": "./build", /* Redirect output structure to the directory. */ - "rootDir" : ".", + // "rootDir" : ".", // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ @@ -88,9 +88,12 @@ }, "references": [ { - // "path": "../database/tsconfig.json" + "path": "../database/tsconfig.json" // add 'prepend' if you want to include the referenced project in your output file // "prepend": true + }, + { + "path": "../config/tsconfig.json" } ] } diff --git a/backend/yarn.lock b/backend/yarn.lock index 0bfc6ad12..a1777c229 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1180,7 +1180,7 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@^16.10.3": +"@types/node@*": version "16.10.3" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.3.tgz#7a8f2838603ea314d1d22bb3171d899e15c57bd5" integrity sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ== @@ -1195,6 +1195,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz#6359d8cf73481e312a43886fa50afc70ce5592c6" integrity sha512-zv8ukKci1mrILYiQOwGSV4FpkZhyxQtuFWGya2GujWg+zVAeRQ4qbaMmWp9vb9889CFA8JECH7lkwCL6Ygg8kA== +"@types/node@^17.0.21": + version "17.0.45" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190" + integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw== + "@types/nodemailer@*": version "6.4.6" resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.6.tgz#ce21b4b474a08f672f182e15982b7945dde1f288" @@ -3790,12 +3795,12 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -gradido-config@../config: +"gradido-config@file:../config": version "1.0.0" dependencies: joi "^17.13.3" -gradido-database@../database: +"gradido-database@file:../database": version "2.4.4" dependencies: "@types/uuid" "^8.3.4" diff --git a/config/package.json b/config/package.json index 55441416e..f2d12e58e 100644 --- a/config/package.json +++ b/config/package.json @@ -8,14 +8,13 @@ "license": "Apache-2.0", "private": false, "scripts": { - "build": "mkdirp build/src/ && ncp src build/src && tsc --build", + "build": "tsc --build", "clean": "tsc --build --clean", - "prepare": "npm run clean && npm run build", "test": "node test/index" }, "devDependencies": { "@types/joi": "^17.2.3", - "@types/node": "^16.10.3", + "@types/node": "^17.0.21", "typescript": "^4.3.5", "mkdirp": "^3.0.1", "ncp": "^2.0.0" diff --git a/config/tsconfig.json b/config/tsconfig.json index b21a2fbc0..04306edad 100644 --- a/config/tsconfig.json +++ b/config/tsconfig.json @@ -45,7 +45,7 @@ /* Module Resolution Options */ // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - "baseUrl": ".", /* Base directory to resolve non-absolute module names. */ + // "baseUrl": ".", /* Base directory to resolve non-absolute module names. */ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // "rootDirs": [".", "../database"], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "typeRoots": [], /* List of folders to include type definitions from. */ diff --git a/config/yarn.lock b/config/yarn.lock index 352f4eeb0..2aa822598 100644 --- a/config/yarn.lock +++ b/config/yarn.lock @@ -38,10 +38,10 @@ dependencies: joi "*" -"@types/node@^16.10.3": - version "16.18.125" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.125.tgz#c2bfb73222c573e5906843a13db24714c21ba556" - integrity sha512-w7U5ojboSPfZP4zD98d+/cjcN2BDW6lKH2M0ubipt8L8vUC7qUAC6ENKGSJL4tEktH2Saw2K4y1uwSjyRGKMhw== +"@types/node@^17.0.21": + version "17.0.45" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190" + integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw== joi@*, joi@^17.13.3: version "17.13.3"