Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5bd8b6c
style: panel use default zIndex
erha19 Nov 15, 2023
c6f4235
Merge branch 'main' into style/fix-panel-z-index
erha19 Nov 20, 2023
871515c
chore: update check ci
erha19 Nov 20, 2023
a0a5d40
chore: remove cache
erha19 Nov 20, 2023
b4db8f4
chore: remove cache clear
erha19 Nov 21, 2023
f484142
chore: remove lock
erha19 Nov 21, 2023
edb47ad
chore: update ci
erha19 Nov 22, 2023
8f6dcef
chore: do not use cache
erha19 Nov 23, 2023
5838645
chore: use mac 12
erha19 Nov 23, 2023
4432a56
chore: test macos
erha19 Nov 23, 2023
bec89bd
chore: update test
erha19 Nov 23, 2023
2c0c8e7
chore: add checksumBehavior
erha19 Nov 23, 2023
0832ada
chore: update ci
erha19 Nov 23, 2023
38963c0
chore: update ci
erha19 Nov 23, 2023
5b78860
chore: update check
erha19 Nov 23, 2023
696ec96
chore: get yarn version
erha19 Nov 23, 2023
c0221c6
chore: use node-16 again
erha19 Nov 24, 2023
3546328
chore: remove some config
erha19 Nov 24, 2023
41bf411
chore: update ci
erha19 Nov 24, 2023
a3195c1
chore: test yarn 3.6.4
erha19 Nov 24, 2023
2a85447
chore: use yarn 3.6.4
erha19 Nov 24, 2023
f730252
chore: lock node-gyp version
erha19 Nov 24, 2023
beb1734
chore: update lock file
erha19 Nov 24, 2023
d56c42a
chore: use setup-node v3
erha19 Nov 24, 2023
c3efa83
chore: setup python
erha19 Nov 24, 2023
988b241
chore: setup python
erha19 Nov 24, 2023
c111cbc
chore: setup python
erha19 Nov 24, 2023
29cd969
chore: remove space
erha19 Nov 24, 2023
22c0878
chore: remove space
erha19 Nov 24, 2023
51d6a6a
chore: fix test
erha19 Nov 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ jobs:
strategy:
matrix:
os: [macos-latest, ubuntu-latest]
node-version: [14.x]
node-version: [16.x]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand All @@ -30,14 +33,16 @@ jobs:
- name: Get yarn cache directory path
id: yarn_cache_dir_path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
id: yarn_cache
with:
path: ${{ steps.yarn_cache_dir_path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: install

- name: Install
run: |
yarn install --immutable

Expand All @@ -49,17 +54,19 @@ jobs:
- name: Lint
run: |
yarn run lint --quiet

build-windows:
runs-on: windows-2019
steps:
- uses: actions/checkout@v4
- name: Use Node.js 14.x
- name: Use Node.js 16.x
uses: actions/setup-node@v4
with:
node-version: 14.x
node-version: 16.x
- name: Get yarn cache directory path
id: yarn_cache_dir_path
run: echo "dir=$(yarn config get cacheFolder)" >> $Env:GITHUB_OUTPUT

- uses: actions/cache@v3
id: yarn_cache
with:
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,41 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# os: [macos-latest, ubuntu-latest, windows-2019]
os: [macos-latest, ubuntu-latest]
node-version: [14.x]
node-version: [16.x]
ci-project: [node, jsdom]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Get yarn cache directory path
id: yarn_cache_dir_path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
id: yarn_cache
with:
path: ${{ steps.yarn_cache_dir_path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: install

- name: Install
run: |
yarn install --immutable

- name: CI
run: |
yarn run ci --selectProjects ${{ matrix.ci-project }}

- if: ${{ matrix.node-version == '14.x' && matrix.os == 'ubuntu-latest' }}
- if: ${{ matrix.node-version == '16.x' && matrix.os == 'ubuntu-latest' }}
name: Upload coverage to Codecov
uses: codecov/codecov-action@v2
with:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@ jobs:
flag: ${{ secrets.BOT_FLAG }}

- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Get yarn cache directory path
id: yarn_cache_dir_path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
id: yarn_cache
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

jobs:
build:
name: ubuntu-latest, Node.js 14.x
name: ubuntu-latest, Node.js 16.x

runs-on: ubuntu-latest
timeout-minutes: 60
Expand All @@ -23,22 +23,24 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Use Node.js "14.x"
- name: Use Node.js "16.x"
uses: actions/setup-node@v4
with:
node-version: '14.x'
node-version: '16.x'
registry-url: 'https://registry.npmjs.org'

- name: Get yarn cache directory path
id: yarn_cache_dir_path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
id: yarn_cache
with:
path: ${{ steps.yarn_cache_dir_path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Install
run: |
yarn install --immutable
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/release-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node-version: [16.x]

steps:
# 判断用户是否有写权限
Expand All @@ -38,7 +38,9 @@ jobs:
with:
ref: ${{ github.event.inputs.ref }}
token: ${{ env.GITHUB_TOKEN }}

- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand All @@ -47,6 +49,7 @@ jobs:
- name: Get yarn cache directory path
id: yarn_cache_dir_path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
id: yarn_cache
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
environment: latest
strategy:
matrix:
node-version: [14.x]
node-version: [16.x]

steps:
# 判断用户是否有管理员权限
Expand Down
801 changes: 0 additions & 801 deletions .yarn/releases/yarn-3.2.4.cjs

This file was deleted.

874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.4.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'

yarnPath: .yarn/releases/yarn-3.2.4.cjs
yarnPath: .yarn/releases/yarn-3.6.4.cjs
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@
"resolutions": {
"@types/react": "^16.9.23",
"@types/react-dom": "^16.9.17",
"classnames": "2.3.1"
"classnames": "2.3.1",
"node-gyp": "9.3.1"
},
"packageManager": "yarn@3.2.4"
"packageManager": "yarn@3.6.4"
}
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ describe('main layout test', () => {
jest.advanceTimersByTime(10);
});
// panel visible
expect((document.getElementsByClassName(testContainerId)[0] as HTMLDivElement).style.zIndex).toEqual('1');
expect((document.getElementsByClassName(testContainerId)[0] as HTMLDivElement).style.display).toEqual('block');
});

it('should be able to judge whether a tab panel is visible', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/main-layout/src/browser/tabbar/panel.view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ const NoUpdateBoundary: React.FC<{ visible: boolean; children: React.ReactElemen
(prev, next) => !(prev.visible || next.visible),
);

const panelVisible = { zIndex: 1, display: 'block' };
const panelInVisible = { zIndex: -1, display: 'none' };
const panelVisible = { display: 'block' };
const panelInVisible = { display: 'none' };

export interface IBaseTabPanelView {
PanelView: React.FC<{ component: ComponentRegistryInfo; side: string; titleMenu: IMenu }>;
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10720,7 +10720,7 @@ __metadata:

"fsevents@patch:fsevents@^1.2.7#~builtin<compat/fsevents>":
version: 1.2.13
resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin<compat/fsevents>::version=1.2.13&hash=18f3a7"
resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin<compat/fsevents>::version=1.2.13&hash=d11327"
dependencies:
bindings: ^1.5.0
nan: ^2.12.1
Expand All @@ -10730,7 +10730,7 @@ __metadata:

"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
version: 2.3.2
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
dependencies:
node-gyp: latest
conditions: os=darwin
Expand Down Expand Up @@ -15990,7 +15990,7 @@ __metadata:
languageName: node
linkType: hard

"node-gyp@npm:^9.0.0, node-gyp@npm:latest":
"node-gyp@npm:9.3.1":
version: 9.3.1
resolution: "node-gyp@npm:9.3.1"
dependencies:
Expand Down Expand Up @@ -19299,7 +19299,7 @@ __metadata:

"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.18.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
version: 1.22.1
resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=c3c19d"
dependencies:
is-core-module: ^2.9.0
path-parse: ^1.0.7
Expand Down Expand Up @@ -21773,21 +21773,21 @@ __metadata:

"typescript@patch:typescript@4.9.3#~builtin<compat/typescript>":
version: 4.9.3
resolution: "typescript@patch:typescript@npm%3A4.9.3#~builtin<compat/typescript>::version=4.9.3&hash=701156"
resolution: "typescript@patch:typescript@npm%3A4.9.3#~builtin<compat/typescript>::version=4.9.3&hash=a66ed4"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: ef65c22622d864497d0a0c5db693523329b3284c15fe632e93ad9aa059e8dc38ef3bd767d6f26b1e5ecf9446f49bd0f6c4e5714a2eeaf352805dc002479843d1
checksum: d7bdcf5e18193f709339540d69577f7b0389000265db2bf10edfaa67336a29d6bcbee11828084150f7fdd110d605794cfa6df33bebc0a2e33daad2dbe2a7a59f
languageName: node
linkType: hard

"typescript@patch:typescript@^3 || ^4#~builtin<compat/typescript>, typescript@patch:typescript@^4.4.3#~builtin<compat/typescript>, typescript@patch:typescript@^4.6.4#~builtin<compat/typescript>":
version: 4.9.5
resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=701156"
resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=289587"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 2eee5c37cad4390385db5db5a8e81470e42e8f1401b0358d7390095d6f681b410f2c4a0c496c6ff9ebd775423c7785cdace7bcdad76c7bee283df3d9718c0f20
checksum: 1f8f3b6aaea19f0f67cba79057674ba580438a7db55057eb89cc06950483c5d632115c14077f6663ea76fd09fce3c190e6414bb98582ec80aa5a4eaf345d5b68
languageName: node
linkType: hard

Expand Down