Skip to content

Commit a1c9bf2

Browse files
authored
Merge pull request #271 from Concordium/release/10
Release/10
2 parents bab7bc4 + 8477eb7 commit a1c9bf2

File tree

428 files changed

+18435
-14156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

428 files changed

+18435
-14156
lines changed

.eslintrc.cjs

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
module.exports = {
2+
env: {
3+
browser: true,
4+
es2020: true,
5+
},
6+
extends: [
7+
'plugin:prettier/recommended',
8+
'plugin:@typescript-eslint/recommended',
9+
'plugin:import/recommended',
10+
'plugin:import/typescript',
11+
],
12+
parser: '@typescript-eslint/parser',
13+
parserOptions: {
14+
ecmaVersion: 2020,
15+
sourceType: 'module',
16+
tsconfigRootDir: __dirname,
17+
project: [
18+
'./packages/**/tsconfig.json',
19+
'./docs/**/tsconfig.json',
20+
'**/tsconfig.eslint.json',
21+
],
22+
},
23+
plugins: ['@typescript-eslint', 'import'],
24+
rules: {
25+
'prettier/prettier': 'warn',
26+
quotes: [
27+
2,
28+
'single',
29+
{
30+
avoidEscape: true,
31+
},
32+
],
33+
'import/no-unresolved': [
34+
2,
35+
{
36+
ignore: [
37+
'@concordium/rust-bindings',
38+
'grpc-api',
39+
'^#.+$', // ESLint resolver does not support subpath imports: https://github.com/import-js/eslint-plugin-import/issues/1868.
40+
],
41+
},
42+
],
43+
'import/no-extraneous-dependencies': [
44+
'error',
45+
{
46+
devDependencies: ['**/*/test/*', '**/*.config.js'],
47+
},
48+
],
49+
'@typescript-eslint/no-unused-vars': [
50+
'warn',
51+
{
52+
ignoreRestSiblings: true,
53+
},
54+
],
55+
},
56+
overrides: [
57+
{
58+
files: ['*.config.js'],
59+
rules: {
60+
'@typescript-eslint/no-var-requires': 'off',
61+
'import/namespace': 'off',
62+
},
63+
},
64+
],
65+
ignorePatterns: [
66+
'**/pkg/**/',
67+
'**/dist/**/',
68+
'**/lib/**/',
69+
'deps/**/*',
70+
'**/src/grpc-api/*',
71+
'typedoc/**',
72+
],
73+
settings: {
74+
'import/ignore': ['bs58check'],
75+
'import/parsers': {
76+
'@typescript-eslint/parser': ['.ts', '.tsx'],
77+
},
78+
'import/resolver': {
79+
exports: true,
80+
typescript: {
81+
project: ['packages/*/tsconfig.json'],
82+
},
83+
node: {
84+
project: ['packages/*/tsconfig.json'],
85+
},
86+
},
87+
},
88+
};

.eslintrc.json

Lines changed: 0 additions & 54 deletions
This file was deleted.

.github/workflows/deployment.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
# Allows you to run this workflow manually from the Actions tab
55
workflow_dispatch:
66

7-
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
7+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
88
permissions:
99
contents: read
1010
pages: write
@@ -38,7 +38,8 @@ jobs:
3838
with:
3939
workspaces: |
4040
packages/rust-bindings
41-
deps/concordium-deps
41+
deps/concordium-base/rust-src
42+
deps/concordium-base/concordium-contracts-common
4243
4344
- name: Get wasm-pack
4445
uses: jetli/[email protected]
@@ -49,11 +50,22 @@ jobs:
4950
id: yarn-cache
5051
uses: actions/cache@v3
5152
with:
52-
path: node_modules
53+
path: |
54+
./node_modules
55+
./docs/node_modules
5356
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
5457
restore-keys: |
5558
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
5659
60+
- name: Cache GRPC
61+
id: cache-grpc
62+
uses: actions/cache@v3
63+
with:
64+
path: |
65+
./packages/sdk/src/grpc-api
66+
key: ${{ runner.os }}-grpc-${{ hashFiles('deps/concordium-base/concordium-grpc-api') }}
67+
restore-keys: ${{ runner.os }}-grpc
68+
5769
- name: Get dependencies
5870
if: steps.yarn-cache.outputs.cache-hit != 'true'
5971
run: yarn install --immutable
@@ -66,19 +78,17 @@ jobs:
6678
with:
6779
name: build-release
6880
path: |
69-
packages/*/lib
70-
packages/*/grpc
71-
packages/*/package.json
72-
packages/*/README.md
73-
packages/rust-bindings/pkg/*/concordium_rust_bindings*
81+
./packages/sdk/lib
82+
./packages/sdk/src
83+
./packages/rust-bindings/lib
84+
./packages/*/package.json
85+
./packages/*/README.md
7486
7587
build-typedoc:
7688
runs-on: ubuntu-22.04
7789
needs: build
7890
steps:
7991
- uses: actions/checkout@v3
80-
with:
81-
submodules: "recursive"
8292

8393
- uses: actions/setup-node@v3
8494
with:
@@ -93,11 +103,13 @@ jobs:
93103
- name: Restore cached dependencies
94104
uses: actions/cache/restore@v3
95105
with:
96-
path: node_modules
106+
path: |
107+
./node_modules
108+
./docs/node_modules
97109
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
98110

99111
- name: Generate typedoc documentation
100-
run: yarn typedoc
112+
run: yarn build:docs
101113

102114
- name: Store typedoc
103115
uses: ./.github/actions/upload-artifact

0 commit comments

Comments
 (0)