Skip to content

Commit

Permalink
merge dev to main (v2.0.0) (#1282)
Browse files Browse the repository at this point in the history
  • Loading branch information
ymc9 authored Apr 24, 2024
2 parents d08dd82 + a331fb4 commit c3a40f1
Show file tree
Hide file tree
Showing 326 changed files with 16,691 additions and 7,905 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"plugin:jest/recommended"
],
"rules": {
"jest/expect-expect": "off",
"@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }]
"@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }],
"jest/expect-expect": "off"
}
}
118 changes: 118 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
version: 2
updates:
- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/ide/jetbrains'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/language'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/misc/redwood'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/plugins/openapi'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/plugins/swr'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/plugins/tanstack-query'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/plugins/trpc'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/runtime'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/sdk'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/server'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/testtools'

- package-ecosystem: 'github-actions'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/'
14 changes: 14 additions & 0 deletions .github/release/.release-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
".": "2.0.0-alpha.1",
"packages/ide/jetbrains": "2.0.0-alpha.2",
"packages/language": "2.0.0-alpha.2",
"packages/misc/redwood": "2.0.0-alpha.2",
"packages/plugins/openapi": "2.0.0-alpha.2",
"packages/plugins/swr": "2.0.0-alpha.2",
"packages/plugins/tanstack-query": "2.0.0-alpha.2",
"packages/plugins/trpc": "2.0.0-alpha.2",
"packages/runtime": "2.0.0-alpha.2",
"packages/sdk": "2.0.0-alpha.2",
"packages/server": "2.0.0-alpha.2",
"packages/testtools": "2.0.0-alpha.2"
}
63 changes: 63 additions & 0 deletions .github/release/release-main-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"packages": {
".": {
"package-name": "zenstack-monorepo",
"component": "Monorepo",
"exclude-paths": ["tests", ".github"]
},
"packages/ide/jetbrains": {
"package-name": "jetbrains",
"component": "JetBrains_IDE"
},
"packages/language": {
"package-name": "@zenstackhq/language",
"component": "Language"
},
"packages/misc/redwood": {
"package-name": "@zenstackhq/redwood",
"component": "Redwood"
},
"packages/plugins/openapi": {
"package-name": "@zenstackhq/openapi",
"component": "OpenAPI_Plugin"
},
"packages/plugins/swr": {
"package-name": "@zenstackhq/swr",
"component": "SWR_Plugin"
},
"packages/plugins/tanstack-query": {
"package-name": "@zenstackhq/tanstack-query",
"component": "Tanstack_Query_Plugin"
},
"packages/plugins/trpc": {
"package-name": "@zenstackhq/trpc",
"component": "tRPC_Plugin"
},
"packages/runtime": {
"package-name": "@zenstackhq/runtime",
"component": "Runtime"
},
"packages/sdk": {
"package-name": "@zenstackhq/sdk",
"component": "SDK"
},
"packages/server": {
"package-name": "@zenstackhq/server",
"component": "Server"
},
"packages/testtools": {
"package-name": "@zenstackhq/testtools",
"component": "Test_Tools"
}
},
"include-component-in-tag": false,
"pull-request-footer": "This PR was generated by [Release-Please](https://github.com/googleapis/release-please).",
"prerelease": true,
"bump-minor-pre-major": true,
"bump-patch-for-minor-pre-major": true,
"sequential-calls": true,
"separate-pull-requests": false,
"versioning": "prerelease",
"release-type": "node",
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
}
23 changes: 15 additions & 8 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,22 @@ env:
DO_NOT_TRACK: '1'

on:
merge_group:
push:
branches:
- main
- dev
- release/*
- v2
pull_request:
branches: ['dev', 'main']
branches:
- main
- dev
- release/*
- v2

permissions:
contents: read

jobs:
build-test:
Expand All @@ -32,18 +46,11 @@ jobs:
strategy:
matrix:
node-version: [20.x]
prisma-version: [v4, v5]

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set Prisma Version
if: ${{ matrix.prisma-version == 'v5' }}
shell: bash
run: |
bash ./script/test-prisma-v5.sh
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
Expand Down
75 changes: 75 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Security - CodeQL

on:
merge_group:
push:
branches:
- main
- dev
- release/*
- v2
pull_request:
branches:
- main
- dev
- release/*
- v2
schedule:
- cron: '0 0 * * 1'

permissions:
contents: read

jobs:
analyze:
permissions:
actions: read
contents: read
security-events: write
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
language: ['javascript', 'typescript']
# CodeQL supports [ $supported-codeql-languages ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Harden Runner
uses: step-security/[email protected]
with:
egress-policy: audit

- name: Checkout repository
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/[email protected]
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/[email protected]

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/[email protected]
with:
category: '/language:${{matrix.language}}'
Loading

0 comments on commit c3a40f1

Please sign in to comment.