ever-co · evereq · Jun 29, 2024 · Jun 29, 2024 · Jun 29, 2024 · Jun 29, 2024
diff --git a/.deploy/webapp/entrypoint.compose.sh b/.deploy/webapp/entrypoint.compose.sh
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 set -ex
 
 # This Entrypoint used inside Docker Compose only
 
 export WAIT_HOSTS=$API_HOST:$API_PORT
 
+# Use envsubst to create the actual replacements_values.sed file with values from env vars
+envsubst < replacements.sed > replacements_values.sed
+
 # In production we should replace some values in generated JS code
-sed -i -f replacements.sed *.js
+sed -i -f replacements_values.sed *.js
 
 # We need to copy nginx.conf to correct place
 envsubst '${API_HOST} ${API_PORT}' < /etc/nginx/conf.d/compose.conf.template > /etc/nginx/nginx.conf

diff --git a/.deploy/webapp/entrypoint.prod.sh b/.deploy/webapp/entrypoint.prod.sh
@@ -1,10 +1,13 @@
-#!/bin/sh
+#!/bin/bash
 set -ex
 
 # This Entrypoint used when we run Docker container outside of Docker Compose (e.g. in k8s)
 
+# Use envsubst to create the actual replacements_values.sed file with values from env vars
+envsubst < replacements.sed > replacements_values.sed
+
 # In production we should replace some values in generated JS code
-sed -i -f replacements.sed *.js
+sed -i -f replacements_values.sed *.js
 
 # We may not need to use that env vars now in nginx.config, but we may want later.
 # Also we just need to copy nginx.conf to correct place anyway...

diff --git a/apps/gauzy/package.json b/apps/gauzy/package.json
@@ -192,7 +192,7 @@
 		"@types/jest": "^29.4.4",
 		"@types/leaflet": "^1.8.0",
 		"@types/moment-duration-format": "^2.2.3",
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"@types/underscore": "^1.11.4",
 		"@types/underscore.string": "^0.0.38",
 		"@types/uuid": "^8.3.4",

diff --git a/package.json b/package.json
@@ -369,7 +369,7 @@
 		"@semantic-release/npm": "^11.0.0",
 		"@types/jest": "^29.4.4",
 		"@types/jsdom": "^21.1.6",
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"@types/webpack": "^5.28.5",
 		"@types/yargs": "^15.0.9",
 		"ajv-formats": "^2.1.1",

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -47,7 +47,7 @@
 	},
 	"devDependencies": {
 		"@types/bcrypt": "^5.0.0",
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"@types/passport": "^1.0.9",
 		"@types/passport-facebook": "^2.1.10",
 		"@types/passport-github2": "^1.2.9",

diff --git a/packages/common-angular/package.json b/packages/common-angular/package.json
@@ -37,7 +37,7 @@
 		"slugify": "^1.6.5"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"@types/moment-duration-format": "^2.2.3",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -36,7 +36,7 @@
 		"slugify": "^1.6.5"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	},

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -34,7 +34,7 @@
 	},
 	"devDependencies": {
 		"@gauzy/common": "^0.1.0",
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -28,7 +28,7 @@
 		"compile": "tsc -p tsconfig.build.json"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	},

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -215,7 +215,7 @@
 		"@types/jest": "^29.4.4",
 		"@types/multer": "^1.4.11",
 		"@types/multer-s3": "^3.0.3",
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"@types/node-fetch": "^2.5.12",
 		"@types/nodemailer": "^6.4.0",
 		"@types/passport": "^1.0.9",

diff --git a/packages/desktop-api/package.json b/packages/desktop-api/package.json
@@ -37,6 +37,6 @@
 	},
 	"devDependencies": {
 		"@nestjs/testing": "^10.3.7",
-		"@types/node": "^17.0.33"
+		"@types/node": "^20.14.9"
 	}
 }
diff --git a/packages/desktop-libs/package.json b/packages/desktop-libs/package.json
@@ -53,7 +53,7 @@
 		"undici": "^6.10.2"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"electron": "28.1.0"
 	}
 }
