dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11767 from vvlladd28/updated/node-version/msa/18.20

Browse Source 
Updated unsupported Node.js dependencies from version 16.20.2 to 20.18.0 LTS
This commit is contained in:
Andrew Shvayka 2024-11-08 10:25:11 +01:00 committed by GitHub
commit 84e46e139f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 2485 additions and 3816 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
msa/js-executor/docker/Dockerfile
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/node:16.20.2-bookworm-slim
FROM thingsboard/node:20.18.0-bookworm-slim
ENV NODE_ENV production
ENV DOCKER_MODE true

48
msa/js-executor/package.json
View File

@ -6,26 +6,26 @@
"main": "server.ts",
"bin": "server.js",
"scripts": {
"pkg": "tsc && pkg -t node16-linux-x64,node16-win-x64 --out-path ./target ./target/src && node install.js",
"pkg": "tsc && pkg -t node18-linux-x64,node18-win-x64 --out-path ./target ./target/src && node install.js",
"test": "echo \"Error: no test specified\" && exit 1",
"start": "nodemon --watch '.' --ext 'ts' --exec 'ts-node server.ts'",
"start-prod": "nodemon --watch '.' --ext 'ts' --exec 'NODE_ENV=production ts-node server.ts'",
"build": "tsc"
},
"dependencies": {
"@aws-sdk/client-sqs": "^3.121.0",
"@azure/service-bus": "^7.5.1",
"@google-cloud/pubsub": "^4.3.3",
"amqplib": "^0.10.0",
"config": "^3.3.7",
"express": "^4.18.1",
"@aws-sdk/client-sqs": "^3.682.0",
"@azure/service-bus": "^7.9.5",
"@google-cloud/pubsub": "^4.8.0",
"amqplib": "^0.10.4",
"config": "^3.3.12",
"express": "^4.21.1",
"js-yaml": "^4.1.0",
"kafkajs": "^2.1.0",
"long": "^5.2.0",
"kafkajs": "^2.2.4",
"long": "^5.2.3",
"uuid-parse": "^1.1.0",
"uuid-random": "^1.3.2",
"winston": "^3.7.2",
"winston-daily-rotate-file": "^4.7.1"
"winston": "^3.16.0",
"winston-daily-rotate-file": "^5.0.0"
},
"nyc": {
"exclude": [
@ -36,26 +36,20 @@
]
},
"devDependencies": {
"@types/amqplib": "^0.8.2",
"@types/config": "^0.0.41",
"@types/express": "^4.17.13",
"@types/node": "^18.0.1",
"@types/uuid-parse": "^1.0.0",
"fs-extra": "^10.1.0",
"nodemon": "^2.0.16",
"pkg": "^5.7.0",
"ts-node": "^10.8.1",
"typescript": "^4.7.4"
"@types/amqplib": "^0.10.5",
"@types/config": "^3.3.5",
"@types/express": "~4.17.21",
"@types/node": "~20.17.6",
"@types/uuid-parse": "^1.0.2",
"fs-extra": "^11.2.0",
"nodemon": "^3.1.7",
"pkg": "^5.8.1",
"ts-node": "^10.9.2",
"typescript": "5.5.4"
},
"pkg": {
"assets": [
"node_modules/config/**/*.*"
]
},
"resolutions": {
"ansi-regex": "^5.0.1",
"color-string": "^1.5.5",
"minimist": "^1.2.6",
"node-fetch": "^2.6.7"
}
}

4
msa/js-executor/pom.xml
View File

@ -71,8 +71,8 @@
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v16.20.2</nodeVersion>
<yarnVersion>v1.22.17</yarnVersion>
<nodeVersion>v20.18.0</nodeVersion>
<yarnVersion>v1.22.22</yarnVersion>
</configuration>
</execution>
<execution>

2
msa/js-executor/queue/awsSqsTemplate.ts
View File

