Skip to content

Commit 786a4eb

Browse files
committed
Merge branch 'dev-server-reload'
* dev-server-reload: Add nodemon to dev server
2 parents d393d60 + 9ba3386 commit 786a4eb

File tree

2 files changed

+140
-6
lines changed

2 files changed

+140
-6
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dev": "NODE_NO_WARNINGS=1 yarn run server:dev",
1010
"build": "vite build",
1111
"server": "tsx ./server/index.ts",
12-
"server:dev": "tsx --env-file=.env ./server/index.ts",
12+
"server:dev": "nodemon --watch server --watch .pnp.cjs --exec tsx --env-file=.env ./server/index.ts",
1313
"format": "prettier --write src packages",
1414
"server:prod": "NODE_NO_WARNINGS=1 NODE_ENV=production yarn run server",
1515
"start": "yarn run build && yarn run server",
@@ -38,6 +38,7 @@
3838
"@yarnpkg/sdks": "^3.1.0",
3939
"chalk": "^5.3.0",
4040
"http-proxy-middleware": "^3.0.3",
41+
"nodemon": "^3.1.9",
4142
"prettier": "^2.7.1",
4243
"sass-embedded": "^1.79.1",
4344
"stylus": "^0.55.0",

yarn.lock

Lines changed: 138 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3503,6 +3503,7 @@ __metadata:
35033503
jose: "npm:^5.1.2"
35043504
mapbox-gl: "npm:^2.15.0"
35053505
new-github-issue-url: "npm:^1.0.0"
3506+
nodemon: "npm:^3.1.9"
35063507
part-regex: "npm:^0.1.2"
35073508
prettier: "npm:^2.7.1"
35083509
react: "npm:^18.3.0"
@@ -6968,6 +6969,16 @@ __metadata:
69686969
languageName: node
69696970
linkType: hard
69706971

6972+
"anymatch@npm:~3.1.2":
6973+
version: 3.1.3
6974+
resolution: "anymatch@npm:3.1.3"
6975+
dependencies:
6976+
normalize-path: "npm:^3.0.0"
6977+
picomatch: "npm:^2.0.4"
6978+
checksum: 10/3e044fd6d1d26545f235a9fe4d7a534e2029d8e59fa7fd9f2a6eb21230f6b5380ea1eaf55136e60cbf8e613544b3b766e7a6fa2102e2a3a117505466e3025dc2
6979+
languageName: node
6980+
linkType: hard
6981+
69716982
"aproba@npm:^1.0.3 || ^2.0.0":
69726983
version: 2.0.0
69736984
resolution: "aproba@npm:2.0.0"
@@ -7417,6 +7428,13 @@ __metadata:
74177428
languageName: node
74187429
linkType: hard
74197430

7431+
"binary-extensions@npm:^2.0.0":
7432+
version: 2.3.0
7433+
resolution: "binary-extensions@npm:2.3.0"
7434+
checksum: 10/bcad01494e8a9283abf18c1b967af65ee79b0c6a9e6fcfafebfe91dbe6e0fc7272bafb73389e198b310516ae04f7ad17d79aacf6cb4c0d5d5202a7e2e52c7d98
7435+
languageName: node
7436+
linkType: hard
7437+
74207438
"bit-twiddle@npm:^1.0.0":
74217439
version: 1.0.2
74227440
resolution: "bit-twiddle@npm:1.0.2"
@@ -7488,7 +7506,7 @@ __metadata:
74887506
languageName: node
74897507
linkType: hard
74907508

7491-
"braces@npm:^3.0.3":
7509+
"braces@npm:^3.0.3, braces@npm:~3.0.2":
74927510
version: 3.0.3
74937511
resolution: "braces@npm:3.0.3"
74947512
dependencies:
@@ -7878,6 +7896,25 @@ __metadata:
78787896
languageName: node
78797897
linkType: hard
78807898

7899+
"chokidar@npm:^3.5.2":
7900+
version: 3.6.0
7901+
resolution: "chokidar@npm:3.6.0"
7902+
dependencies:
7903+
anymatch: "npm:~3.1.2"
7904+
braces: "npm:~3.0.2"
7905+
fsevents: "npm:~2.3.2"
7906+
glob-parent: "npm:~5.1.2"
7907+
is-binary-path: "npm:~2.1.0"
7908+
is-glob: "npm:~4.0.1"
7909+
normalize-path: "npm:~3.0.0"
7910+
readdirp: "npm:~3.6.0"
7911+
dependenciesMeta:
7912+
fsevents:
7913+
optional: true
7914+
checksum: 10/c327fb07704443f8d15f7b4a7ce93b2f0bc0e6cea07ec28a7570aa22cd51fcf0379df589403976ea956c369f25aa82d84561947e227cd925902e1751371658df
7915+
languageName: node
7916+
linkType: hard
7917+
78817918
"chownr@npm:^1.1.1":
78827919
version: 1.1.4
78837920
resolution: "chownr@npm:1.1.4"
@@ -9195,6 +9232,18 @@ __metadata:
91959232
languageName: node
91969233
linkType: hard
91979234