diff --git a/packages/desktop-ui-lib/package.json b/packages/desktop-ui-lib/package.json
@@ -27,7 +27,7 @@
 	"keywords": [],
 	"devDependencies": {
 		"@types/moment-duration-format": "^2.2.3",
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"electron": "28.1.0"
 	},
 	"dependencies": {

diff --git a/packages/desktop-window/package.json b/packages/desktop-window/package.json
@@ -31,7 +31,7 @@
 		"electron-store": "^8.1.0"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"electron": "28.1.0"
 	}
 }
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -36,7 +36,7 @@
 		"underscore": "^1.13.3"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	},

diff --git a/packages/plugins/changelog/package.json b/packages/plugins/changelog/package.json
@@ -42,7 +42,7 @@
 		"typeorm": "^0.3.20"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/integration-ai/package.json b/packages/plugins/integration-ai/package.json
@@ -37,7 +37,7 @@
 		"form-data": "^3.0.0"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/integration-github/package.json b/packages/plugins/integration-github/package.json
@@ -40,7 +40,7 @@
 		"underscore": "^1.13.3"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/integration-hubstaff/package.json b/packages/plugins/integration-hubstaff/package.json
@@ -31,7 +31,7 @@
 		"@gauzy/contracts": "^0.1.0"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/integration-jira/package.json b/packages/plugins/integration-jira/package.json
@@ -29,7 +29,7 @@
 	"keywords": [],
 	"dependencies": {},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/integration-upwork/package.json b/packages/plugins/integration-upwork/package.json
@@ -49,7 +49,7 @@
 	},
 	"devDependencies": {
 		"@types/express": "^4.17.13",
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"@types/multer": "^1.4.11",
 		"@types/fs-extra": "5.0.2",
 		"@types/uuid": "^3.4.4",

diff --git a/packages/plugins/integration-wakatime/package.json b/packages/plugins/integration-wakatime/package.json
@@ -38,7 +38,7 @@
 	},
 	"devDependencies": {
 		"@nestjs/testing": "^10.3.7",
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/jitsu-analytics/package.json b/packages/plugins/jitsu-analytics/package.json
@@ -37,7 +37,7 @@
 		"typeorm": "^0.3.20"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/job-proposal/package.json b/packages/plugins/job-proposal/package.json
@@ -43,7 +43,7 @@
 		"typeorm": "^0.3.20"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/job-search-ui/package.json b/packages/plugins/job-search-ui/package.json
@@ -23,7 +23,7 @@
 		"tslib": "^2.6.2"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33"
+		"@types/node": "^20.14.9"
 	},
 	"repository": {
 		"type": "git",

diff --git a/packages/plugins/job-search/package.json b/packages/plugins/job-search/package.json
@@ -41,7 +41,7 @@
 		"typeorm": "^0.3.20"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/knowledge-base/package.json b/packages/plugins/knowledge-base/package.json
@@ -42,7 +42,7 @@
 		"typeorm": "^0.3.20"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/product-reviews/package.json b/packages/plugins/product-reviews/package.json
@@ -42,7 +42,7 @@
 		"apollo-server-core": "^3.10.1"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/plugins/sentry-tracing/package.json b/packages/plugins/sentry-tracing/package.json
@@ -38,7 +38,7 @@
 		"rxjs": "^7.4.0"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2",
 		"typescript": "5.1.6"
 	}

diff --git a/packages/ui-config/package.json b/packages/ui-config/package.json
@@ -41,7 +41,7 @@
 		"tslib": "^2.6.2"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.33",
+		"@types/node": "^20.14.9",
 		"rimraf": "^3.0.2"
 	},
 	"repository": {

diff --git a/yarn.lock b/yarn.lock
@@ -11974,7 +11974,7 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
-"@types/node@^17.0.33", "@types/node@^17.0.36":
+"@types/node@^17.0.36":
   version "17.0.45"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
@@ -11986,6 +11986,13 @@
   dependencies:
     undici-types "~5.26.4"
 
+"@types/node@^20.14.9":
+  version "20.14.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.9.tgz#12e8e765ab27f8c421a1820c99f5f313a933b420"
+  integrity sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/nodemailer@*", "@types/nodemailer@^6.4.0":
   version "6.4.14"
   resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.14.tgz#5c81a5e856db7f8ede80013e6dbad7c5fb2283e2"