diff --git a/app/page.tsx b/app/page.tsx index 666bf3e65f..9cba45c4cd 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -14,7 +14,6 @@ import ExternalLink from '../src/components/ui/links/ExternalLink'; import ClientOnly from '../src/components/ui/utils/ClientOnly'; import { BASE_ROUTES } from '../src/constants/routes'; import { URL_DOCS } from '../src/constants/url'; -import ethLizardsLogo from '../src/metadata/lizzardsDAO/assets/logo.png'; import { useFractal } from '../src/providers/App/AppProvider'; import { disconnectedChain } from '../src/providers/NetworkConfig/NetworkConfigProvider'; diff --git a/docs/RELEASES.md b/docs/RELEASES.md deleted file mode 100644 index a011aa4f4f..0000000000 --- a/docs/RELEASES.md +++ /dev/null @@ -1,31 +0,0 @@ -# Fractal Release Cycle -This document details the release cycle process followed by the Fractal frontend engineering team. - -## Development environments -Fractal has three application environments: - -- [Development (dev)](https://app.dev.fractalframework.xyz/) - for daily coding PRs and immediate deployment upon a code merge. -- [Staging](https://app.staging.fractalframework.xyz/) - a more stable environment for QA engineer testing and demoing upcoming features. -- [Production (prod)](https://app.fractalframework.xyz/) - The user facing application, which requires a version tag to publish a new release. - -## Release preparation and testing -Every 2nd Thursday morning all code currently merged in the development environment is included in a pull request into staging. - -Included in this PR is an update to `version` in the app's `package.json`, following the release conventions detailed below. - -The engineering team performs a quick scan of the pull request Thursday morning, and given 2 approvals, the code is merged into staging as a potential release candidate. - -The QA team performs manual and automated regression testing on Thursday and Friday, with any regressions logged as Github issue tickets, to be fixed by the engineering team prior to the end of the week. - -Assuming the testing process has passed and all blocking issues have been fixed, on Monday morning the staging environment is merged into production, and a release tag is created, triggering a production build. - -The QA team performs a quick manual test of the app in production immediately following the release, and monitors Sentry and user feedback via email or Twitter throughout Monday, in case of a missed regression. - -## Versioning -Fractal follows semantic versioning (https://semver.org/). - -There are three types of releases: - -- **MAJOR**: Rare and usually aligns with a version upgrade to the [underlying smart contracts](https://github.com/decent-dao/fractal-contracts). These are changes incompatible with prior front end versions. -- **MINOR**: Adds backwards-compatible manner functionalities and bug fixes. -- **PATCH**: Adds backwards-compatible bug and/or security fixes and can be deployed instantaneously, bypassing a full release cycle. No new functionality will be introduced. diff --git a/package-lock.json b/package-lock.json index b28277fdf9..2668a872e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,6 @@ "packages": { "": { "name": "fractal-interface", - "version": "0.1.8", "dependencies": { "@apollo/client": "^3.7.10", "@chakra-ui/next-js": "^2.2.0", diff --git a/package.json b/package.json index 0aae53eb67..4b8e2006f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "fractal-interface", - "version": "0.1.8", "private": true, "dependencies": { "@apollo/client": "^3.7.10", @@ -53,13 +52,9 @@ "scripts": { "lint": "next lint", "lint:fix": "next lint --fix", - "set:env": "GENERATE_SOURCEMAP=false NEXT_PUBLIC_GIT_HASH=`git rev-parse HEAD`", - "dev": "npm run set:env & next dev", - "start": "npm run set:env & next start", - "start:https": "npm run set:env & HTTPS=true next start", - "start:windows": "set \"GENERATE_SOURCEMAP=false\" && for /F \"delims=\" %I in ('git rev-parse HEAD') do set \"NEXT_PUBLIC_GIT_HASH=%I\" && next start", + "dev": "npm run graphql:build && NEXT_PUBLIC_GIT_HASH=`git rev-parse HEAD` next dev", + "start": "next start", "build": "npm run graphql:build && NEXT_PUBLIC_GIT_HASH=`git rev-parse HEAD` next build", - "build:windows": "for /F \"delims=\" %I in ('git rev-parse HEAD') do set \"NEXT_PUBLIC_GIT_HASH=%I\" && next build", "graphql:build": "graphclient build", "graphql:dev-server": "graphclient serve-dev", "test": "vitest --dir=test", diff --git a/src/components/pages/AppHome/AppFooter.tsx b/src/components/pages/AppHome/AppFooter.tsx index 2e3035b49b..0ea4238b39 100644 --- a/src/components/pages/AppHome/AppFooter.tsx +++ b/src/components/pages/AppHome/AppFooter.tsx @@ -1,6 +1,5 @@ import { Box, BoxProps, Divider, Flex, Link, Spacer, Text } from '@chakra-ui/react'; import { Trans, useTranslation } from 'react-i18next'; -import packageJson from '../../../../package.json'; import { URL_DECENT } from '../../../constants/url'; import ExternalLink from '../../ui/links/ExternalLink'; @@ -42,23 +41,27 @@ export function AppFooter({ ...rest }: BoxProps) { > {t('audit')} - - | - - - v{packageJson.version} - + {process.env.NEXT_PUBLIC_GIT_HASH !== undefined && ( + <> + + | + + + {process.env.NEXT_PUBLIC_GIT_HASH.substring(0, 7)} + + + )} );