Browse Source
Merge pull request #15175 from thingsboard/rc
Merge rc into master
pull/15176/head
Viacheslav Klimov
3 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with
46 additions and
13 deletions
-
msa/js-executor/package.json
-
msa/js-executor/pom.xml
-
msa/js-executor/yarn.lock
-
msa/web-ui/package.json
-
msa/web-ui/pom.xml
-
msa/web-ui/yarn.lock
-
ui-ngx/pom.xml
|
|
|
@ -39,7 +39,7 @@ |
|
|
|
"fs-extra": "^11.3.1", |
|
|
|
"nodemon": "^3.1.10", |
|
|
|
"ts-node": "^10.9.2", |
|
|
|
"typescript": "5.9.2" |
|
|
|
"typescript": "~5.9.3" |
|
|
|
}, |
|
|
|
"resolutions": { |
|
|
|
"@yao-pkg/pkg/tar": ">=7.5.8" |
|
|
|
|
|
|
|
@ -81,7 +81,7 @@ |
|
|
|
<goal>yarn</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<arguments>install --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network</arguments> |
|
|
|
<arguments>install --non-interactive --check-files --network-concurrency 4 --network-timeout 100000 --mutex network</arguments> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
<execution> |
|
|
|
@ -96,6 +96,17 @@ |
|
|
|
</execution> |
|
|
|
</executions> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-clean-plugin</artifactId> |
|
|
|
<configuration> |
|
|
|
<filesets> |
|
|
|
<fileset> |
|
|
|
<directory>${basedir}/node_modules</directory> |
|
|
|
</fileset> |
|
|
|
</filesets> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-dependency-plugin</artifactId> |
|
|
|
|
|
|
|
@ -1634,10 +1634,10 @@ type-is@^2.0.0, type-is@^2.0.1: |
|
|
|
media-typer "^1.1.0" |
|
|
|
mime-types "^3.0.0" |
|
|
|
|
|
|
|
typescript@5.9.2: |
|
|
|
version "5.9.2" |
|
|
|
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6" |
|
|
|
integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A== |
|
|
|
typescript@~5.9.3: |
|
|
|
version "5.9.3" |
|
|
|
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" |
|
|
|
integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== |
|
|
|
|
|
|
|
undefsafe@^2.0.5: |
|
|
|
version "2.0.5" |
|
|
|
|
|
|
|
@ -42,7 +42,7 @@ |
|
|
|
"fs-extra": "^11.3.1", |
|
|
|
"nodemon": "^3.1.10", |
|
|
|
"ts-node": "^10.9.2", |
|
|
|
"typescript": "5.9.2" |
|
|
|
"typescript": "~5.9.3" |
|
|
|
}, |
|
|
|
"resolutions": { |
|
|
|
"@yao-pkg/pkg/tar": ">=7.5.8" |
|
|
|
|
|
|
|
@ -90,7 +90,7 @@ |
|
|
|
<goal>yarn</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<arguments>install --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network</arguments> |
|
|
|
<arguments>install --non-interactive --check-files --network-concurrency 4 --network-timeout 100000 --mutex network</arguments> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
<execution> |
|
|
|
@ -105,6 +105,17 @@ |
|
|
|
</execution> |
|
|
|
</executions> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-clean-plugin</artifactId> |
|
|
|
<configuration> |
|
|
|
<filesets> |
|
|
|
<fileset> |
|
|
|
<directory>${basedir}/node_modules</directory> |
|
|
|
</fileset> |
|
|
|
</filesets> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-dependency-plugin</artifactId> |
|
|
|
|
|
|
|
@ -1716,10 +1716,10 @@ type-is@^2.0.0, type-is@^2.0.1: |
|
|
|
media-typer "^1.1.0" |
|
|
|
mime-types "^3.0.0" |
|
|
|
|
|
|
|
typescript@5.9.2: |
|
|
|
version "5.9.2" |
|
|
|
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6" |
|
|
|
integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A== |
|
|
|
typescript@~5.9.3: |
|
|
|
version "5.9.3" |
|
|
|
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" |
|
|
|
integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== |
|
|
|
|
|
|
|
undefsafe@^2.0.5: |
|
|
|
version "2.0.5" |
|
|
|
|
|
|
|
@ -66,11 +66,22 @@ |
|
|
|
<goal>yarn</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<arguments>install --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network</arguments> |
|
|
|
<arguments>install --non-interactive --check-files --network-concurrency 4 --network-timeout 100000 --mutex network</arguments> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
</executions> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-clean-plugin</artifactId> |
|
|
|
<configuration> |
|
|
|
<filesets> |
|
|
|
<fileset> |
|
|
|
<directory>${basedir}/node_modules</directory> |
|
|
|
</fileset> |
|
|
|
</filesets> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
</plugins> |
|
|
|
</build> |
|
|
|
<profiles> |
|
|
|
|
