Skip to content

Commit

Permalink
Merge branch 'dev' into feat/paste-image-from-external
Browse files Browse the repository at this point in the history
  • Loading branch information
siam-ese committed Jan 20, 2025
2 parents 62077fc + ecc8256 commit 658b079
Show file tree
Hide file tree
Showing 3,123 changed files with 249,544 additions and 135,224 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
92 changes: 62 additions & 30 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,63 +1,95 @@
# project
.github @jikkai
# CODEOWNERS

## project

.github @jikkai @wzhudev @hexf00

common @jikkai

**/package.json @jikkai

## documentation

docs @wzhudev

# core
CONTRIBUTING.md @wzhudev

## core & fundamental

packages/core @wzhudev
packages/core/src/services/resource-loader @Gggpound
packages/core/src/services/resource-manager @Gggpound
packages/core/src/services/permission @Gggpound

# basics
packages/design @jikkai
packages/drawing @weird94
packages/drawing-ui @weird94
packages/engine-formula @Dushusir @wzhudev
packages/engine-numfmt @Gggpound
packages/engine-render @lumixraku
packages/engine-render/components/docs @lumixraku @Jocs
packages/find-replace @siam-ese
packages/network @wzhudev
packages/rpc @wzhudev
packages/rpc-node @wzhudev
packages/thread-comment @weird94
packages/thread-comment-ui @weird94
packages/ui @jikkai @Jocs
packages/ui/src/services/clipboard @ybzky
packages/ui/src/services/popup/canvas-popup.service.ts @weird94
packages/uniscript @wzhudev
packages/watermark @ybzky

# facade
packages/facade @dushusir @hexf00
## sheets

# business - docs
packages/docs @Jocs
packages/docs-ui @jikkai @Jocs

# business - sheets
packages/data-validation @weird94
packages/sheets-data-validation @weird94
packages/sheets @wzhudev @VicKun4937
packages/sheets-conditional-formatting @Gggpound
packages/sheets-conditional-formatting-ui @Gggpound
packages/sheets-filter @ybzky @yuhongz
packages/sheets-filter-ui @ybzky @yuhongz
packages/sheets-find-replace @siam-ese
packages/sheets-formula @DR-Univer @wzhudev @Dushusir
packages/sheets-formula-ui @DR-Univer @wzhudev @Dushusir
packages/sheets-graphics @ybzky
packages/sheets-hyper-link @weird94
packages/sheets-hyper-link-ui @weird94
packages/sheets-numfmt @Gggpound
packages/sheets-numfmt-ui @Gggpound
packages/sheets-thread-comment @weird94
packages/sheets-thread-comment-ui @weird94
packages/sheets-ui @jikkai @wzhudev
packages/sheets-ui/src/controllers/clipboard @yuhongz
packages/sheets-ui/src/controllers/editor @Jocs
packages/sheets-ui/src/services/clipboard @yuhongz
packages/sheets-ui/src/services/editor @Jocs
packages/sheets-ui/src/services/editor-bridge.service.ts @Jocs
packages/sheets-zen-editor @Jocs
packages/sheets/src/services/numfmt @Gggpound
packages/sheets/src/services/ref-range @Gggpound
packages/sheets/src/services/ref-range @weird94
packages/sheets/src/services/sheet-interceptor @Gggpound
## find-replace
packages/sheets-find-replace @siam-ese
## number-format
packages/sheets-numfmt @Gggpound
## formula
packages/sheets-formula @wzhudev @Dushusir
## conditional-formatting
packages/sheets-conditional-formatting @Gggpound
packages/sheets-conditional-formatting-ui @Gggpound
## data validation
packages/data-validation @weird94
packages/sheet-data-validation @weird94
## filter
packages/sheets-filter @ybzky @yuhongz
packages/sheets-filter-ui @ybzky @yuhongz
## misc
packages/sheets-zen-editor @Jocs

# business - slides
## docs

packages/docs @Jocs
packages/docs-drawing @weird94
packages/docs-drawing-ui @weird94
packages/docs-hyper-link @weird94
packages/docs-hyper-link-ui @weird94
packages/docs-mention-ui @weird94
packages/docs-thread-comment-ui @weird94
packages/docs-ui @jikkai @Jocs

## slides

packages/slides @jikkai
packages/slides-ui @jikkai

## Facade API

