Skip to content

Commit 04a4e1b

Browse files
committed
fix: replace '&' with concurrently for cross-platform compatibility
- Used `concurrently` to run parallel commands in package.json scripts - Added `concurrently` as a devDependency in package.json
1 parent 35c5518 commit 04a4e1b

File tree

2 files changed

+101
-7
lines changed

2 files changed

+101
-7
lines changed

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"license": "mit",
55
"scripts": {
66
"mask": "npx tsx app/masks/build.ts",
7-
"mask:watch": "npx watch 'yarn mask' app/masks",
8-
"dev": "yarn run mask:watch & next dev",
7+
"mask:watch": "npx watch \"yarn mask\" app/masks",
8+
"dev": "concurrently -r \"yarn run mask:watch\" \"next dev\"",
99
"build": "yarn mask && cross-env BUILD_MODE=standalone next build",
1010
"start": "next start",
1111
"lint": "next lint",
1212
"export": "yarn mask && cross-env BUILD_MODE=export BUILD_APP=1 next build",
13-
"export:dev": "yarn mask:watch & cross-env BUILD_MODE=export BUILD_APP=1 next dev",
14-
"app:dev": "yarn mask:watch & yarn tauri dev",
13+
"export:dev": "concurrently -r \"yarn mask:watch\" \"cross-env BUILD_MODE=export BUILD_APP=1 next dev\"",
14+
"app:dev": "concurrently -r \"yarn mask:watch\" \"yarn tauri dev\"",
1515
"app:build": "yarn mask && yarn tauri build",
1616
"prompts": "node ./scripts/fetch-prompts.mjs",
1717
"prepare": "husky install",
@@ -53,6 +53,7 @@
5353
"@types/react-dom": "^18.2.7",
5454
"@types/react-katex": "^3.0.0",
5555
"@types/spark-md5": "^3.0.4",
56+
"concurrently": "^8.2.2",
5657
"cross-env": "^7.0.3",
5758
"eslint": "^8.49.0",
5859
"eslint-config-next": "13.4.19",

yarn.lock

Lines changed: 96 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,13 @@
10351035
dependencies:
10361036
regenerator-runtime "^0.14.0"
10371037

1038+
"@babel/runtime@^7.21.0":
1039+
version "7.25.0"
1040+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb"
1041+
integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==
1042+
dependencies:
1043+
regenerator-runtime "^0.14.0"
1044+
10381045
"@babel/template@^7.18.10", "@babel/template@^7.20.7":
10391046
version "7.20.7"
10401047
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
@@ -2269,7 +2276,7 @@ chalk@^2.0.0, chalk@^2.4.2:
22692276
escape-string-regexp "^1.0.5"
22702277
supports-color "^5.3.0"
22712278

2272-
chalk@^4.0.0:
2279+
chalk@^4.0.0, chalk@^4.1.2:
22732280
version "4.1.2"
22742281
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
22752282
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2335,6 +2342,15 @@ client-only@0.0.1:
23352342
resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
23362343
integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
23372344

2345+
cliui@^8.0.1:
2346+
version "8.0.1"
2347+
resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
2348+
integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
2349+
dependencies:
2350+
string-width "^4.2.0"
2351+
strip-ansi "^6.0.1"
2352+
wrap-ansi "^7.0.0"
2353+
23382354
color-convert@^1.9.0:
23392355
version "1.9.3"
23402356
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2394,6 +2410,21 @@ concat-map@0.0.1:
23942410
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
23952411
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
23962412

2413+
concurrently@^8.2.2:
2414+
version "8.2.2"
2415+
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784"
2416+
integrity sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==
2417+
dependencies:
2418+
chalk "^4.1.2"
2419+
date-fns "^2.30.0"
2420+
lodash "^4.17.21"
2421+
rxjs "^7.8.1"
2422+
shell-quote "^1.8.1"
2423+
spawn-command "0.0.2"
2424+
supports-color "^8.1.1"
2425+
tree-kill "^1.2.2"
2426+
yargs "^17.7.2"
2427+
23972428
convert-source-map@^1.7.0:
23982429
version "1.9.0"
23992430
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
@@ -2801,6 +2832,13 @@ data-uri-to-buffer@^4.0.0:
28012832
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
28022833
integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
28032834

2835+
date-fns@^2.30.0:
2836+
version "2.30.0"
2837+
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
2838+
integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
2839+
dependencies:
2840+
"@babel/runtime" "^7.21.0"
2841+
28042842
dayjs@^1.11.7:
28052843
version "1.11.7"
28062844
resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
@@ -3562,6 +3600,11 @@ gensync@^1.0.0-beta.2:
35623600
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
35633601
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
35643602

3603+
get-caller-file@^2.0.5:
3604+
version "2.0.5"
3605+
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
3606+
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
3607+
35653608
get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
35663609
version "1.2.0"
35673610
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
@@ -5480,6 +5523,11 @@ remark-rehype@^10.0.0:
54805523
mdast-util-to-hast "^12.1.0"
54815524
unified "^10.0.0"
54825525

5526+
require-directory@^2.1.1:
5527+
version "2.1.1"
5528+
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
5529+
integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
5530+
54835531
resolve-from@^4.0.0:
54845532
version "4.0.0"
54855533
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -5557,6 +5605,13 @@ rxjs@^7.8.0:
55575605
dependencies:
55585606
tslib "^2.1.0"
55595607

5608+
rxjs@^7.8.1:
5609+
version "7.8.1"
5610+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
5611+
integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
5612+
dependencies:
5613+
tslib "^2.1.0"
5614+
55605615
sade@^1.7.3:
55615616
version "1.8.1"
55625617
resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
@@ -5639,6 +5694,11 @@ shebang-regex@^3.0.0:
56395694
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
56405695
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
56415696

5697+
shell-quote@^1.8.1:
5698+
version "1.8.1"
5699+
resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
5700+
integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
5701+
56425702
side-channel@^1.0.4:
56435703
version "1.0.4"
56445704
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -5717,6 +5777,11 @@ spark-md5@^3.0.2:
57175777
resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
57185778
integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==
57195779

5780+
spawn-command@0.0.2:
5781+
version "0.0.2"
5782+
resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e"
5783+
integrity sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==
5784+
57205785
stable@^0.1.8:
57215786
version "0.1.8"
57225787
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -5739,7 +5804,7 @@ string-argv@^0.3.1:
57395804
resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
57405805
integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
57415806

5742-
string-width@^4.1.0, string-width@^4.2.0:
5807+
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
57435808
version "4.2.3"
57445809
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
57455810
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5860,7 +5925,7 @@ supports-color@^7.1.0:
58605925
dependencies:
58615926
has-flag "^4.0.0"
58625927

5863-
supports-color@^8.0.0:
5928+
supports-color@^8.0.0, supports-color@^8.1.1:
58645929
version "8.1.1"
58655930
resolved "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
58665931
integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -5956,6 +6021,11 @@ to-regex-range@^5.0.1:
59566021
dependencies:
59576022
is-number "^7.0.0"
59586023

6024+
tree-kill@^1.2.2:
6025+
version "1.2.2"
6026+
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
6027+
integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
6028+
59596029
trim-lines@^3.0.0:
59606030
version "3.0.1"
59616031
resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
@@ -6355,6 +6425,11 @@ wrappy@1:
63556425
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
63566426
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
63576427

6428+
y18n@^5.0.5:
6429+
version "5.0.8"
6430+
resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
6431+
integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
6432+
63586433
yallist@^3.0.2:
63596434
version "3.1.1"
63606435
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -6375,6 +6450,24 @@ yaml@^2.2.2:
63756450
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
63766451
integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
63776452

6453+
yargs-parser@^21.1.1:
6454+
version "21.1.1"
6455+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
6456+
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
6457+
6458+
yargs@^17.7.2:
6459+
version "17.7.2"
6460+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
6461+
integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
6462+
dependencies:
6463+
cliui "^8.0.1"
6464+
escalade "^3.1.1"
6465+
get-caller-file "^2.0.5"
6466+
require-directory "^2.1.1"
6467+
string-width "^4.2.3"
6468+
y18n "^5.0.5"
6469+
yargs-parser "^21.1.1"
6470+
63786471
yocto-queue@^0.1.0:
63796472
version "0.1.0"
63806473
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"

0 commit comments

Comments
 (0)