9235+
"debug@npm:^4":
9236+
version: 4.4.0
9237+
resolution: "debug@npm:4.4.0"
9238+
dependencies:
9239+
ms: "npm:^2.1.3"
9240+
peerDependenciesMeta:
9241+
supports-color:
9242+
optional: true
9243+
checksum: 10/1847944c2e3c2c732514b93d11886575625686056cd765336212dc15de2d2b29612b6cd80e1afba767bb8e1803b778caf9973e98169ef1a24a7a7009e1820367
9244+
languageName: node
9245+
linkType: hard
9246+
91989247
"debug@npm:~3.1.0":
91999248
version: 3.1.0
92009249
resolution: "debug@npm:3.1.0"
@@ -11343,7 +11392,7 @@ __metadata:
1134311392
languageName: node
1134411393
linkType: hard
1134511394

11346-
"glob-parent@npm:^5.1.2":
11395+
"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
1134711396
version: 5.1.2
1134811397
resolution: "glob-parent@npm:5.1.2"
1134911398
dependencies:
@@ -11956,6 +12005,13 @@ __metadata:
1195612005
languageName: node
1195712006
linkType: hard
1195812007

12008+
"ignore-by-default@npm:^1.0.1":
12009+
version: 1.0.1
12010+
resolution: "ignore-by-default@npm:1.0.1"
12011+
checksum: 10/441509147b3615e0365e407a3c18e189f78c07af08564176c680be1fabc94b6c789cad1342ad887175d4ecd5225de86f73d376cec8e06b42fd9b429505ffcf8a
12012+
languageName: node
12013+
linkType: hard
12014+
1195912015
"ignore@npm:^5.2.0, ignore@npm:^5.2.4":
1196012016
version: 5.2.4
1196112017
resolution: "ignore@npm:5.2.4"
@@ -12209,6 +12265,15 @@ __metadata:
1220912265
languageName: node
1221012266
linkType: hard
1221112267

12268+
"is-binary-path@npm:~2.1.0":
12269+
version: 2.1.0
12270+
resolution: "is-binary-path@npm:2.1.0"
12271+
dependencies:
12272+
binary-extensions: "npm:^2.0.0"
12273+
checksum: 10/078e51b4f956c2c5fd2b26bb2672c3ccf7e1faff38e0ebdba45612265f4e3d9fc3127a1fa8370bbf09eab61339203c3d3b7af5662cbf8be4030f8fac37745b0e
12274+
languageName: node
12275+
linkType: hard
12276+
1221212277
"is-boolean-object@npm:^1.1.0":
1221312278
version: 1.1.2
1221412279
resolution: "is-boolean-object@npm:1.1.2"
@@ -12345,7 +12410,7 @@ __metadata:
1234512410
languageName: node
1234612411
linkType: hard
1234712412

12348-
"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3":
12413+
"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
1234912414
version: 4.0.3
1235012415
resolution: "is-glob@npm:4.0.3"
1235112416
dependencies:
@@ -14465,6 +14530,26 @@ __metadata:
1446514530
languageName: node
1446614531
linkType: hard
1446714532

14533+
"nodemon@npm:^3.1.9":
14534+
version: 3.1.9
14535+
resolution: "nodemon@npm:3.1.9"
14536+
dependencies:
14537+
chokidar: "npm:^3.5.2"
14538+
debug: "npm:^4"
14539+
ignore-by-default: "npm:^1.0.1"
14540+
minimatch: "npm:^3.1.2"
14541+
pstree.remy: "npm:^1.1.8"
14542+
semver: "npm:^7.5.3"
14543+
simple-update-notifier: "npm:^2.0.0"
14544+
supports-color: "npm:^5.5.0"
14545+
touch: "npm:^3.1.0"
14546+
undefsafe: "npm:^2.0.5"
14547+
bin:
14548+
nodemon: bin/nodemon.js
14549+
checksum: 10/7c01ddfa30815f4147006f5b7c015a1f75017118cf398ee8c4ba3ac904667f4555b91cca6b7b191e0f6ccf5072727aa20224a1456d5446f3f6053e15132068a2
14550+
languageName: node
14551+
linkType: hard
14552+
1446814553
"nomnom@npm:>= 1.5.x":
1446914554
version: 1.8.1
1447014555
resolution: "nomnom@npm:1.8.1"
@@ -14486,6 +14571,13 @@ __metadata:
1448614571
languageName: node
1448714572
linkType: hard
1448814573

14574+
"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
14575+
version: 3.0.0
14576+
resolution: "normalize-path@npm:3.0.0"
14577+
checksum: 10/88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20
14578+
languageName: node
14579+
linkType: hard
14580+
1448914581
"normalize-url@npm:^6.0.1":
1449014582
version: 6.1.0
1449114583
resolution: "normalize-url@npm:6.1.0"
@@ -15081,7 +15173,7 @@ __metadata:
1508115173
languageName: node
1508215174
linkType: hard
1508315175