**/facade/** @weird94 @VicKun4937

## Collaboration

**/mutations/** @yuhongz @wzhudev
20 changes: 4 additions & 16 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🐛 Bug report
description: Create a report to help us improve.
labels: bug
type: Bug
title: '[Bug] '

body:
Expand All @@ -22,26 +22,14 @@ body:
validations:
required: true

# - type: checkboxes
# id: affected-productions
# attributes:
# label: Affected productions
# options:
# - label: Univer Sheet
# value: sheet
# - label: Univer Doc
# value: doc
# - label: Univer Slide
# value: slide
# validations:
# required: true

- type: textarea
id: steps-to-reproduce
attributes:
label: Reproduction link
description: |
We provide an [online template](https://stackblitz.com/~/github.com/awesome-univer/sheets-vite-demo), if your issue can be reproduced in this template, please provide the reproduction link here.
**Please note that it is essential to provide a reproduction and describe the reproduction steps in detail. If you cannot provide a reproduction link, your issue may be closed directly.**
We provide a [Vite online template](https://stackblitz.com/edit/univer-sheets-vite) and a [UMD online template](https://stackblitz.com/edit/univer-sheets-umd). If your issue can be reproduced in one of these templates, please provide the reproduction link here.
We also provide some other [template repositories](https://github.com/awesome-univer), you can choose one of them to reproduce your issue.
If your issue cannot be reproduced in the template, please provide as detailed reproduction steps as possible.
validations:
Expand Down
18 changes: 2 additions & 16 deletions .github/ISSUE_TEMPLATE/bug_report.zh-CN.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🐛 Bug 报告
description: 尽管我们提供了中文 Bug 报告的入口,但还是建议您使用英语描述问题,这可以让更多的人来帮助您。
labels: bug
type: Bug
title: '[Bug] '

body:
Expand All @@ -22,28 +22,14 @@ body:
validations:
required: true

# - type: checkboxes
# id: affected-productions
# attributes:
# label: 受影响的产品
# options:
# - label: Univer Sheet
# value: sheet
# - label: Univer Doc
# value: doc
# - label: Univer Slide
# value: slide
# validations:
# required: true

- type: textarea
id: steps-to-reproduce
attributes:
label: 复现链接
description: |
**请注意,请务必认真提供复现并详细描述复现步骤,如果您无法提供复现链接,你的问题有可能会被直接关闭。**
我们提供了 [在线模板](https://stackblitz.com/~/github.com/awesome-univer/sheets-vite-demo),如果您的问题可以在这个模板中复现,那么请在这里提供复现链接。
我们提供了 [Vite 在线模板](https://stackblitz.com/edit/univer-sheets-vite) 和 [UMD 在线模板](https://stackblitz.com/edit/univer-sheets-umd),如果您的问题可以在这个模板中复现,那么请在这里提供复现链接。
我们也提供了一些其他你可能会用到的 [模板仓库](https://github.com/awesome-univer),你可以选择其中一个来复现你的问题。
如果您的问题无法在模板中复现,请提供尽可能详细的复现步骤。
validations:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🚀 Feature request
description: Suggest an idea
labels: feature request
type: Feature
title: '[Feature] '

body:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.zh-CN.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🚀 新功能请求
description: 尽管我们提供了中文 Feature request 的入口,但还是建议您使用英语描述需求,这可以让更多的人来帮助您。
labels: feature
type: Feature
title: '[Feature] '

body:
Expand Down
17 changes: 17 additions & 0 deletions .github/actions/update-snapshots/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 📸 Update Snapshots
description: Update snapshots and push a new commit.

runs:
using: composite
steps:
- name: Install Playwright Browsers
shell: bash
run: pnpm exec playwright install --with-deps chromium

- name: Build E2E Client
shell: bash
run: pnpm build:e2e

- name: Update Snapshots
shell: bash
run: pnpm exec playwright test e2e/visual-comparison --update-snapshots
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: 📦 Build

on:
push:
branches: [dev]
branches:
- dev
pull_request:
branches: [dev]
branches:
- dev

permissions:
contents: read
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: 🧪 CI Test

on:
push:
branches: [main, dev]
branches:
- dev
pull_request:
branches: [main, dev]
branches:
- dev

permissions:
contents: read
Expand Down
36 changes: 16 additions & 20 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: 🎭 Playwright Tests

on:
pull_request:
branches: [dev]
branches:
- dev

jobs:
e2e-test:
Expand All @@ -25,35 +26,30 @@ jobs:
run: pnpm build:e2e

- name: Run Playwright Tests
run: pnpm exec playwright test
run: pnpm exec playwright test --output=playwright-assets

- name: 🚀 Deploy to Vercel
uses: amondnet/vercel-action@v25
id: vercel-e2e-report
if: failure()
id: vercel-e2e-report # we only need to upload to Vercel if this CI fails
with:
vercel-token: ${{ secrets.VERCEL_TOKEN }}
vercel-org-id: ${{ secrets.ORG_ID }}
vercel-project-id: ${{ secrets.PROJECT_ID_E2E}}
vercel-project-id: ${{ secrets.PROJECT_ID_E2E }}

- name: Generate Playwright Report
- name: Write Playwright Report to PR Comment
uses: daun/playwright-report-summary@v3
if: always()
with:
report-file: playwright-report.json
custom-info: 'For more information, [see full report](${{ steps.vercel-e2e-report.outputs.preview-url }})'

# - name: Set Label
# uses: actions/github-script@v6
# if: failure()
# with:
# script: |
# const { owner, repo } = context.repo;
# const prNumber = context.payload.pull_request.number;
# const labelsToAdd = ['qa:rejected'];

# await github.rest.issues.addLabels({
# owner,
# repo,
# issue_number: prNumber,
# labels: labelsToAdd,
# });
- name: Upload Artifact
uses: actions/upload-artifact@v4
if: ${{ !cancelled() }}
with:
name: playwright-report
path: |
playwright-report/
test-results/
retention-days: 30
Loading

0 comments on commit 658b079

Please sign in to comment.