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

Jump to bottom

feat: Custom dev ui port(load env from .env) #2702

Closed
wants to merge 19 commits into from
Closed

feat: Custom dev ui port(load env from .env) #2702

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d6d1993
feat: Custom dev ui port(load env from .env)
FrankFang Jun 6, 2023
4b404e4
feat: run sub-packages' start tasks parallelly, and loadEnv is shared…
FrankFang Jun 6, 2023
589bd15
add test cases for loadEnv
FrankFang Jun 6, 2023
17cd130
lock the version of dotenv
FrankFang Jun 6, 2023
666c438
run wallet's debug task after ui is ready
FrankFang Jun 6, 2023
d7ebcbc
make the start task of all packages is in debug mode
FrankFang Jun 6, 2023
25f3ada
remove zx from dependencies
FrankFang Jun 7, 2023
40e3e6a
rename @nervina-labs/neuron-shared to @nervosnetwork/neuron-shared
FrankFang Jun 7, 2023
80441f4
use node:fs instead of fs
FrankFang Jun 7, 2023
5b3eef3
reorder imports
FrankFang Jun 7, 2023
4f0492e
fix: use fs instead of node:fs because dotenv use fs but not node:fs
FrankFang Jun 7, 2023
09ecb95
chore: reformat code
FrankFang Jun 7, 2023
129d277
loadEnv does not override existing variables on process.env
FrankFang Jun 7, 2023
f1b03a7
rename TEST_ENV to TEST_VAR
FrankFang Jun 7, 2023
d99b613
chore: accept suggested changes
FrankFang Jun 7, 2023
72d4189
Don't include `.env.local` for `test` environment
FrankFang Jun 7, 2023
604bf96
add test for .env.local
FrankFang Jun 7, 2023
1c6f900
.env* files are merged into process.env, but no override.
FrankFang Jun 7, 2023
36c1621
Merge branch 'develop' into develop
Keith-CY Jun 20, 2023
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
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"bootstrap": "npx cross-env lerna bootstrap && lerna link",
"start:ui": "cd packages/neuron-ui && yarn run start",
"start:wallet": "cd packages/neuron-wallet && yarn run start:debug",
"start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on http://127.0.0.1:3000 && yarn run start:wallet\"",
"start": "zx scripts/start.mjs",
"clean": "lerna run --stream clean",
"prebuild": "yarn clean",
"build": "lerna run --stream build",
Expand Down Expand Up @@ -56,7 +56,8 @@
"prettier": "2.8.7",
"ts-jest": "27.1.5",
"typescript": "5.0.4",
"wait-on": "6.0.1"
"wait-on": "6.0.1",
"zx": "^7.2.2"
Keith-CY marked this conversation as resolved.
Show resolved Hide resolved
},
"dependencies": {},
"resolutions": {
Expand Down
3 changes: 2 additions & 1 deletion packages/neuron-wallet/src/env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ const fileBase = (() => {
return 'dev/'
})()

const port = process.env.PORT || 3000
const env = {
app,
isDevMode,
isTestMode,
fileBasePath: path.resolve(app.getPath('userData'), fileBase),
mainURL: isDevMode ? 'http://localhost:3000' : `file://${path.join(__dirname, '../dist/neuron-ui/index.html')}`,
mainURL: isDevMode ? `http://localhost:${port}` : `file://${path.join(__dirname, '../dist/neuron-ui/index.html')}`,
}

export default env
10 changes: 10 additions & 0 deletions scripts/start.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env zx

import dotenv from 'dotenv'
import path from 'path'
dotenv.config({ path: path.join(__dirname, '..', 'packages', 'neuron-wallet', '.env.development.local')})
FrankFang marked this conversation as resolved.
Show resolved Hide resolved
await Promise.all([
$`cross-env BROWSER=none PORT=${process.env.PORT} yarn run start:ui`,
$`wait-on http://127.0.0.1:${process.env.PORT} && yarn run start:wallet`
])
console.log('bye')
Loading