Skip to content

Commit 420df87

Browse files
ymc9Azzerty23TGTGamercoderabbitai[bot]github-actions[bot]
authored
merge v2 to dev (#1281)
Co-authored-by: Augustin <[email protected]> Co-authored-by: Jonathan Stevens <[email protected]> Co-authored-by: Jonathan S <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ErikMCM <[email protected]> Co-authored-by: Jason Kleinberg <[email protected]> Co-authored-by: Jonathan S <[email protected]> Co-authored-by: Jiasheng <[email protected]>
1 parent 69b781e commit 420df87

File tree

326 files changed

+16692
-7905
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

326 files changed

+16692
-7905
lines changed

.eslintrc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"plugin:jest/recommended"
1414
],
1515
"rules": {
16-
"jest/expect-expect": "off",
17-
"@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }]
16+
"@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }],
17+
"jest/expect-expect": "off"
1818
}
1919
}

.github/dependabot.yml

+118
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: 'npm'
4+
schedule:
5+
interval: 'daily'
6+
time: '02:00'
7+
commit-message:
8+
prefix: ':arrow_up: maint'
9+
include: scope
10+
directory: '/'
11+
12+
- package-ecosystem: 'npm'
13+
schedule:
14+
interval: 'daily'
15+
time: '02:00'
16+
commit-message:
17+
prefix: ':arrow_up: maint'
18+
include: scope
19+
directory: '/packages/ide/jetbrains'
20+
21+
- package-ecosystem: 'npm'
22+
schedule:
23+
interval: 'daily'
24+
time: '02:00'
25+
commit-message:
26+
prefix: ':arrow_up: maint'
27+
include: scope
28+
directory: '/packages/language'
29+
30+
- package-ecosystem: 'npm'
31+
schedule:
32+
interval: 'daily'
33+
time: '02:00'
34+
commit-message:
35+
prefix: ':arrow_up: maint'
36+
include: scope
37+
directory: '/packages/misc/redwood'
38+
39+
- package-ecosystem: 'npm'
40+
schedule:
41+
interval: 'daily'
42+
time: '02:00'
43+
commit-message:
44+
prefix: ':arrow_up: maint'
45+
include: scope
46+
directory: '/packages/plugins/openapi'
47+
48+
- package-ecosystem: 'npm'
49+
schedule:
50+
interval: 'daily'
51+
time: '02:00'
52+
commit-message:
53+
prefix: ':arrow_up: maint'
54+
include: scope
55+
directory: '/packages/plugins/swr'
56+
57+
- package-ecosystem: 'npm'
58+
schedule:
59+
interval: 'daily'
60+
time: '02:00'
61+
commit-message:
62+
prefix: ':arrow_up: maint'
63+
include: scope
64+
directory: '/packages/plugins/tanstack-query'
65+
66+
- package-ecosystem: 'npm'
67+
schedule:
68+
interval: 'daily'
69+
time: '02:00'
70+
commit-message:
71+
prefix: ':arrow_up: maint'
72+
include: scope
73+
directory: '/packages/plugins/trpc'
74+
75+
- package-ecosystem: 'npm'
76+
schedule:
77+
interval: 'daily'
78+
time: '02:00'
79+
commit-message:
80+
prefix: ':arrow_up: maint'
81+
include: scope
82+
directory: '/packages/runtime'
83+
84+
- package-ecosystem: 'npm'
85+
schedule:
86+
interval: 'daily'
87+
time: '02:00'
88+
commit-message:
89+
prefix: ':arrow_up: maint'
90+
include: scope
91+
directory: '/packages/sdk'
92+
93+
- package-ecosystem: 'npm'
94+
schedule:
95+
interval: 'daily'
96+
time: '02:00'
97+
commit-message:
98+
prefix: ':arrow_up: maint'
99+
include: scope
100+
directory: '/packages/server'
101+
102+
- package-ecosystem: 'npm'
103+
schedule:
104+
interval: 'daily'
105+
time: '02:00'
106+
commit-message:
107+
prefix: ':arrow_up: maint'
108+
include: scope
109+
directory: '/packages/testtools'
110+
111+
- package-ecosystem: 'github-actions'
112+
schedule:
113+
interval: 'daily'
114+
time: '02:00'
115+
commit-message:
116+
prefix: ':arrow_up: maint'
117+
include: scope
118+
directory: '/'
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
".": "2.0.0-alpha.1",
3+
"packages/ide/jetbrains": "2.0.0-alpha.2",
4+
"packages/language": "2.0.0-alpha.2",
5+
"packages/misc/redwood": "2.0.0-alpha.2",
6+
"packages/plugins/openapi": "2.0.0-alpha.2",
7+
"packages/plugins/swr": "2.0.0-alpha.2",
8+
"packages/plugins/tanstack-query": "2.0.0-alpha.2",
9+
"packages/plugins/trpc": "2.0.0-alpha.2",
10+
"packages/runtime": "2.0.0-alpha.2",
11+
"packages/sdk": "2.0.0-alpha.2",
12+
"packages/server": "2.0.0-alpha.2",
13+
"packages/testtools": "2.0.0-alpha.2"
14+
}
+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"packages": {
3+
".": {
4+
"package-name": "zenstack-monorepo",
5+
"component": "Monorepo",
6+
"exclude-paths": ["tests", ".github"]
7+
},
8+
"packages/ide/jetbrains": {
9+
"package-name": "jetbrains",
10+
"component": "JetBrains_IDE"
11+
},
12+
"packages/language": {
13+
"package-name": "@zenstackhq/language",
14+
"component": "Language"
15+
},
16+
"packages/misc/redwood": {
17+
"package-name": "@zenstackhq/redwood",
18+
"component": "Redwood"
19+
},
20+
"packages/plugins/openapi": {
21+
"package-name": "@zenstackhq/openapi",
22+
"component": "OpenAPI_Plugin"
23+
},
24+
"packages/plugins/swr": {
25+
"package-name": "@zenstackhq/swr",
26+
"component": "SWR_Plugin"
27+
},
28+
"packages/plugins/tanstack-query": {
29+
"package-name": "@zenstackhq/tanstack-query",
30+
"component": "Tanstack_Query_Plugin"
31+
},
32+
"packages/plugins/trpc": {
33+
"package-name": "@zenstackhq/trpc",
34+
"component": "tRPC_Plugin"
35+
},
36+
"packages/runtime": {
37+
"package-name": "@zenstackhq/runtime",
38+
"component": "Runtime"
39+
},
40+
"packages/sdk": {
41+
"package-name": "@zenstackhq/sdk",
42+
"component": "SDK"
43+
},
44+
"packages/server": {
45+
"package-name": "@zenstackhq/server",
46+
"component": "Server"
47+
},
48+
"packages/testtools": {
49+
"package-name": "@zenstackhq/testtools",
50+
"component": "Test_Tools"
51+
}
52+
},
53+
"include-component-in-tag": false,
54+
"pull-request-footer": "This PR was generated by [Release-Please](https://github.com/googleapis/release-please).",
55+
"prerelease": true,
56+
"bump-minor-pre-major": true,
57+
"bump-patch-for-minor-pre-major": true,
58+
"sequential-calls": true,
59+
"separate-pull-requests": false,
60+
"versioning": "prerelease",
61+
"release-type": "node",
62+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
63+
}

