Skip to content

Commit

Permalink
Merge branch 'dev' of https://git.ergopool.io/ergo/rosen-bridge/ui in…
Browse files Browse the repository at this point in the history
…to binance
  • Loading branch information
abdolian committed Dec 28, 2024
2 parents 09bf59e + 936ec5d commit 79a735c
Show file tree
Hide file tree
Showing 14 changed files with 550 additions and 79 deletions.
9 changes: 9 additions & 0 deletions .changeset/early-badgers-mate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@rosen-ui/asset-calculator': patch
'@rosen-bridge/rosen-service': patch
'@rosen-bridge/watcher-app': patch
'@rosen-bridge/guard-app': patch
'@rosen-bridge/rosen-app': patch
---

Install a reliable and consistent version of the @types/node npm package
5 changes: 5 additions & 0 deletions .changeset/perfect-planes-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rosen-bridge/rosen-service': major
---

Update the Node.js version dependency from 18.17 to 20
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 20.18.1
cache: 'npm'

- run: npm ci
Expand All @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18, 20]
node-version: [20.18.1]
steps:
- uses: actions/checkout@v3

Expand All @@ -60,6 +60,6 @@ jobs:
- name: Run changeset to check versions
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 20.18.1
cache: 'npm'
- run: npx @changesets/[email protected] status --since=origin/dev
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20.18.1

- name: Install yaml2json
run: npm install -g yamljs
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
node-version: [18.x]
node-version: [20.18.1]
include:
- os: macos-latest
platform: macOS
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: node:20.11.0
image: node:20.18.1

stages:
- installation
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.0
20.18.1
2 changes: 1 addition & 1 deletion apps/guard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@rosen-ui/types": "^0.3.2",
"@tauri-apps/cli": "^1.4.0",
"@types/moment": "^2.13.0",
"@types/node": "20.2.5",
"@types/node": "^20.17.10",
"@types/react": "18.2.12",
"@types/react-copy-to-clipboard": "^5.0.5",
"@types/react-dom": "18.2.4",
Expand Down
13 changes: 6 additions & 7 deletions apps/rosen-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"main": "dist/main.js",
"types": "dist/main.d.ts",
"scripts": {
"start": "node --watch --experimental-specifier-resolution=node --loader ./ts-node-esm-loader.js ./src/main.ts",
"start:prod": "node --experimental-specifier-resolution=node ./dist/main.js",
"start": "tsx watch ./src/main.ts",
"start:prod": "tsx ./src/main.ts",
"type-check": "tsc --noEmit",
"typeorm": "NODE_OPTIONS=--experimental-specifier-resolution=node typeorm-ts-node-esm",
"typeorm": "NODE_OPTIONS='--import tsx' typeorm",
"typeorm:generate": "npm run typeorm migration:generate ./src/db/migrations/migration -- -p -d ./src/data-source.ts",
"typeorm:migrate": "npm run typeorm migration:run -- -d ./src/data-source.ts",
"get-config": "npx @rosen-bridge/cli download-assets --chain-type mainnet --out config --include-prereleases"
"get-config": "npx @rosen-bridge/cli download-assets --chain-type public-launch --out config"
},
"dependencies": {
"@rosen-bridge/abstract-extractor": "^0.3.1",
Expand All @@ -32,9 +32,8 @@
},
"devDependencies": {
"@types/config": "^0.0.41",
"@types/node": "^18.11.18",
"ts-node": "^10.7.0",
"tsconfig-paths": "^4.1.2",
"@types/node": "^20.17.10",
"tsx": "^4.19.2",
"typescript": "^5.0.0"
}
}
15 changes: 0 additions & 15 deletions apps/rosen-service/ts-node-esm-loader.js

This file was deleted.

5 changes: 1 addition & 4 deletions apps/rosen-service/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@
"strict": true,
"target": "esnext"
},
"include": ["src"],
"ts-node": {
"esm": true
}
"include": ["src"]
}
2 changes: 1 addition & 1 deletion apps/rosen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
},
"devDependencies": {
"@types/lodash-es": "^4.17.10",
"@types/node": "20.5.7",
"@types/node": "^20.17.10",
"@types/react": "18.2.12",
"@types/react-dom": "18.2.4",
"eslint": "8.42.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/watcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@tauri-apps/cli": "^1.4.0",
"@types/lodash-es": "^4.17.11",
"@types/moment": "^2.13.0",
"@types/node": "20.2.5",
"@types/node": "^20.17.10",
"@types/react": "18.2.12",
"@types/react-dom": "18.2.4",
"eslint": "8.42.0",
Expand Down
Loading

0 comments on commit 79a735c

Please sign in to comment.