Skip to content

Commit b587fa1

Browse files
foufrixfoufrix
authored
Merge branch 'master' into feat-add-trace-offer
2 parents cb97fa5 + 76d287f commit b587fa1

246 files changed

Lines changed: 38356 additions & 17170 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.

‎.github/workflows/cli-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
node-version: [20]
22+
node-version: [22]
2323
steps:
2424
- uses: actions/checkout@v3
2525

‎.github/workflows/docker-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
node-version: [20]
16+
node-version: [22]
1717
steps:
1818
-
1919
name: Set up QEMU

‎.github/workflows/portal-client.yml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: PortalClient
2+
on:
3+
pull_request:
4+
types: [opened, reopened, synchronize]
5+
paths:
6+
- 'packages/portal-client/**'
7+
env:
8+
cwd: ${{github.workspace}}/packages/portal-client
9+
defaults:
10+
run:
11+
working-directory: packages/portal-client
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
14+
cancel-in-progress: true
15+
jobs:
16+
test-react-portal-client:
17+
runs-on: ubuntu-latest
18+
strategy:
19+
matrix:
20+
node-version: [22]
21+
steps:
22+
- uses: actions/checkout@v4
23+
with:
24+
submodules: recursive
25+
- name: Use Node.js ${{ matrix.node-version }}
26+
uses: actions/setup-node@v4
27+
with:
28+
node-version: ${{ matrix.node-version }}
29+
cache: 'npm'
30+
cache-dependency-path: 'packages/portal-client/package-lock.json'
31+
32+
- run: npm i -g @mapbox/node-pre-gyp
33+
- run: npm ci
34+
# working-directory: ${{ github.workspace }}
35+
- run: npm run biome
36+
# working-directory: ${{ github.workspace }}
37+
- run: npm run test
38+
39+
# test-tauri-portal-client:
40+
# runs-on: ubuntu-latest
41+
# strategy:
42+
# matrix:
43+
# node-version: [22]
44+
# steps:
45+
# - uses: actions/checkout@v4
46+
# with:
47+
# submodules: recursive
48+
49+
# - name: Use Node.js ${{ matrix.node-version }}
50+
# uses: actions/setup-node@v4
51+
# with:
52+
# node-version: ${{ matrix.node-version }}
53+
# cache: 'npm'
54+
55+
# - name: Install Rust
56+
# uses: dtolnay/rust-toolchain@stable
57+
# with:
58+
# components: clippy, rustfmt
59+
60+
# - name: Rust cache
61+
# uses: swatinem/rust-cache@v2
62+
# with:
63+
# workspaces: "packages/portal-client/src-tauri -> target"
64+
65+
# - name: Install Tauri dependencies
66+
# if: runner.os == 'Linux'
67+
# run: |
68+
# sudo apt-get update
69+
# sudo apt-get install -y build-essential \
70+
# curl \
71+
# wget \
72+
# libssl-dev \
73+
# libgtk-3-dev \
74+
# libayatana-appindicator3-dev \
75+
# librsvg2-dev
76+
77+
# - run: npm ci
78+
# working-directory: ${{ github.workspace }}
79+
80+
# - name: Rust lint
81+
# run: cd src-tauri && cargo clippy -- -D warnings
82+
83+
# - name: Rust format check
84+
# run: cd src-tauri && cargo fmt --check
85+
86+
# - name: Run Tauri unit tests
87+
# run: cd src-tauri && cargo test --lib --bins
88+
89+
# - name: Run Tauri integration tests
90+
# run: cd src-tauri && cargo test --test '*'

‎.github/workflows/portalnetwork-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
node-version: [20]
22+
node-version: [22]
2323
steps:
2424
- uses: actions/checkout@v4
2525
with:
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ubuntu-latest
4646
strategy:
4747
matrix:
48-
node-version: [20]
48+
node-version: [22]
4949
steps:
5050
- uses: actions/checkout@v4
5151
with:

‎.vscode/settings.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,13 @@
44
},
55
"eslint.format.enable": true,
66
"eslint.validate": ["javascript", "typescript"],
7-
"eslint.workingDirectories": [{ "mode": "auto" }]
7+
"eslint.workingDirectories": [{ "mode": "auto" }],
8+
"rust-analyzer.rustc.source": "discover",
9+
"rust-analyzer.linkedProjects": [
10+
"packages/portal-client/src-tauri/Cargo.toml"
11+
],
12+
"rust-analyzer.checkOnSave.command": "clippy",
13+
"rust-analyzer.cargo.buildScripts.enable": true,
14+
"rust-analyzer.procMacro.enable": true,
15+
"rust-analyzer.diagnostics.enable": true
816
}

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-alpine
1+
FROM node:22-alpine
22

