Skip to content

Commit dae0c0e

Browse files
Merge branch 'canary' into feat/affine-cli
2 parents 1b95e0e + 8c9aad9 commit dae0c0e

1,060 files changed

Lines changed: 45734 additions & 56585 deletions

File tree

Some content is hidden

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

.devcontainer/devcontainer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717
// Configure tool-specific properties.
1818
"customizations": {
1919
"vscode": {
20-
"extensions": [
21-
"ms-playwright.playwright",
22-
"esbenp.prettier-vscode",
23-
"dbaeumer.vscode-eslint"
24-
]
20+
"extensions": ["ms-playwright.playwright", "oxc.oxc-vscode"]
2521
}
2622
},
2723
"updateContentCommand": "bash ./.devcontainer/build.sh",

.docker/selfhost/schema.json

Lines changed: 144 additions & 192 deletions
Large diffs are not rendered by default.

.github/actions/setup-node/action.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ runs:
5353
fi
5454
5555
- name: Setup Node.js
56-
uses: actions/setup-node@v6
56+
uses: actions/setup-node@v7
5757
with:
5858
node-version-file: '.nvmrc'
5959
registry-url: https://npm.pkg.github.com
@@ -93,7 +93,7 @@ runs:
9393
run: node -e "const p = $(yarn config cacheFolder --json).effective; console.log('yarn_global_cache=' + p)" >> $GITHUB_OUTPUT
9494

9595
- name: Cache non-full yarn cache on Linux
96-
uses: actions/cache@v5
96+
uses: actions/cache@v6
9797
if: ${{ inputs.full-cache != 'true' && runner.os == 'Linux' }}
9898
with:
9999
path: |
@@ -105,15 +105,15 @@ runs:
105105
# and the decompression performance on Windows is very terrible
106106
# so we reduce the number of cached files on non-Linux systems by remove node_modules from cache path.
107107
- name: Cache non-full yarn cache on non-Linux
108-
uses: actions/cache@v5
108+
uses: actions/cache@v6
109109
if: ${{ inputs.full-cache != 'true' && runner.os != 'Linux' }}
110110
with:
111111
path: |
112112
${{ steps.yarn-cache.outputs.yarn_global_cache }}
113113
key: node_modules-cache-${{ github.job }}-${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.name }}-${{ steps.system-info.outputs.release }}-${{ steps.system-info.outputs.version }}
114114

115115
- name: Cache full yarn cache on Linux
116-
uses: actions/cache@v5
116+
uses: actions/cache@v6
117117
if: ${{ inputs.full-cache == 'true' && runner.os == 'Linux' }}
118118
with:
119119
path: |
@@ -122,7 +122,7 @@ runs:
122122
key: node_modules-cache-full-${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.name }}-${{ steps.system-info.outputs.release }}-${{ steps.system-info.outputs.version }}
123123

124124
- name: Cache full yarn cache on non-Linux
125-
uses: actions/cache@v5
125+
uses: actions/cache@v6
126126
if: ${{ inputs.full-cache == 'true' && runner.os != 'Linux' }}
127127
with:
128128
path: |
@@ -154,7 +154,7 @@ runs:
154154
# Note: Playwright's cache directory is hard coded because that's what it
155155
# says to do in the docs. There doesn't appear to be a command that prints
156156
# it out for us.
157-
- uses: actions/cache@v5
157+
- uses: actions/cache@v6
158158
id: playwright-cache
159159
if: ${{ inputs.playwright-install == 'true' }}
160160
with:
@@ -189,7 +189,7 @@ runs:
189189
run: |
190190
echo "version=$(yarn why --json electron | grep -h 'workspace:.' | jq --raw-output '.children[].locator' | sed -e 's/@playwright\/test@.*://' | head -n 1)" >> $GITHUB_OUTPUT
191191
192-
- uses: actions/cache@v5
192+
- uses: actions/cache@v6
193193
id: electron-cache
194194
if: ${{ inputs.electron-install == 'true' }}
195195
with:

.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{
1414
"rangeStrategy": "replace",
1515
"groupName": "linter",
16-
"matchPackageNames": ["/^eslint/", "/^@typescript-eslint/"]
16+
"matchPackageNames": ["/^eslint-plugin/"]
1717
},
1818
{
1919
"matchDepNames": ["oxlint"],

.github/workflows/auto-labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ jobs:
1313
pull-requests: write
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v6
17-
- uses: actions/labeler@v6
16+
- uses: actions/checkout@v7
17+
- uses: actions/labeler@v7

.github/workflows/build-images.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
environment: ${{ inputs.build-type }}
2626
steps:
27-
- uses: actions/checkout@v6
27+
- uses: actions/checkout@v7
2828
- name: Setup Version
2929
uses: ./.github/actions/setup-version
3030
with:
@@ -56,7 +56,7 @@ jobs:
5656
runs-on: ubuntu-latest
5757
environment: ${{ inputs.build-type }}
5858
steps:
59-
- uses: actions/checkout@v6
59+
- uses: actions/checkout@v7
6060
- name: Setup Version
6161
uses: ./.github/actions/setup-version
6262
with:
@@ -87,7 +87,7 @@ jobs:
8787
runs-on: ubuntu-latest
8888
environment: ${{ inputs.build-type }}
8989
steps:
90-
- uses: actions/checkout@v6
90+
- uses: actions/checkout@v7
9191
- name: Setup Version
9292
uses: ./.github/actions/setup-version
9393
with:
@@ -129,7 +129,7 @@ jobs:
129129
file: server-native.armv7.node
130130

131131
steps:
132-
- uses: actions/checkout@v6
132+
- uses: actions/checkout@v7
133133
- name: Setup Version
134134
uses: ./.github/actions/setup-version
135135
with:
@@ -163,7 +163,7 @@ jobs:
163163
needs:
164164
- build-server-native
165165
steps:
166-
- uses: actions/checkout@v6
166+
- uses: actions/checkout@v7
167167
- name: Setup Version
168168
uses: ./.github/actions/setup-version
169169
with:
@@ -199,7 +199,7 @@ jobs:
199199
- build-mobile
200200
- build-admin
201201
steps:
202-
- uses: actions/checkout@v6
202+
- uses: actions/checkout@v7
203203
- name: Download server dist
204204
uses: actions/download-artifact@v4
205205
with:
@@ -219,7 +219,7 @@ jobs:
219219
# setup node without cache configuration
220220
# Prisma cache is not compatible with docker build cache
221221
- name: Setup Node.js
222-
uses: actions/setup-node@v6
222+
uses: actions/setup-node@v7
223223
with:
224224
node-version-file: '.nvmrc'
225225
registry-url: https://npm.pkg.github.com

0 commit comments

Comments
 (0)