.github/workflows/build-test.yml

+15-8
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,22 @@ env:
88
DO_NOT_TRACK: '1'
99

1010
on:
11+
merge_group:
12+
push:
13+
branches:
14+
- main
15+
- dev
16+
- release/*
17+
- v2
1118
pull_request:
12-
branches: ['dev', 'main']
19+
branches:
20+
- main
21+
- dev
22+
- release/*
23+
- v2
24+
25+
permissions:
26+
contents: read
1327

1428
jobs:
1529
build-test:
@@ -32,18 +46,11 @@ jobs:
3246
strategy:
3347
matrix:
3448
node-version: [20.x]
35-
prisma-version: [v4, v5]
3649

3750
steps:
3851
- name: Checkout
3952
uses: actions/checkout@v3
4053

41-
- name: Set Prisma Version
42-
if: ${{ matrix.prisma-version == 'v5' }}
43-
shell: bash
44-
run: |
45-
bash ./script/test-prisma-v5.sh
46-
4754
- name: Install pnpm
4855
uses: pnpm/action-setup@v2
4956
with:

.github/workflows/codeql.yml

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Security - CodeQL
2+
3+
on:
4+
merge_group:
5+
push:
6+
branches:
7+
- main
8+
- dev
9+
- release/*
10+
- v2
11+
pull_request:
12+
branches:
13+
- main
14+
- dev
15+
- release/*
16+
- v2
17+
schedule:
18+
- cron: '0 0 * * 1'
19+
20+
permissions:
21+
contents: read
22+
23+
jobs:
24+
analyze:
25+
permissions:
26+
actions: read
27+
contents: read
28+
security-events: write
29+
name: Analyze
30+
runs-on: ubuntu-latest
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: ['javascript', 'typescript']
36+
# CodeQL supports [ $supported-codeql-languages ]
37+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
38+
39+
steps:
40+
- name: Harden Runner
41+
uses: step-security/[email protected]
42+
with:
43+
egress-policy: audit
44+
45+
- name: Checkout repository
46+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
47+
48+
# Initializes the CodeQL tools for scanning.
49+
- name: Initialize CodeQL
50+
uses: github/codeql-action/[email protected]
51+
with:
52+
languages: ${{ matrix.language }}
53+
# If you wish to specify custom queries, you can do so here or in a config file.
54+
# By default, queries listed here will override any specified in a config file.
55+
# Prefix the list here with "+" to use these queries and those in the config file.
56+
57+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
58+
# If this step fails, then you should remove it and run the build manually (see below)
59+
- name: Autobuild
60+
uses: github/codeql-action/[email protected]
61+
62+
# ℹ️ Command-line programs to run using the OS shell.
63+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
64+
65+
# If the Autobuild fails above, remove it and uncomment the following three lines.
66+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
67+
68+
# - run: |
69+
# echo "Run, Build Application using script"
70+
# ./location_of_script_within_repo/buildscript.sh
71+
72+
- name: Perform CodeQL Analysis
73+
uses: github/codeql-action/[email protected]
74+
with:
75+
category: '/language:${{matrix.language}}'

0 commit comments

Comments
 (0)