Skip to content

Commit 9c209a6

Browse files
authored
ci: nodejs build
* Added build pipeline for client * Added build pipeline for node-service * Rolled back simplebar for type compatibility * Changed content property as it is reserved in react/types. More here: DefinitelyTyped/DefinitelyTyped@3f5d206
1 parent a989797 commit 9c209a6

File tree

6 files changed

+2993
-5345
lines changed

6 files changed

+2993
-5345
lines changed

.github/workflows/client.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ on:
44
types: [opened, synchronize, reopened]
55
paths:
66
- 'client/**'
7+
- '.github/workflows/client.yml'
78

89
permissions:
910
contents: read
1011

1112
jobs:
12-
test:
13-
name: Tests
13+
build-client:
14+
name: Build
1415
runs-on: ubuntu-latest
1516
strategy:
1617
matrix:
@@ -25,15 +26,13 @@ jobs:
2526
node-version: ${{ matrix.node-version }}
2627
cache: 'yarn'
2728
cache-dependency-path: 'client/yarn.lock'
28-
- run: |
29-
cd client && yarn install && yarn test
30-
# - name: Install dependencies
31-
# uses: borales/actions-yarn@v4
32-
# with:
33-
# cmd: install
34-
# dir: client
35-
# - name: Run tests
36-
# uses: borales/actions-yarn@v4
37-
# with:
38-
# cmd: test
39-
# dir: client
29+
- name: Install dependencies
30+
uses: borales/actions-yarn@v4.2.0
31+
with:
32+
cmd: install
33+
dir: client
34+
- name: Run tests
35+
uses: borales/actions-yarn@v4.2.0
36+
with:
37+
cmd: build
38+
dir: client

.github/workflows/node-service.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Node Service
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
paths:
6+
- 'server/node-service/**'
7+
- '.github/workflows/node-service.yml'
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
build-node-service:
14+
name: Build
15+
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
node-version: [ 20.x ]
19+
steps:
20+
- uses: actions/checkout@v3
21+
with:
22+
fetch-depth: 0
23+
- name: Use Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v3
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
cache: 'yarn'
28+
cache-dependency-path: 'server/node-service/yarn.lock'
29+
- name: Install dependencies
30+
uses: borales/actions-yarn@v4.2.0
31+
with:
32+
cmd: install
33+
dir: server/node-service
34+
- name: Run tests
35+
uses: borales/actions-yarn@v4.2.0
36+
with:
37+
cmd: build
38+
dir: server/node-service

client/packages/lowcoder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"rehype-sanitize": "^5.0.1",
8888
"remark-gfm": "^3.0.1",
8989
"resize-observer-polyfill": "^1.5.1",
90-
"simplebar-react": "^2.3.6",
90+
"simplebar-react": "2.3.6",
9191
"sql-formatter": "^8.2.0",
9292
"styled-components": "^5.3.3",
9393
"stylis": "^4.1.1",

client/packages/lowcoder/src/comps/comps/navComp/components/DraggableItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const Wrapper = styled.div<{ dragging: boolean; isOver: boolean; dropInAsSub: bo
7474
`;
7575

7676
interface IProps extends HTMLAttributes<HTMLDivElement> {
77-
content: ReactNode;
77+
dragContent: ReactNode;
7878
isOver?: boolean;
7979
extra?: ReactNode;
8080
dragging?: boolean;
@@ -84,7 +84,7 @@ interface IProps extends HTMLAttributes<HTMLDivElement> {
8484

8585
function DraggableItem(props: IProps, ref: Ref<HTMLDivElement>) {
8686
const {
87-
content: text,
87+
dragContent: text,
8888
extra,
8989
dragging = false,
9090
dropInAsSub = true,

client/packages/lowcoder/src/comps/comps/navComp/components/MenuItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ const MenuItem = React.forwardRef((props: IMenuItemProps, ref: React.Ref<HTMLDiv
7373
dragging={dragging}
7474
dropInAsSub={dropInAsSub}
7575
dragListeners={dragListeners}
76-
content={
76+
dragContent={
7777
<SimplePopover
7878
title={trans("edit")}
7979
content={content}

0 commit comments

Comments
 (0)