@ -52,7 +52,7 @@ export class AwsSqsTemplate implements IQueue {
private queueAttributes: { [n: string]: string } = {
FifoQueue: 'true'
};
private timer: NodeJS.Timer;
private timer: NodeJS.Timeout;
name = 'AWS SQS';

2
msa/js-executor/queue/serviceBusTemplate.ts
View File

@ -57,7 +57,7 @@ export class ServiceBusTemplate implements IQueue {
this.parseQueueProperties();
const listQueues = await this.serviceBusService.listQueues();
const listQueues = this.serviceBusService.listQueues();
for await (const queue of listQueues) {
this.queues.push(queue.name);
}

4218
msa/js-executor/yarn.lock
View File

File diff suppressed because it is too large Load Diff

2
msa/web-ui/docker/Dockerfile
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/node:16.20.2-bookworm-slim
FROM thingsboard/node:20.18.0-bookworm-slim
ENV NODE_ENV production
ENV DOCKER_MODE true

39
msa/web-ui/package.json
View File

@ -6,22 +6,22 @@
"main": "server.ts",
"bin": "server.js",
"scripts": {
"pkg": "tsc && pkg -t node16-linux-x64,node16-win-x64 --out-path ./target ./target/src && node install.js",
"pkg": "tsc && pkg -t node18-linux-x64,node18-win-x64 --out-path ./target ./target/src && node install.js",
"test": "echo \"Error: no test specified\" && exit 1",
"start": "nodemon --watch '.' --ext 'ts' --exec 'WEB_FOLDER=./target/web ts-node server.ts'",
"start-prod": "nodemon --watch '.' --ext 'ts' --exec 'WEB_FOLDER=./target/web NODE_ENV=production ts-node server.ts'",
"build": "tsc"
},
"dependencies": {
"compression": "^1.7.4",
"config": "^3.3.7",
"compression": "^1.7.5",
"config": "^3.3.12",
"connect-history-api-fallback": "^1.6.0",
"express": "^4.18.1",
"express": "^4.21.1",
"http": "0.0.0",
"http-proxy": "^1.18.1",
"js-yaml": "^4.1.0",
"winston": "^3.7.2",
"winston-daily-rotate-file": "^4.7.1"
"winston": "^3.16.0",
"winston-daily-rotate-file": "^5.0.0"
},
"nyc": {
"exclude": [
@ -32,26 +32,21 @@
]
},
"devDependencies": {
"@types/compression": "^1.7.2",
"@types/config": "^0.0.41",
"@types/connect-history-api-fallback": "^1.3.5",
"@types/express": "^4.17.13",
"@types/http-proxy": "^1.17.9",
"@types/node": "^18.0.0",
"fs-extra": "^10.1.0",
"nodemon": "^2.0.16",
"pkg": "^5.7.0",
"ts-node": "^10.8.1",
"typescript": "^4.7.4"
"@types/compression": "^1.7.5",
"@types/config": "^3.3.5",
"@types/connect-history-api-fallback": "^1.5.4",
"@types/express": "~4.17.21",
"@types/http-proxy": "^1.17.15",
"@types/node": "~20.17.6",
"fs-extra": "^11.2.0",
"nodemon": "^3.1.7",
"pkg": "^5.8.1",
"ts-node": "^10.9.2",
"typescript": "5.5.4"
},
"pkg": {
"assets": [
"node_modules/config/**/*.*"
]
},
"resolutions": {
"color-string": "^1.5.5",
"follow-redirects": "^1.14.8",
"minimist": "^1.2.6"
}
}

4
msa/web-ui/pom.xml
View File

@ -80,8 +80,8 @@
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v16.20.2</nodeVersion>
<yarnVersion>v1.22.17</yarnVersion>
<nodeVersion>v20.18.0</nodeVersion>
<yarnVersion>v1.22.22</yarnVersion>
</configuration>
</execution>
<execution>

1978
msa/web-ui/yarn.lock
View File

File diff suppressed because it is too large Load Diff

2
ui-ngx/pom.xml
View File

@ -56,7 +56,7 @@
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v20.11.1</nodeVersion>
<nodeVersion>v20.18.0</nodeVersion>
<yarnVersion>v1.22.22</yarnVersion>
</configuration>
</execution>