33
RUN apk update && apk add --no-cache bash g++ make git python3 && rm -rf /var/cache/apk/*
44
RUN apk add --virtual .build-deps alpine-sdk jq

‎biome.json‎

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,3 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
3-
"vcs": {
4-
"enabled": false,
5-
"clientKind": "git",
6-
"useIgnoreFile": false
7-
},
8-
"files": {
9-
"ignoreUnknown": false,
10-
"ignore": [
11-
"**/node_modules/**",
12-
"**/dist/**",
13-
"**/coverage/**",
14-
"**/portal-spec-tests/**",
15-
"**/config/**",
16-
"**/archived-browser-client",
17-
"**/browser-client",
18-
"tsconfig.*.json",
19-
"**/testData",
20-
"**/scripts/**/*.json"
21-
]
22-
},
23-
"formatter": {
24-
"enabled": true,
25-
"indentStyle": "space",
26-
"indentWidth": 2,
27-
"lineWidth": 100
28-
},
29-
"organizeImports": {
30-
"enabled": true
31-
},
32-
"linter": {
33-
"enabled": false,
34-
"rules": {
35-
"recommended": true
36-
}
37-
},
38-
"javascript": {
39-
"formatter": {
40-
"quoteStyle": "single",
41-
"semicolons": "asNeeded"
42-
}
43-
}
2+
"extends": ["./config/biome.json"]
443
}

‎config/biome.json‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
{
2+
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
3+
"vcs": {
4+
"enabled": false,
5+
"clientKind": "git",
6+
"useIgnoreFile": false
7+
},
8+
"files": {
9+
"ignoreUnknown": false,
10+
"include": ["packages/cli", "packages/portalnetwork", "packages/portal-client"],
11+
"ignore": [
12+
"**/node_modules/**",
13+
"**/dist/**",
14+
"**/coverage/**",
15+
"packages/archived-transport-layers/",
16+
"packages/archived-browser-client/",
17+
"packages/archived-browser/",
18+
"packages/proxy/",
19+
"packages/ui/",
20+
"packages/cli/scripts",
21+
"tsconfig.lint.json",
22+
"**/testData",
23+
"**/scripts/**/*.json",
24+
"**/*.css",
25+
"**/*.scss",
26+
"**/*.html",
27+
"**/*.tsx",
28+
"packages/**/docs/**"
29+
]
30+
},
31+
"formatter": {
32+
"enabled": true,
33+
"indentStyle": "space",
34+
"indentWidth": 2,
35+
"lineWidth": 100
36+
},
37+
"organizeImports": {
38+
"enabled": true
39+
},
40+
"linter": {
41+
"enabled": true,
42+
"rules": {
43+
"recommended": true,
44+
"style": {
45+
"noNamespace": "error",
46+
"noNonNullAssertion": "off",
47+
"useTemplate": "off",
48+
"useNodejsImportProtocol": "off",
49+
"noUselessElse": "off",
50+
"useSingleVarDeclarator": "off",
51+
"noParameterAssign": "off",
52+
"useSelfClosingElements": "off"
53+
},
54+
"suspicious": {
55+
"noRedeclare": "off",
56+
"noDuplicateClassMembers": "off",
57+
"useNamespaceKeyword": "off",
58+
"noExplicitAny": "off",
59+
"noImplicitAnyLet": "off",
60+
"noArrayIndexKey": "off",
61+
"noConfusingVoidType": "off",
62+
"noAssignInExpressions": "off",
63+
"noExportsInTest": "off"
64+
},
65+
"correctness": {
66+
"noUnusedVariables": "off",
67+
"useImportExtensions": "off",
68+
"useExhaustiveDependencies": "off"
69+
},
70+
"complexity": {
71+
"useOptionalChain": "off",
72+
"noForEach": "off",
73+
"noUselessTernary": "off",
74+
"useLiteralKeys": "off",
75+
"noBannedTypes": "off",
76+
"noStaticOnlyClass": "info"
77+
},
78+
"a11y": {
79+
"useKeyWithClickEvents": "off",
80+
"useSemanticElements": "off",
81+
"useButtonType": "off",
82+
"noSvgWithoutTitle": "off",
83+
"noNoninteractiveTabindex": "off"
84+
}
85+
}
86+
},
87+
"overrides": [
88+
{
89+
"include": ["**/cli/**/*.ts"],
90+
"linter": {
91+
"rules": {
92+
"suspicious": {
93+
"noConsole": "off"
94+
}
95+
}
96+
}
97+
}
98+
],
99+
"javascript": {
100+
"formatter": {
101+
"quoteStyle": "single",
102+
"semicolons": "asNeeded"
103+
}
104+
},
105+
"json": {
106+
"parser": {
107+
"allowComments": true,
108+
"allowTrailingCommas": true
109+
}
110+
}
111+
}

0 commit comments

Comments
 (0)