Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit691835b

Browse files
authored
Merge branch 'main' into feat/rebranding
2 parents3c14a9b +d7ec2bf commit691835b

File tree

9 files changed

+83
-29
lines changed

9 files changed

+83
-29
lines changed

‎.github/dependabot.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2+
3+
version:2
4+
updates:
5+
-package-ecosystem:"maven"
6+
directory:"/server/api-service"
7+
schedule:
8+
interval:"weekly"
9+
-package-ecosystem:"npm"
10+
directory:"/server/node-service"
11+
schedule:
12+
interval:"weekly"
13+
-package-ecosystem:"npm"
14+
directory:"/client"
15+
schedule:
16+
interval:"weekly"
17+
-package-ecosystem:"docker"
18+
directory:"/deploy/docker"
19+
schedule:
20+
interval:"weekly"

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches:[ "develop" ]
16+
branches:[ "main" ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches:[ "develop" ]
19+
branches:[ "main" ]
2020
schedule:
2121
-cron:'20 15 * * 5'
2222

‎.github/workflows/sonarcloud.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name:Build
2+
on:
3+
push:
4+
branches:
5+
-main
6+
pull_request:
7+
types:[opened, synchronize, reopened]
8+
jobs:
9+
sonarcloud:
10+
name:SonarCloud
11+
runs-on:ubuntu-latest
12+
steps:
13+
-name:Setup Java JDK
14+
uses:actions/setup-java@v1
15+
with:
16+
java-version:17
17+
-uses:actions/checkout@v3
18+
with:
19+
fetch-depth:0# Shallow clones should be disabled for a better relevancy of analysis
20+
-name:Build Java
21+
run:|
22+
mvn clean compile -DskipTests -f ./server/api-service/pom.xml
23+
-name:SonarCloud Scan
24+
uses:SonarSource/sonarcloud-github-action@master
25+
env:
26+
GITHUB_TOKEN:${{ secrets.GITHUB_TOKEN }}# Needed to get PR information, if any
27+
SONAR_TOKEN:${{ secrets.SONAR_TOKEN }}

‎client/netlify.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[[redirects]]
2+
from ="/*"
3+
to ="/"
4+
status =200

‎client/packages/openblocks/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"tern":"^0.24.3",
9595
"toposort":"^2.0.2",
9696
"typescript-collections":"^1.3.3",
97-
"ua-parser-js":"^1.0.2",
97+
"ua-parser-js":"^1.0.33",
9898
"uuid":"^9.0.0",
9999
"web-vitals":"^2.1.0",
100100
"weixin-js-sdk":"^1.6.0",

‎client/yarn.lock‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10606,9 +10606,9 @@ __metadata:
1060610606
linkType: hard
1060710607

1060810608
"http-cache-semantics@npm:^4.1.0":
10609-
version: 4.1.0
10610-
resolution: "http-cache-semantics@npm:4.1.0"
10611-
checksum:974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42
10609+
version: 4.1.1
10610+
resolution: "http-cache-semantics@npm:4.1.1"
10611+
checksum:83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
1061210612
languageName: node
1061310613
linkType: hard
1061410614

@@ -12264,13 +12264,13 @@ __metadata:
1226412264
linkType: hard
1226512265

1226612266
"json5@npm:^1.0.1":
12267-
version: 1.0.1
12268-
resolution: "json5@npm:1.0.1"
12267+
version: 1.0.2
12268+
resolution: "json5@npm:1.0.2"
1226912269
dependencies:
1227012270
minimist: ^1.2.0
1227112271
bin:
1227212272
json5: lib/cli.js
12273-
checksum:e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3
12273+
checksum:866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7
1227412274
languageName: node
1227512275
linkType: hard
1227612276

@@ -14546,7 +14546,7 @@ __metadata:
1454614546
toposort: ^2.0.2
1454714547
typescript: ^4.8.4
1454814548
typescript-collections: ^1.3.3
14549-
ua-parser-js: ^1.0.2
14549+
ua-parser-js: ^1.0.33
1455014550
uuid: ^9.0.0
1455114551
vite: ^3.2.4
1455214552
vite-plugin-checker: ^0.5.1
@@ -18909,10 +18909,10 @@ __metadata:
1890918909
languageName: node
1891018910
linkType: hard
1891118911

18912-
"ua-parser-js@npm:^1.0.2":
18913-
version: 1.0.2
18914-
resolution: "ua-parser-js@npm:1.0.2"
18915-
checksum:ff7f6d79a9c1a38aa85a0e751040fc7e17a0b621bda876838d14ebe55aca4e50e68da0350f181e58801c2d8a35e7db4e12473776e558910c4b7cabcec96aa3bf
18912+
"ua-parser-js@npm:^1.0.33":
18913+
version: 1.0.35
18914+
resolution: "ua-parser-js@npm:1.0.35"
18915+
checksum:02370d38a0c8b586f2503d1c3bbba5cbc0b97d407282f9023201a99e4c03eae4357a2800fdf50cf80d73ec25c0b0cc5bfbaa03975b0add4043d6e4c86712c9c1
1891618916
languageName: node
1891718917
linkType: hard
1891818918

@@ -19535,14 +19535,14 @@ __metadata:
1953519535
linkType: hard
1953619536

1953719537
"vm2@npm:^3.9.8":
19538-
version: 3.9.11
19539-
resolution: "vm2@npm:3.9.11"
19538+
version: 3.9.17
19539+
resolution: "vm2@npm:3.9.17"
1954019540
dependencies:
1954119541
acorn: ^8.7.0
1954219542
acorn-walk: ^8.2.0
1954319543
bin:
1954419544
vm2: bin/vm2
19545-
checksum:aab39e6e4b59146d24abacd79f490e854a6e058a8b23d93d2be5aca7720778e2605d2cc028ccc4a5f50d3d91b0c38be9a6247a80d2da1a6de09425cc437770b4
19545+
checksum:9a03740a40ab2be5e3348a95fb31512da1a3c85318febb07e5299fa103ff05bcd7b6f458211fa38a1281dc27beccd04ff90355fc1d34fe2ee6ca10d0bb8c6f35
1954619546
languageName: node
1954719547
linkType: hard
1954819548

‎server/node-service/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"stylis":"^4.1.3",
6868
"swagger-client":"^3.18.5",
6969
"typescript":"^4.9.3",
70-
"yaml":"^2.2.1"
70+
"yaml":"^2.2.2"
7171
},
7272
"resolutions": {
7373
"@apidevtools/json-schema-ref-parser":"9.0.7"

‎server/node-service/yarn.lock‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7272,9 +7272,9 @@ __metadata:
72727272
linkType:hard
72737273

72747274
"http-cache-semantics@npm:^4.1.0":
7275-
version:4.1.0
7276-
resolution:"http-cache-semantics@npm:4.1.0::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fhttp-cache-semantics%2F-%2Fhttp-cache-semantics-4.1.0.tgz"
7277-
checksum:974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42
7275+
version:4.1.1
7276+
resolution:"http-cache-semantics@npm:4.1.1"
7277+
checksum:83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
72787278
languageName:node
72797279
linkType:hard
72807280

@@ -10444,7 +10444,7 @@ __metadata:
1044410444
ts-jest:^29.0.3
1044510445
ts-node:^10.9.1
1044610446
typescript:^4.9.3
10447-
yaml:^2.2.1
10447+
yaml:^2.2.2
1044810448
languageName:unknown
1044910449
linkType:soft
1045010450

@@ -10951,14 +10951,14 @@ __metadata:
1095110951
linkType:hard
1095210952

1095310953
"vm2@npm:^3.9.8":
10954-
version:3.9.14
10955-
resolution:"vm2@npm:3.9.14"
10954+
version:3.9.17
10955+
resolution:"vm2@npm:3.9.17"
1095610956
dependencies:
1095710957
acorn:^8.7.0
1095810958
acorn-walk:^8.2.0
1095910959
bin:
1096010960
vm2:bin/vm2
10961-
checksum:1ed7481e07ce8e03055101b382bfbf0d725a5c9b9bbe8bf75f71501cb43a6bd22f6a0a151975ff7cea8cad136d47e66d64f0a3248913f6d3ca3c405db12bacc0
10961+
checksum:9a03740a40ab2be5e3348a95fb31512da1a3c85318febb07e5299fa103ff05bcd7b6f458211fa38a1281dc27beccd04ff90355fc1d34fe2ee6ca10d0bb8c6f35
1096210962
languageName:node
1096310963
linkType:hard
1096410964

@@ -11138,10 +11138,10 @@ __metadata:
1113811138
languageName:node
1113911139
linkType:hard
1114011140

11141-
"yaml@npm:^2.2.1":
11142-
version:2.2.1
11143-
resolution:"yaml@npm:2.2.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fyaml%2F-%2Fyaml-2.2.1.tgz"
11144-
checksum:84f68cbe462d5da4e7ded4a8bded949ffa912bc264472e5a684c3d45b22d8f73a3019963a32164023bdf3d83cfb6f5b58ff7b2b10ef5b717c630f40bd6369a23
11141+
"yaml@npm:^2.2.2":
11142+
version:2.2.2
11143+
resolution:"yaml@npm:2.2.2"
11144+
checksum:d90c235e099e30094dcff61ba3350437aef53325db4a6bcd04ca96e1bfe7e348b191f6a7a52b5211e2dbc4eeedb22a00b291527da030de7c189728ef3f2b4eb3
1114511145
languageName:node
1114611146
linkType:hard
1114711147

‎sonar-project.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
sonar.projectKey=Lowcoder-Community_openblocks
2+
sonar.organization=lowcoder-community
3+
sonar.java.binaries=server/api-service/openblocks-domain/target,server/api-service/openblocks-infra/target,server/api-service/openblocks-sdk/target,server/api-service/openblocks-server/target,server/api-service/openblocks-plugins/clickHousePlugin/target,server/api-service/openblocks-plugins/elasticSearchPlugin/target,server/api-service/openblocks-plugins/googleSheetsPlugin/target,server/api-service/openblocks-plugins/graphqlPlugin/target,server/api-service/openblocks-plugins/mongoPlugin/target,server/api-service/openblocks-plugins/mssqlPlugin/target,server/api-service/openblocks-plugins/mysqlPlugin/target,server/api-service/openblocks-plugins/openblocksApiPlugin/target,server/api-service/openblocks-plugins/oraclePlugin/target,server/api-service/openblocks-plugins/postgresPlugin/target,server/api-service/openblocks-plugins/redisPlugin/target,server/api-service/openblocks-plugins/restApiPlugin/target,server/api-service/openblocks-plugins/smtpPlugin/target,server/api-service/openblocks-plugins/snowflakePlugin/target,server/api-service/openblocks-plugins/sqlBasedPlugin/target

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp