Skip to content

Commit

Permalink
Merge pull request #43 from Gateway-DAO/feat/remove-mesh
Browse files Browse the repository at this point in the history
BREAKING CHANGE: remove mesh
  • Loading branch information
Siddharth9890 authored Mar 11, 2024
2 parents 1a10c8e + a8f6230 commit 0380c59
Show file tree
Hide file tree
Showing 52 changed files with 3,295 additions and 7,456 deletions.
5 changes: 3 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ test/*
__mocks__/*
dist/*
coverage/*
custom-fetch.js
commitlint.config.js
release.config.js
.husky/*
scripts/*
scripts/*
gatewaySdk/
src/testMutationsAndQuery.ts
6 changes: 4 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release

on:
push:
branches: ['main']
branches: ['main', 'develop']

jobs:
release:
Expand All @@ -18,14 +18,16 @@ jobs:
node-version: 18.x
- name: Install pnpm
run: npm install -g pnpm@7.33.5
- name: Install uglifyjs
run: npm install uglify-js -g
- name: Install dependencies
run: pnpm install
- name: Install semantic-release extra plugins
run: pnpm install -D @semantic-release/changelog @semantic-release/git
- name: Lint
run: pnpm lint
- name: Build Graphql queries
run: pnpm mesh build
run: pnpm generate:sdk
- name: Format code
run: pnpm format
- name: Build
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,20 @@ jobs:
uses: actions/checkout@v3
- name: Install pnpm
run: npm install -g pnpm@7.33.5
- name: Install uglifyjs
run: npm install uglify-js -g
- name: Install Project Dependencies
run: pnpm install
- name: Run Eslint
run: pnpm lint
- name: Build Graphql queries
run: pnpm mesh build
run: pnpm generate:sdk
- name: Format code
run: pnpm format
- name: Test project
run: pnpm test
- name: Build
run: pnpm build
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
env:
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ node_modules/
.env
dist/
*.tgz
coverage/
coverage/
.DS_STORE
gatewaySdk/
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

pnpm lint-staged
# pnpm lint-staged


17 changes: 0 additions & 17 deletions .meshrc.yml

This file was deleted.

1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.pnpm-store/*
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
## [1.1.1](https://github.com/Gateway-DAO/gateway-js-sdk/compare/v1.1.0...v1.1.1) (2024-02-23)


### Bug Fixes

* release triggers ([d08d5f4](https://github.com/Gateway-DAO/gateway-js-sdk/commit/d08d5f4b50e099e943751dff0b37c8b16f63373b))
- release triggers ([d08d5f4](https://github.com/Gateway-DAO/gateway-js-sdk/commit/d08d5f4b50e099e943751dff0b37c8b16f63373b))

# [1.1.0](https://github.com/Gateway-DAO/gateway-js-sdk/compare/v1.0.0...v1.1.0) (2024-02-23)

Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
- Every significant change is documented in the [changelog file](https://github.com/Gateway-DAO/javascript-sdk/blob/main/CHANGELOG.md).

### Branch Organization
- Make sure to fork the repository before contributing and create the new branch using develop as the base branch.

- Make sure to fork the repository before contributing and create the new branch using develop as the base branch.

- Submit all changes directly to the `develop` branch. We use separate branches for development or for upcoming releases. And then after the bug/feature is working we release in main branch.

Expand Down
4 changes: 4 additions & 0 deletions __mocks__/user.mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { User } from '../src/user/user';
import { transactionStub } from '../test/stubs/transaction.stub';
import {
financialTransactionsStub,
userStub,
Expand Down Expand Up @@ -45,6 +46,9 @@ export const UserMockService = (user: User) => ({
.mockResolvedValue({
myFinancialTransactionsCount: 10,
}),
myTransactionsMock: jest
.spyOn(user.sdk, 'myTransactions_query')
.mockResolvedValue({ myTransactions: [transactionStub()] }),
mywalletMock: jest.spyOn(user.sdk, 'myWallet_query').mockResolvedValue({
myWallet: walletStub(),
}),
Expand Down
14 changes: 0 additions & 14 deletions custom-fetch.js

This file was deleted.

2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
coveragePathIgnorePatterns: ['custom-fetch.js', '.mesh/*'],
coveragePathIgnorePatterns: ['.gatewaySdk/*'],
};
28 changes: 15 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"lint:fix": "eslint . --fix",
"format": "prettier --write .",
"prepare": "husky install",
"build": "rm -rf dist && tsc && scripts/compress.sh && node scripts/compress.js"
"build": "rm -rf dist && tsc && scripts/compress.sh && node scripts/compress.js",
"generate:sdk": "node scripts/generateSDK/generate.js"
},
"engines": {
"node": ">=18.0.0"
Expand All @@ -31,26 +32,26 @@
],
"license": "MIT",
"dependencies": {
"@graphql-mesh/cli": "^0.87.16",
"@graphql-mesh/graphql": "^0.95.8",
"@graphql-mesh/runtime": "^0.96.11",
"@graphql-mesh/transform-filter-schema": "^0.96.3",
"@graphql-mesh/utils": "^0.96.3",
"@graphql-tools/url-loader": "^8.0.1",
"@graphql-typed-document-node/core": "^3.2.0",
"@solana/web3.js": "^1.87.6",
"@whatwg-node/fetch": "^0.9.13",
"ethers": "^5.7.2",
"fast-json-stringify": "^5.10.0",
"graphql": "^16.8.1",
"long": "^5.2.3",
"uglify-es": "^3.3.9"
"graphql-request": "^6.1.0"
},
"devDependencies": {
"@commitlint/cli": "^18.4.4",
"@commitlint/config-conventional": "^18.4.4",
"@graphql-codegen/core": "^4.0.2",
"@graphql-codegen/typed-document-node": "^5.0.6",
"@graphql-codegen/typescript": "^4.0.6",
"@graphql-codegen/typescript-graphql-request": "^6.2.0",
"@graphql-codegen/typescript-operations": "^4.2.0",
"@graphql-codegen/typescript-resolvers": "^4.0.6",
"@graphql-tools/utils": "^10.1.0",
"@types/jest": "^29.5.11",
"@types/node": "^20.10.4",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"change-case": "^5.4.3",
"dts-minify": "^0.3.2",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -61,11 +62,12 @@
"eslint-plugin-promise": "^6.1.1",
"husky": "^8.0.3",
"jest": "^29.7.0",
"json5": "^2.2.3",
"lint-staged": "^15.2.0",
"minimatch": "^9.0.3",
"prettier": "^3.1.1",
"ts-jest": "^29.1.1",
"typescript": "^5.3.3",
"uglify-js": "^3.17.4"
"typescript": "^5.3.3"
},
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit 0380c59

Please sign in to comment.