Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several fixes #1825

Merged
merged 8 commits into from
Sep 3, 2024
Merged

Several fixes #1825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
65f70b7
feat: add support for optimism chain (#1816)
0xGabi Nov 10, 2023
01a8464
fix GitHub workflow badge URL (#1818)
shoito Nov 10, 2023
6392334
build: switches to webpack to support newer syntaxes (#1819)
mathewmeconry Nov 10, 2023
e49b967
ci: update fleek action to v1.0.1
mathewmeconry Nov 10, 2023
85d4f3a
Testing new endpoint
jjavieralv Sep 2, 2024
ecc1d6a
Update subgraph ID
jjavieralv Sep 2, 2024
ba5213d
IPFS main resources moved to Pinata
jjavieralv Sep 2, 2024
2a474c4
setting up the correct subgraph id
jjavieralv Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,25 @@
{
"modules": false,
"useBuiltIns": "entry",
"corejs": 3
"corejs": 3,
"shippedProposals": true
}
],
"@babel/preset-react"
],
"plugins": [
["styled-components", { "displayName": true }]
["styled-components", { "displayName": true }],
"@babel/plugin-proposal-class-properties",
[
"module-resolver",
{
"alias": {
"^@/(.+)": "./src/\\1"
}
}
],
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-proposal-nullish-coalescing-operator"
],
"env": {
"test": {
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/deploy_develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Build Aragon
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Activate fleek
run: cp .github/fleek/develop.fleek.json ./.fleek.json
- name: Install build dependencies
Expand All @@ -45,11 +45,10 @@ jobs:
ARAGON_ETH_SUBSCRIPTION_EVENT_DELAY: 5000
ARAGON_FORTMATIC_API_KEY: ${{ secrets.FORMATIC_API_KEY }}
ARAGON_PORTIS_DAPP_ID: ${{ secrets.PORTIS_DAPP_ID }}
# TODO remove --network-concurrency 1 once use-wallet 0.9.0 is published
run: yarn install --frozen-lockfile --network-concurrency 1 && yarn build
run: yarn install --frozen-lockfile && yarn build
- name: Deploy fleek
id: deploy
uses: fleekhq/action-deploy@v1
uses: fleekhq/action-deploy@v1.0.1
with:
apiKey: ${{ secrets.FLEEK_API_KEY }}
- name: Get the output url
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/deploy_prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Build Aragon
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Activate fleek
run: cp .github/fleek/prod.fleek.json ./.fleek.json
- name: Install build dependencies
Expand All @@ -45,11 +45,10 @@ jobs:
ARAGON_ETH_SUBSCRIPTION_EVENT_DELAY: 5000
ARAGON_FORTMATIC_API_KEY: ${{ secrets.FORMATIC_API_KEY }}
ARAGON_PORTIS_DAPP_ID: ${{ secrets.PORTIS_DAPP_ID }}
# TODO remove --network-concurrency 1 once use-wallet 0.9.0 is published
run: yarn install --frozen-lockfile --network-concurrency 1 && yarn build
run: yarn install --frozen-lockfile && yarn build
- name: Deploy fleek
id: deploy
uses: fleekhq/action-deploy@v1
uses: fleekhq/action-deploy@v1.0.1
with:
apiKey: ${{ secrets.FLEEK_API_KEY }}
- name: Get the output url
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Build Aragon
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Aragon Client <a href="https://aragon.org/"><img align="right" src=".github/assets/aragon.svg" height="80px" /></a>

[![Build Status](https://img.shields.io/github/workflow/status/aragon/client/Run%20tests?style=flat-square)](https://github.com/aragon/client/actions)
[![Build Status](https://img.shields.io/github/actions/workflow/status/aragon/client/tests.yml?branch=develop&style=flat-square)](https://github.com/aragon/client/actions)
[![All Contributors](https://img.shields.io/badge/all_contributors-47-orange.svg?style=flat-square)](#contributors)

**🌎🚀 Trusted by over 1500 organizations, securing more than $300MM in funds. [Try it out](https://client.aragon.org).**
Expand Down
61 changes: 22 additions & 39 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"files": [
{
"path": "public/*.js",
"maxSize": "1600kb",
"maxSize": "2048kb",
"compression": "gzip"
}
]
Expand Down Expand Up @@ -68,22 +68,28 @@
"scrypt": "github:barrysteyn/node-scrypt#fb60a8d3c158fe115a624b5ffa7480f3a24b03fb",
"secp256k1": "^4.0.2",
"styled-components": ">=4.0.0",
"use-wallet": "^0.13.6",
"use-wallet": "^0.15.0",
"web3": "^1.5.2",
"web3-eth-abi": "^1.5.2",
"web3-utils": "^1.5.2"
},
"devDependencies": {
"@aragon/os": "^4.0.0",
"@babel/core": "^7.6.4",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/preset-env": "^7.6.3",
"@babel/preset-react": "^7.6.3",
"@babel/core": "^7.0.0-0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/preset-env": "^7.10.2",
"@babel/preset-react": "^7.10.1",
"babel-eslint": "^10.0.1",
"babel-jest": "^25.1.0",
"babel-loader": "^9.1.3",
"babel-plugin-module-resolver": "^5.0.0",
"babel-plugin-styled-components": "^1.10.6",
"bundlewatch": "^0.2.6",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^5.2.0",
"dotenv-webpack": "^8.0.1",
"eslint": "^5.6.0",
"eslint-config-prettier": "^6.7.0",
"eslint-config-standard": "^12.0.0",
Expand All @@ -96,53 +102,30 @@
"eslint-plugin-react": "^7.5.1",
"eslint-plugin-react-hooks": "^1.6.0",
"eslint-plugin-standard": "^4.0.0",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.5.3",
"husky": "^1.0.1",
"jest": "^25.1.0",
"lint-staged": "^8.1.1",
"parcel-bundler": "^1.10.1",
"parcel-plugin-bundle-visualiser": "^1.2.0",
"prettier": "^1.19.1",
"ps-node": "^0.1.6",
"rimraf": "^2.6.2"
"rimraf": "^2.6.2",
"webpack": "^5.88.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
},
"resolutions": {
"@aragon/wrapper/web3": "1.7.5",
"@aragon/wrapper/web3-eth-abi": "1.2.6"
},
"scripts": {
"bundlewatch": "bundlewatch",
"start": "node scripts/start",
"start:local": "node scripts/launch-local",
"start:mainnet": "cross-env ARAGON_ETH_NETWORK_TYPE=main npm start",
"start:goerli": "npm start",
"start:staging": "cross-env ARAGON_ENS_REGISTRY_ADDRESS=0xfe03625ea880a8cba336f9b5ad6e15b0a3b5a939 npm start",
"start:ropsten": "cross-env ARAGON_ETH_NETWORK_TYPE=ropsten npm start",
"start:xdai": "cross-env ARAGON_ETH_NETWORK_TYPE=xdai npm start",
"build": "node scripts/build",
"build:local": "node scripts/build-local",
"build:mainnet": "cross-env ARAGON_ETH_NETWORK_TYPE=main npm run build",
"build:goerli": "npm run build",
"build:staging": "cross-env ARAGON_ENS_REGISTRY_ADDRESS=0xfe03625ea880a8cba336f9b5ad6e15b0a3b5a939 npm run build",
"build:ropsten": "cross-env ARAGON_ETH_NETWORK_TYPE=ropsten npm run build",
"build:xdai": "cross-env ARAGON_ETH_NETWORK_TYPE=xdai npm run build",
"lint": "eslint ./src",
"test": "npm run lint && npm run jest",
"jest": "jest",
"publish:major": "node scripts/publish major --only-content --files public/",
"publish:minor": "node scripts/publish minor --only-content --files public/",
"publish:patch": "node scripts/publish patch --only-content --files public/",
"publish:mainnet:major": "npm run publish:major -- --environment mainnet --build-script build:mainnet",
"publish:mainnet:minor": "npm run publish:minor -- --environment mainnet --build-script build:mainnet",
"publish:mainnet:patch": "npm run publish:patch -- --environment mainnet --build-script build:mainnet",
"publish:goerli:major": "npm run publish:major -- --environment goerli --build-script build:goerli",
"publish:goerli:minor": "npm run publish:minor -- --environment goerli --build-script build:goerli",
"publish:goerli:patch": "npm run publish:patch -- --environment goerli --build-script build:goerli",
"publish:staging:major": "npm run publish:major -- --environment staging --build-script build:staging",
"publish:staging:minor": "npm run publish:minor -- --environment staging --build-script build:staging",
"publish:staging:patch": "npm run publish:patch -- --environment staging --build-script build:staging",
"publish:ropsten:major": "npm run publish:major -- --environment ropsten --build-script build:ropsten",
"publish:ropsten:minor": "npm run publish:minor -- --environment ropsten --build-script build:ropsten",
"publish:ropsten:patch": "npm run publish:patch -- --environment ropsten --build-script build:ropsten"
"test": "jest",
"start": "npm run sync-assets & webpack-dev-server --mode development --open --hot",
"build": "rm -rf ./public/ && npm run sync-assets && webpack build --progress --mode production -o ./public",
"sync-assets": "copy-aragon-ui-assets -n aragon-ui ./public"
},
"browserslist": {
"development": ">2%, last 1 edge versions, not ie > 0, not op_mini all",
Expand Down
24 changes: 0 additions & 24 deletions scripts/build
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions scripts/build-local
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions scripts/config/local.js
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions scripts/launch-local
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions scripts/publish
View file
Open in desktop

This file was deleted.

Loading
Loading