Skip to content

Commit

Permalink
Merge branch 'main' into ag/feat/tx-operations
Browse files Browse the repository at this point in the history
  • Loading branch information
arthurgeron authored Sep 13, 2024
2 parents 81ba2f7 + c5faeff commit 20da4ac
Show file tree
Hide file tree
Showing 13 changed files with 3,995 additions and 199 deletions.
8 changes: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
29 changes: 29 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": [
"@changesets/changelog-github",
{ "repo": "FuelLabs/fuel-explorer" }
],
"privatePackages": {
"version": true,
"tag": true
},
"commit": false,
"fixed": [["@fuels/ui"]],
"linked": [],
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": [
"@fuel-explorer/graphql",
"e2e-tests",
"app-portal",
"app-explorer",
"app-commons",
"predicate"
],
"snapshot": {
"useCalculatedVersion": true,
"prereleaseTemplate": "{tag}-{commit}"
}
}
5 changes: 5 additions & 0 deletions .changeset/soft-forks-hope.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@fuels/ui": minor
---

Make the @fuels/ui package public and publishable
61 changes: 61 additions & 0 deletions .github/workflows/release-npm-changeset.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: "Release"

on:
push:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
BUILD_VERSION: ""

jobs:
release-changesets:
name: Release master or rc
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v3
with:
# need this to get full git-history/clone in order to build changelogs and check changesets
fetch-depth: 0
# workaround to ensure force pushes to changeset branch use REPO_TOKEN owner's account
# see https://github.com/changesets/action/issues/70
persist-credentials: false
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.15.1
pnpm-version: 9.5.0

- uses: FuelLabs/github-actions/setups/npm@master
with:
npm-token: ${{ secrets.NPM_TOKEN }}

- name: Bump and Collect Version
run: |
pnpm changeset version
echo "BUILD_VERSION=$(pnpm -s packages:version)" >> $GITHUB_ENV
git reset --hard
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Setup git user (for changelog step)
run: |
git config --global user.name "${{ github.actor }}"
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
- name: Create Release Pull Request or Publish to NPM
id: changesets
uses: FuelLabs/changesets-action@main
with:
publish: pnpm changeset publish --tag next
commit: "ci(changesets): versioning packages"
title: "ci(changesets): versioning packages"
createGithubReleases: aggregate
githubReleaseName: v${{ env.BUILD_VERSION }}
githubTagName: v${{ env.BUILD_VERSION }}
env:
GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
17 changes: 15 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
"scripts": {
"build:preview": "pnpm turbo:run build:preview",
"build:lib": "pnpm turbo:run build:lib",
"changeset": "changeset",
"changeset:empty": "changeset --empty",
"changeset:release": "changeset publish --no-git-tag",
"changeset:version": "changeset version",
"changeset:check": "changeset status --since=main",
"deps:update": "updates -gu && pnpm -r exec updates -gu",
"dev": "./scripts/dev.sh",
"dev:explorer": "pnpm --filter=app-explorer dev",
Expand Down Expand Up @@ -56,6 +61,8 @@
"devDependencies": {
"@babel/core": "^7.23.9",
"@biomejs/biome": "1.5.3",
"@changesets/changelog-github": "0.5.0",
"@changesets/cli": "2.27.8",
"@fuels/jest": "0.20.0",
"@fuels/ts-config": "0.20.0",
"@fuels/tsup-config": "0.20.0",
Expand Down Expand Up @@ -90,8 +97,14 @@
},
"pnpm": {
"peerDependencyRules": {
"allowAny": ["react", "react-dom"],
"ignoreMissing": ["react", "react-dom"]
"allowAny": [
"react",
"react-dom"
],
"ignoreMissing": [
"react",
"react-dom"
]
},
"overrides": {
"glob-parent@<5.1.2": ">=5.1.2",
Expand Down
30 changes: 30 additions & 0 deletions packages/app-explorer/src/systems/Block/actions/get-blocks.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
'use server';

import { z } from 'zod';
import { act } from '~/systems/Core/utils/act-server';
import { sdk } from '~/systems/Core/utils/sdk';

const PER_PAGE = 10;

const schema = z.object({
cursor: z.string().optional().nullable(),
dir: z.enum(['after', 'before']).optional(),
});

export const getBlocks = act(schema, async ({ cursor, dir = 'after' }) => {
const params = { last: PER_PAGE } as {
first?: number;
last?: number;
before?: string;
after?: string;
};
if (cursor && dir === 'after') {
params.after = cursor;
}
if (cursor && dir === 'before') {
params.before = cursor;
}

const { data } = await sdk.blocks(params);
return data;
});
24 changes: 12 additions & 12 deletions packages/app-portal/src/systems/Ecosystem/data/projects.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,13 @@
},
{
"isLive": true,
"name": "Mira",
"name": "Mira Exchange",
"url": "https://mira.ly/",
"tags": ["DeFi"],
"description": "The Liquidity Hub on Fuel",
"github": "https://github.com/0xmetaschool",
"description": "The liquidity hub on Fuel. Trade, earn and get rewards using the most efficient AMM on Fuel.",
"github": "",
"twitter": "https://twitter.com/MiraProtocol",
"discord": "",
"discord": "https://discord.gg/9HzukDUKSq",
"image": "mira"
},
{
Expand All @@ -342,14 +342,14 @@
},
{
"isLive": false,
"name": "PlayEstates",
"url": "https://www.playestates.com/",
"tags": ["Real World Assets", "Gaming", "NFT"],
"description": "PlayEstates brings real estate on-chain and makes RWA ownership easy and affordable.",
"github": "",
"twitter": "https://twitter.com/playestates",
"discord": "https://discord.gg/playestates",
"image": "playestates"
"name": "Pipeline Finance",
"url": "https://www.pipeline.finance/",
"tags": ["DeFi", "Token Streaming"],
"description": "Pipeline Finance is the go-to solution for affordable and secure token streaming on the Fuel network. Experience seamless, real-time payments with ease.",
"github": "https://github.com/wt-xyz/pipeline",
"twitter": "https://x.com/pipeline_fi",
"discord": "",
"image": "pipeline"
},
{
"isLive": false,
Expand Down
Loading

0 comments on commit 20da4ac

Please sign in to comment.