Skip to content

Commit d10c086

Browse files
committed
2 parents 6118a8c + 0759dd0 commit d10c086

24 files changed

+4604
-5548
lines changed

.eslintrc

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

.github/workflows/cicd.yaml

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
jobs:
19-
build:
20-
name: Build
19+
build-and-lint:
20+
name: Build and Lint
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Check out repository
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup node
2727
uses: actions/setup-node@v4
2828
with:
29-
node-version: 18
29+
node-version: 20
3030
scope: "@subtopia-algo"
3131
cache: "npm"
3232
cache-dependency-path: ./package-lock.json
@@ -37,34 +37,16 @@ jobs:
3737
- name: Run build
3838
run: npm run build
3939

40-
lint:
41-
name: Linting
42-
runs-on: ubuntu-latest
43-
steps:
44-
- name: Check out repository
45-
uses: actions/checkout@v4
46-
47-
- name: Setup node
48-
uses: actions/setup-node@v4
49-
with:
50-
node-version: 18
51-
scope: "@subtopia-algo"
52-
cache: "npm"
53-
cache-dependency-path: ./package-lock.json
54-
55-
- name: Install dependencies
56-
run: npm ci
57-
5840
- name: Lint
59-
run: npm run lint:scripts
41+
run: npm run lint
6042

6143
unit-tests:
6244
name: Integration tests
6345
runs-on: ${{ matrix.os }}
6446
strategy:
6547
matrix:
6648
os: [ubuntu-latest]
67-
node: [18, 20]
49+
node: [20]
6850
steps:
6951
- name: Check out repository
7052
uses: actions/checkout@v4
@@ -75,7 +57,7 @@ jobs:
7557
ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
7658
repository: subtopia-algo/subtopia-contracts
7759
path: ./registry-infra
78-
node-version: 18
60+
node-version: 20
7961
python-version: ">=3.11 <3.12"
8062
poetry-version: 1.7.1
8163

@@ -91,11 +73,11 @@ jobs:
9173
run: npm ci
9274

9375
- name: Run tests
94-
run: npm run test:integration
76+
run: npm run test
9577

9678
- name: "Upload coverage to Codecov"
97-
uses: codecov/codecov-action@v3
98-
if: runner.os == 'Linux' && matrix.node == '18'
79+
uses: codecov/codecov-action@v4
80+
if: runner.os == 'Linux' && matrix.node == '20'
9981
with:
10082
fail_ci_if_error: true
10183
token: ${{ secrets.CODECOV_TOKEN }}
@@ -104,7 +86,7 @@ jobs:
10486
if: github.ref == 'refs/heads/release'
10587
permissions: write-all
10688
name: Deploy docs
107-
needs: [build, lint, unit-tests]
89+
needs: [build-and-lint, unit-tests]
10890
runs-on: ubuntu-latest
10991
steps:
11092
- name: Check out repository
@@ -113,7 +95,7 @@ jobs:
11395
- name: Setup node
11496
uses: actions/setup-node@v4
11597
with:
116-
node-version: 18
98+
node-version: 20
11799
scope: "@subtopia-algo"
118100
cache: "npm"
119101
cache-dependency-path: ./package-lock.json
@@ -135,7 +117,7 @@ jobs:
135117
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release'
136118
permissions: write-all
137119
name: Release
138-
needs: [build, lint, unit-tests]
120+
needs: [build-and-lint, unit-tests]
139121
runs-on: ubuntu-latest
140122
steps:
141123
- name: Check out repository
@@ -147,7 +129,7 @@ jobs:
147129
- name: Setup node
148130
uses: actions/setup-node@v4
149131
with:
150-
node-version: 18
132+
node-version: 20
151133
scope: "@subtopia-algo"
152134
cache: "npm"
153135
cache-dependency-path: ./package-lock.json
@@ -163,3 +145,13 @@ jobs:
163145
GITHUB_TOKEN: ${{ secrets.CUSTOM_GH_TOKEN }}
164146
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
165147
run: npm run release
148+
149+
- name: Merge release -> main
150+
uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
151+
if: github.ref == 'refs/heads/release'
152+
with:
153+
type: now
154+
from_branch: release
155+
target_branch: main
156+
message: Merge release back to main to get version increment [no ci]
157+
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prod_release.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,3 @@ jobs:
2121
from_branch: main
2222
target_branch: release
2323
github_token: ${{ secrets.GITHUB_TOKEN }}
24-
- name: Merge release -> main
25-
uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
26-
with:
27-
type: now
28-
from_branch: release
29-
target_branch: main
30-
message: Merge release back to main to get version increment [no ci]
31-
github_token: ${{ secrets.GITHUB_TOKEN }}