15084-
"picomatch@npm:^2.2.2, picomatch@npm:^2.3.1":
15176+
"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.3.1":
1508515177
version: 2.3.1
1508615178
resolution: "picomatch@npm:2.3.1"
1508715179
checksum: 10/60c2595003b05e4535394d1da94850f5372c9427ca4413b71210f437f7b2ca091dbd611c45e8b37d10036fa8eade25c1b8951654f9d3973bfa66a2ff4d3b08bc
@@ -15394,6 +15486,13 @@ __metadata:
1539415486
languageName: node
1539515487
linkType: hard
1539615488

15489+
"pstree.remy@npm:^1.1.8":
15490+
version: 1.1.8
15491+
resolution: "pstree.remy@npm:1.1.8"
15492+
checksum: 10/ef13b1b5896b35f67dbd4fb7ba54bb2a5da1a5c317276cbad4bcad4159bf8f7b5e1748dc244bf36865f3d560d2fc952521581280a91468c9c2df166cc760c8c1
15493+
languageName: node
15494+
linkType: hard
15495+
1539715496
"pump@npm:^3.0.0":
1539815497
version: 3.0.0
1539915498
resolution: "pump@npm:3.0.0"
@@ -16540,6 +16639,15 @@ __metadata:
1654016639
languageName: node
1654116640
linkType: hard
1654216641

16642+
"readdirp@npm:~3.6.0":
16643+
version: 3.6.0
16644+
resolution: "readdirp@npm:3.6.0"
16645+
dependencies:
16646+
picomatch: "npm:^2.2.1"
16647+
checksum: 10/196b30ef6ccf9b6e18c4e1724b7334f72a093d011a99f3b5920470f0b3406a51770867b3e1ae9711f227ef7a7065982f6ee2ce316746b2cb42c88efe44297fe7
16648+
languageName: node
16649+
linkType: hard
16650+
1654316651
"reduce-css-calc@npm:^1.3.0":
1654416652
version: 1.3.0
1654516653
resolution: "reduce-css-calc@npm:1.3.0"
@@ -17687,6 +17795,15 @@ __metadata:
1768717795
languageName: node
1768817796
linkType: hard
1768917797

17798+
"simple-update-notifier@npm:^2.0.0":
17799+
version: 2.0.0
17800+
resolution: "simple-update-notifier@npm:2.0.0"
17801+
dependencies:
17802+
semver: "npm:^7.5.3"
17803+
checksum: 10/40bd4f96aa89aedbf717ae9f4ab8fca70e8f7511e8b766feb15471cca3f6fe4fe673743309b08b4ba8abfe0965c9cd927e1de46550a757b819b70fc7430cc85d
17804+
languageName: node
17805+
linkType: hard
17806+
1769017807
"simplicial-complex@npm:^1.0.0":
1769117808
version: 1.0.0
1769217809
resolution: "simplicial-complex@npm:1.0.0"
@@ -18232,7 +18349,7 @@ __metadata:
1823218349
languageName: node
1823318350
linkType: hard
1823418351

18235-
"supports-color@npm:^5.3.0":
18352+
"supports-color@npm:^5.3.0, supports-color@npm:^5.5.0":
1823618353
version: 5.5.0
1823718354
resolution: "supports-color@npm:5.5.0"
1823818355
dependencies:
@@ -18562,6 +18679,15 @@ __metadata:
1856218679
languageName: node
1856318680
linkType: hard
1856418681

18682+
"touch@npm:^3.1.0":
18683+
version: 3.1.1
18684+
resolution: "touch@npm:3.1.1"
18685+
bin:
18686+
nodetouch: bin/nodetouch.js
18687+
checksum: 10/853e763a1f4903302c5654ed353f84ad85baf757dac62c2d37ab67e0477cfd271e8c64771fcfad42310aff7c9d284ddb435ee5ca13ff36d0f3693fedd8e971d1
18688+
languageName: node
18689+
linkType: hard
18690+
1856518691
"tough-cookie@npm:~2.5.0":
1856618692
version: 2.5.0
1856718693
resolution: "tough-cookie@npm:2.5.0"
@@ -19057,6 +19183,13 @@ __metadata:
1905719183
languageName: node
1905819184
linkType: hard
1905919185

19186+
"undefsafe@npm:^2.0.5":
19187+
version: 2.0.5
19188+
resolution: "undefsafe@npm:2.0.5"
19189+
checksum: 10/f42ab3b5770fedd4ada175fc1b2eb775b78f609156f7c389106aafd231bfc210813ee49f54483d7191d7b76e483bc7f537b5d92d19ded27156baf57592eb02cc
19190+
languageName: node
19191+
linkType: hard
19192+
1906019193
"underscore@npm:^1.13.1, underscore@npm:^1.13.6, underscore@npm:^1.13.7, underscore@npm:^1.8.3":
1906119194
version: 1.13.7
1906219195
resolution: "underscore@npm:1.13.7"

0 commit comments

Comments
 (0)