Skip to content

Add .circleci/config.yml #7828

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.

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

Open
wants to merge 61 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
ff1c408
Add .circleci/config.yml
Dargon789 Jan 24, 2025
38c3917
Create static.yml
Dargon789 Jan 24, 2025
c7937cf
Create SECURITY.md
Dargon789 Feb 1, 2025
5e36ad3
Create jekyll-gh-pages.yml
Dargon789 Jan 24, 2025
9cafb49
Potential fix for code scanning alert no. 11: Incomplete string escap…
Dargon789 Feb 1, 2025
deac36e
Add .circleci/config.yml
Dargon789 Feb 1, 2025
f7c261d
Potential fix for code scanning alert no. 10: Incomplete regular expr…
Dargon789 Feb 1, 2025
d591a8d
Merge pull request #9 from Dargon789/alert-autofix-10
Dargon789 Feb 2, 2025
6d175a4
Merge pull request #6 from Dargon789/Dargon789-patch-3
Dargon789 Feb 2, 2025
77836e2
Merge pull request #8 from Uniswap/main
Dargon789 Feb 2, 2025
1a66a6f
Merge pull request #7 from Dargon789/alert-autofix-11
Dargon789 Feb 2, 2025
c3c6f03
Merge pull request #2 from Dargon789/Dargon789-patch-2
Dargon789 Feb 2, 2025
27b0c15
Merge pull request #1 from Dargon789/Dargon789-patch-1
Dargon789 Feb 2, 2025
aa2a0f2
Merge branch 'Uniswap:main' into main
Dargon789 Feb 8, 2025
e103b55
Merge branch 'Uniswap:main' into circleci-project-setup
Dargon789 Feb 8, 2025
ef8aa9f
Merge branch 'Uniswap:main' into main
Dargon789 Feb 22, 2025
09d7af5
fix: packages/wallet/package.json to reduce vulnerabilities
snyk-bot Feb 22, 2025
0acc3d6
fix: packages/utilities/package.json to reduce vulnerabilities
snyk-bot Feb 22, 2025
2c1f99b
fix: apps/mobile/package.json to reduce vulnerabilities
snyk-bot Feb 22, 2025
9427c3c
Merge pull request #18 from Dargon789/snyk-fix-9be0a1d2ae92acc7332505…
Dargon789 Feb 23, 2025
e9755d6
fix: apps/mobile/package.json to reduce vulnerabilities
snyk-bot Feb 23, 2025
0c58ce1
Merge pull request #21 from Dargon789/snyk-fix-d77ca07c87b0c5245594fd…
Dargon789 Feb 23, 2025
5705e0d
fix: apps/mobile/package.json to reduce vulnerabilities
snyk-bot Feb 23, 2025
0e3c1b4
Merge pull request #16 from Dargon789/snyk-fix-107e0e51af286852e0e565…
Dargon789 Feb 23, 2025
4122857
Merge pull request #15 from Dargon789/snyk-fix-ac8ffdf06593961b331fe5…
Dargon789 Feb 23, 2025
405e01c
Merge pull request #22 from Dargon789/snyk-fix-78de97ca8975f9e7e610e9…
Dargon789 Feb 23, 2025
26ad369
Merge pull request #20 from Uniswap/main
Dargon789 Feb 27, 2025
2f09c4e
fix: packages/utilities/package.json to reduce vulnerabilities
snyk-bot Mar 1, 2025
7a36b08
fix: packages/uniswap/package.json to reduce vulnerabilities
snyk-bot Mar 2, 2025
4b672fe
Merge pull request #25 from Dargon789/snyk-fix-f5cd1d35c0e61779161c88…
Dargon789 Mar 2, 2025
bd5a963
Merge pull request #24 from Dargon789/snyk-fix-84e19216aa21cc924f206a…
Dargon789 Mar 2, 2025
1b8ac68
fix: packages/uniswap/package.json to reduce vulnerabilities
snyk-bot Mar 2, 2025
22836cc
Merge pull request #26 from Dargon789/snyk-fix-659a6c5a5d0bde282986ba…
Dargon789 Mar 3, 2025
c9d06b9
fix: packages/uniswap/package.json to reduce vulnerabilities
snyk-bot Mar 3, 2025
eacf92c
Merge pull request #27 from Dargon789/snyk-fix-150a7cc67904080ad02dff…
Dargon789 Mar 3, 2025
86f739d
fix: packages/uniswap/package.json to reduce vulnerabilities
snyk-bot Mar 3, 2025
bb0b1b1
Merge pull request #28 from Dargon789/snyk-fix-b3c586e1ca9668d98a90ca…
Dargon789 Mar 3, 2025
7991e0d
fix: apps/extension/package.json to reduce vulnerabilities
snyk-bot Mar 3, 2025
565b44b
Merge pull request #29 from Dargon789/snyk-fix-c02104d5702790c65d206c…
Dargon789 Mar 4, 2025
35bea4b
Potential fix for code scanning alert no. 9: Incomplete regular expre…
Dargon789 Mar 4, 2025
186408f
Potential fix for code scanning alert no. 2: Inefficient regular expr…
Dargon789 Mar 4, 2025
b81f3b9
fix: packages/uniswap/package.json to reduce vulnerabilities (#14)
Dargon789 Mar 4, 2025
049c9a4
fix: apps/extension/package.json to reduce vulnerabilities (#17)
Dargon789 Mar 4, 2025
1a07ec8
fix: apps/mobile/Gemfile & apps/mobile/Gemfile.lock to reduce vulnera…
Dargon789 Mar 4, 2025
62f5c53
fix: apps/mobile/package.json to reduce vulnerabilities (#23)
Dargon789 Mar 4, 2025
4abfd13
fix: apps/extension/package.json to reduce vulnerabilities (#30)
Dargon789 Mar 4, 2025
31a92d0
fix: apps/extension/package.json to reduce vulnerabilities (#31)
Dargon789 Mar 4, 2025
70d8acc
fix: apps/extension/package.json to reduce vulnerabilities (#32)
Dargon789 Mar 4, 2025
2377988
Merge branch 'main' into circleci-project-setup
Dargon789 Mar 5, 2025
69612cb
Circleci project setup (#34)
Dargon789 Mar 5, 2025
cbfbdbf
fix: packages/wallet/package.json to reduce vulnerabilities (#33)
Dargon789 Mar 5, 2025
d3a93e8
fix: packages/wallet/package.json to reduce vulnerabilities (#35)
Dargon789 Mar 5, 2025
d62098f
fix: packages/wallet/package.json to reduce vulnerabilities (#36)
Dargon789 Mar 5, 2025
c4218ea
Merge branch 'main' into circleci-project-setup
Dargon789 Mar 6, 2025
936eb1a
Circleci project setup (#37)
Dargon789 Mar 6, 2025
364eefa
Potential fix for code scanning alert no. 12: Inefficient regular exp…
Dargon789 Mar 6, 2025
b2a3531
Merge branch 'main' into circleci-project-setup
Dargon789 Mar 6, 2025
7ceded6
Circleci project setup (#39)
Dargon789 Mar 6, 2025
403eaae
Create snyk-security.yml (#44)
Dargon789 Mar 7, 2025
dcfa3eb
feat: upgrade i18next from 23.10.0 to 24.2.2 (#43)
Dargon789 Mar 7, 2025
6a9f750
Merge branch 'main' into circleci-project-setup
Dargon789 Mar 7, 2025
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
31 changes: 31 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Use the latest 2.1 version of CircleCI pipeline process engine.
# See: https://circleci.com/docs/configuration-reference
version: 2.1

# Define a job to be invoked later in a workflow.
# See: https://circleci.com/docs/jobs-steps/#jobs-overview & https://circleci.com/docs/configuration-reference/#jobs
jobs:
say-hello:
# Specify the execution environment. You can specify an image from Docker Hub or use one of our convenience images from CircleCI's Developer Hub.
# See: https://circleci.com/docs/executor-intro/ & https://circleci.com/docs/configuration-reference/#executor-job
docker:
# Specify the version you desire here
# See: https://circleci.com/developer/images/image/cimg/base
- image: cimg/base:current

# Add steps to the job
# See: https://circleci.com/docs/jobs-steps/#steps-overview & https://circleci.com/docs/configuration-reference/#steps
steps:
# Checkout the code as the first step.
- checkout
- run:
name: "Say hello"
command: "echo Hello, World!"

# Orchestrate jobs using workflows
# See: https://circleci.com/docs/workflows/ & https://circleci.com/docs/configuration-reference/#workflows
workflows:
say-hello-workflow: # This is the name of the workflow, feel free to change it to better match your workflow.
# Inside the workflow, you define the jobs you want to run.
jobs:
- say-hello
51 changes: 51 additions & 0 deletions .github/workflows/jekyll-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
name: Deploy Jekyll with GitHub Pages dependencies preinstalled

on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v5
- name: Build with Jekyll
uses: actions/jekyll-build-pages@v1
with:
source: ./
destination: ./_site
- name: Upload artifact
uses: actions/upload-pages-artifact@v3

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
43 changes: 43 additions & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Single deploy job since we're just deploying
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
# Upload entire repository
path: '.'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
21 changes: 21 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Security Policy

## Supported Versions

Use this section to tell people about which versions of your project are
currently being supported with security updates.

| Version | Supported |
| ------- | ------------------ |
| 5.1.x | :white_check_mark: |
| 5.0.x | :x: |
| 4.0.x | :white_check_mark: |
| < 4.0 | :x: |

## Reporting a Vulnerability

Use this section to tell people how to report a vulnerability.

Tell them where to go, how often they can expect to get an update on a
reported vulnerability, what to expect if the vulnerability is accepted or
declined, etc.
14 changes: 7 additions & 7 deletions apps/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@apollo/client": "3.10.4",
"@datadog/browser-logs": "5.20.0",
"@datadog/browser-rum": "5.23.3",
"@ethersproject/providers": "5.7.2",
"@ethersproject/providers": "5.8.0",
"@metamask/rpc-errors": "6.2.1",
"@reduxjs/toolkit": "1.9.3",
"@svgr/webpack": "8.0.1",
Expand All @@ -21,11 +21,11 @@
"ethers": "5.7.2",
"eventemitter3": "5.0.1",
"i18next": "23.10.0",
"node-polyfill-webpack-plugin": "2.0.1",
"node-polyfill-webpack-plugin": "4.1.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-i18next": "14.1.0",
"react-native": "0.76.6",
"react-native": "0.77.0",
"react-native-gesture-handler": "2.21.2",
"react-native-reanimated": "3.16.7",
"react-native-svg": "15.10.1",
Expand All @@ -41,11 +41,11 @@
"symbol-observable": "4.0.0",
"typed-redux-saga": "1.5.0",
"ua-parser-js": "1.0.37",
"ui": "workspace:^",
"uniswap": "workspace:^",
"utilities": "workspace:^",
"ui": "0.0.0",
"uniswap": "0.0.1",
"utilities": "1.0.6",
"uuid": "9.0.0",
"wallet": "workspace:^",
"wallet": "0.0.1",
"zod": "3.22.4"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion apps/mobile/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem 'fastlane', '2.214.0'
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '1.14.3'
gem 'activesupport', '7.1.2'
gem 'xcodeproj', '1.26.0'
gem 'xcodeproj', '1.25.1'

plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)
17 changes: 8 additions & 9 deletions apps/mobile/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
CFPropertyList (3.0.7)
base64
nkf
rexml
activesupport (7.1.2)
base64
Expand Down Expand Up @@ -162,8 +164,6 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-get_version_name (0.2.2)
fastlane-plugin-versioning_android (0.1.1)
ffi (1.17.1)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
Expand Down Expand Up @@ -226,6 +226,7 @@ GEM
nap (1.1.0)
naturally (2.2.1)
netrc (0.11.0)
nkf (0.2.0)
optparse (0.1.1)
os (1.1.4)
plist (3.7.1)
Expand All @@ -236,7 +237,7 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.6)
rexml (3.4.1)
rouge (2.0.7)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
Expand Down Expand Up @@ -266,13 +267,13 @@ GEM
unicode-display_width (1.8.0)
webrick (1.8.1)
word_wrap (1.0.0)
xcodeproj (1.23.0)
xcodeproj (1.25.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
Expand All @@ -285,9 +286,7 @@ DEPENDENCIES
activesupport (= 7.1.2)
cocoapods (= 1.14.3)
fastlane (= 2.214.0)
fastlane-plugin-get_version_name
fastlane-plugin-versioning_android
xcodeproj (= 1.26.0)
xcodeproj (= 1.25.1)

BUNDLED WITH
2.4.10
16 changes: 8 additions & 8 deletions apps/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"@react-navigation/native-stack": "6.7.0",
"@react-navigation/stack": "6.2.2",
"@reduxjs/toolkit": "1.9.3",
"@reown/walletkit": "1.1.1",
"@reown/walletkit": "1.2.0",
"@shopify/flash-list": "1.7.1",
"@shopify/react-native-performance": "4.1.2",
"@shopify/react-native-performance-navigation": "3.0.0",
Expand All @@ -93,16 +93,16 @@
"@uniswap/client-explore": "0.0.15",
"@uniswap/ethers-rs-mobile": "0.0.5",
"@uniswap/sdk-core": "7.5.0",
"@walletconnect/core": "2.17.1",
"@walletconnect/core": "2.18.0",
"@walletconnect/react-native-compat": "2.17.1",
"@walletconnect/utils": "2.17.1",
"@walletconnect/utils": "2.18.0",
"apollo3-cache-persist": "0.14.1",
"babel-plugin-transform-inline-environment-variables": "0.4.4",
"babel-plugin-transform-remove-console": "6.9.4",
"cross-fetch": "3.1.5",
"d3-shape": "3.2.0",
"dayjs": "1.11.7",
"ethers": "5.7.2",
"ethers": "6.0.0",
"expo": "52.0.9",
"expo-blur": "14.0.3",
"expo-camera": "16.0.8",
Expand All @@ -121,7 +121,7 @@
"react": "18.3.1",
"react-freeze": "1.0.3",
"react-i18next": "14.1.0",
"react-native": "0.76.6",
"react-native": "0.77.0",
"react-native-appsflyer": "6.13.1",
"react-native-bootsplash": "6.3.1",
"react-native-context-menu-view": "1.15.0",
Expand Down Expand Up @@ -154,9 +154,9 @@
"redux-persist": "6.0.0",
"redux-saga": "1.2.2",
"typed-redux-saga": "1.5.0",
"uniswap": "workspace:^",
"utilities": "workspace:^",
"wallet": "workspace:^"
"uniswap": "0.0.1",
"utilities": "1.0.6",
"wallet": "0.0.1"
},
"devDependencies": {
"@babel/core": "7.26.0",
Expand Down
4 changes: 2 additions & 2 deletions apps/web/cypress/support/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export function registerCommands() {

Cypress.Commands.add('interceptGraphqlOperation', (operationName, fixturePath) => {
const graphqlInterceptions = Cypress.env('graphqlInterceptions')
cy.intercept(/(?:interface|beta).gateway.uniswap.org\/v1\/graphql/, (req) => {
cy.intercept(/(?:interface|beta)\.gateway\.uniswap\.org\/v1\/graphql/, (req) => {
req.headers['origin'] = 'https://app.uniswap.org'
const currentOperationName = req.body.operationName

Expand All @@ -160,7 +160,7 @@ export function registerCommands() {
})

Cypress.Commands.add('interceptQuoteRequest', (fixturePath) => {
return cy.intercept(/(?:interface|beta).gateway.uniswap.org\/v2\/quote/, (req) => {
return cy.intercept(/(?:interface|beta)\.gateway\.uniswap\.org\/v2\/quote/, (req) => {
req.headers['origin'] = 'https://app.uniswap.org'
req.reply({ fixture: fixturePath })
})
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/Logo/DoubleLogo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function LogolessPlaceholder({ currency, size }: { currency?: Currency; size: nu

return (
<MissingImageLogo $size={size + 'px'} $textColor={foreground} $backgroundColor={background}>
{currency?.symbol?.toUpperCase().replace('$', '').replace(/\s+/g, '').slice(0, 3)}
{currency?.symbol?.toUpperCase().replace(/\$/g, '').replace(/\s+/g, '').slice(0, 3)}
{showNetworkLogo && (
<Flex bottom={-2} position="absolute" right={-3} zIndex={zIndexes.mask}>
<NetworkLogo borderWidth={networkLogoBorderWidth} chainId={chainId} size={networkLogoSize} />
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/utils/isDataUri.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* @see {@link https://www.rfc-editor.org/rfc/rfc2397}
*/
export default function isDataURI(uri: string): boolean {
return /data:(image\/[-+\w.]+)(;?\w+=[-\w]+)*(;base64)?,.*/gu.test(uri)
return /data:(image\/(?:\w|-)+)(;?\w+=\w+)*(;base64)?,.*/gu.test(uri)
}
12 changes: 6 additions & 6 deletions packages/uniswap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@ethersproject/bignumber": "5.7.0",
"@ethersproject/hash": "5.7.0",
"@ethersproject/properties": "5.7.0",
"@ethersproject/providers": "5.7.2",
"@ethersproject/providers": "5.8.0",
"@ethersproject/units": "5.7.0",
"@ethersproject/web": "5.7.1",
"@gorhom/bottom-sheet": "4.6.4",
Expand All @@ -55,7 +55,7 @@
"@uniswap/v3-sdk": "3.24.0",
"@uniswap/v4-sdk": "1.19.2",
"apollo-link-rest": "0.9.0",
"axios": "1.6.5",
"axios": "1.7.4",
"date-fns": "2.30.0",
"dayjs": "1.11.7",
"es-toolkit": "1.10.0",
Expand All @@ -76,7 +76,7 @@
"qs": "6.11.0",
"react": "18.3.1",
"react-i18next": "14.1.0",
"react-native": "0.76.6",
"react-native": "0.77.0",
"react-native-appsflyer": "6.13.1",
"react-native-device-info": "10.0.2",
"react-native-gesture-handler": "2.21.2",
Expand All @@ -96,10 +96,10 @@
"statsig-react-native": "4.15.0",
"tiny-invariant": "1.3.1",
"typed-redux-saga": "1.5.0",
"ui": "workspace:^",
"utilities": "workspace:^",
"ui": "0.0.0",
"utilities": "1.0.6",
"uuid": "9.0.0",
"wagmi": "2.9.3",
"wagmi": "2.12.23",
"wcag-contrast": "3.0.0",
"zod": "3.22.4"
},
Expand Down
Loading