.stylelintrc

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

CHANGELOG.md

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,32 @@
1-
# [2.0.0](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v1.1.0...v2.0.0) (2024-01-29)
1+
# [2.0.0-beta.18](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.17...v2.0.0-beta.18) (2024-08-28)
22

3+
# [2.0.0-beta.17](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.16...v2.0.0-beta.17) (2024-08-28)
34

4-
### Features
5+
# [2.0.0-beta.16](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.15...v2.0.0-beta.16) (2024-08-28)
56

6-
* refactoring contracts to support latest 'token-based' types ([#39](https://github.com/subtopia-algo/subtopia-js-sdk/issues/39)) ([604becc](https://github.com/subtopia-algo/subtopia-js-sdk/commit/604beccc4fc2800b4859368aebf3228b6122dd8f))
7+
# [2.0.0-beta.15](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.14...v2.0.0-beta.15) (2024-08-27)
78

9+
# [2.0.0-beta.14](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.13...v2.0.0-beta.14) (2024-08-26)
810

9-
### BREAKING CHANGES
11+
# [2.0.0-beta.13](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.12...v2.0.0-beta.13) (2024-08-26)
1012

11-
* Deprecating interface for old contracts, adding a refined and more flexible setup with Token Based subscriptions.
13+
# [2.0.0-beta.12](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.11...v2.0.0-beta.12) (2024-08-26)
1214

13-
* refactor: improving project structure; minor refinements
15+
# [2.0.0-beta.11](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.10...v2.0.0-beta.11) (2024-03-18)
1416

15-
* chore: testing ci
17+
# [2.0.0-beta.10](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.9...v2.0.0-beta.10) (2024-03-18)
18+
19+
# [2.0.0-beta.10](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.9...v2.0.0-beta.10) (2024-03-18)
20+
21+
# [2.0.0-beta.9](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.8...v2.0.0-beta.9) (2024-03-17)
22+
23+
# [2.0.0-beta.8](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.7...v2.0.0-beta.8) (2024-03-17)
24+
25+
# [2.0.0-beta.7](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.6...v2.0.0-beta.7) (2024-03-01)
26+
27+
# [2.0.0-beta.6](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.5...v2.0.0-beta.6) (2024-03-01)
28+
29+
# [2.0.0-beta.5](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.4...v2.0.0-beta.5) (2024-02-03)
1630

1731
# [2.0.0-beta.4](https://github.com/subtopia-algo/subtopia-js-sdk/compare/v2.0.0-beta.3...v2.0.0-beta.4) (2024-01-21)
1832

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import {
5757
ChainType,
5858
SUBTOPIA_REGISTRY_ID
5959
} from "subtopia-js-sdk";
60-
// ... your code
60+
// ... your code
6161

6262
const subtopiaClient = await SubtopiaClient.init({
6363
algodClient: PUT_ALGOD_INSTANCE_HERE,

dts-bundle-generator.config.ts

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

eslint.config.mjs

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import typescriptEslint from "@typescript-eslint/eslint-plugin";
2+
import prettier from "eslint-plugin-prettier";
3+
import globals from "globals";
4+
import tsParser from "@typescript-eslint/parser";
5+
import path from "node:path";
6+
import { fileURLToPath } from "node:url";
7+
import js from "@eslint/js";
8+
import { FlatCompat } from "@eslint/eslintrc";
9+
10+
const __filename = fileURLToPath(import.meta.url);
11+
const __dirname = path.dirname(__filename);
12+
const compat = new FlatCompat({
13+
baseDirectory: __dirname,
14+
recommendedConfig: js.configs.recommended,
15+
allConfig: js.configs.all,
16+
});
17+
18+
export default [
19+
...compat.extends(
20+
"eslint:recommended",
21+
"plugin:@typescript-eslint/eslint-recommended",
22+
"plugin:@typescript-eslint/recommended",
23+
"prettier",
24+
),
25+
{
26+
plugins: {
27+
"@typescript-eslint": typescriptEslint,
28+
prettier,
29+
},
30+
31+
languageOptions: {
32+
globals: {
33+
...globals.browser,
34+
...globals.node,
35+
},
36+
37+
parser: tsParser,
38+
},
39+
40+
rules: {
41+
"prettier/prettier": "error",
42+
},
43+
},
44+
];

index.html

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

0 commit comments

Comments
 (0)