Skip to content

Commit 61024ac

Browse files
authored
Merge branch 'main' into package-version
2 parents ad55345 + 691ddb1 commit 61024ac

File tree

6 files changed

+821
-43
lines changed

6 files changed

+821
-43
lines changed

.github/workflows/client.yml

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

.github/workflows/codeql.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ name: "CodeQL"
1414
on:
1515
push:
1616
branches: [ "main" ]
17-
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [ "main" ]
2017
schedule:
2118
- cron: '20 15 * * 5'
2219

@@ -57,7 +54,7 @@ jobs:
5754

5855
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5956
# queries: security-extended,security-and-quality
60-
57+
6158
- if: matrix.language == 'java'
6259
name: Build Java
6360
run: |

client/config/test/jest.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ const dirname = currentDirName(import.meta.url);
1313

1414
export default {
1515
testEnvironment: "jsdom",
16+
testEnvironmentOptions: {
17+
url: 'http://localhost'
18+
},
1619
moduleNameMapper: {
1720
"react-markdown": path.resolve(dirname, "./mocks/react-markdown.js"),
1821
"\\.md\\?url$": path.resolve(dirname, "./mocks/markdown-url-module.js"),

client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"babel-jest": "^29.3.0",
4747
"babel-preset-react-app": "^10.0.1",
4848
"husky": "^8.0.1",
49-
"jest": "^29.3.0",
50-
"jest-environment-jsdom": "^29.0.3",
49+
"jest": "^29.5.0",
50+
"jest-environment-jsdom": "^29.5.0",
5151
"lint-staged": "^13.0.1",
5252
"lowcoder-dev-utils": "workspace:^",
5353
"mq-polyfill": "^1.1.8",

client/packages/lowcoder-comps/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "0.0.5",
3+
"version": "0.0.12",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {
@@ -62,6 +62,7 @@
6262
"start": "vite",
6363
"build": "yarn test && lowcoder-cli build",
6464
"build_only": "lowcoder-cli build",
65+
"build_publish": "lowcoder-cli build --publish",
6566
"test": "jest"
6667
},
6768
"devDependencies": {

0 commit comments

Comments
 (0)