Skip to content

Commit fc4e9e3

Browse files
grilme99grilme99
committed
fix: can now build on macos
1 parent 2be35bc commit fc4e9e3

File tree

5 files changed

+57
-51
lines changed

5 files changed

+57
-51
lines changed

‎.yarnrc.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
nodeLinker: node-modules
2-
3-
yarnPath: .yarn/releases/yarn-4.4.1.cjs

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
"commander": "^11.1.0",
1717
"npmluau": "^0.1.1"
1818
},
19-
"packageManager": "yarn@4.5.0"
19+
"packageManager": "yarn@3.6.1+sha256.811210abb5fb5751da12ead8a9cbc0c150b07e43ac9cbedec6752d22abfd2bd6"
2020
}

‎scripts/build-roblox-model.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ build_with_darklua_config () {
1111

1212
mkdir -p roblox
1313

14-
cp -rL node_modules/ roblox/node_modules/
15-
cp -r roblox-model/ roblox/roblox-model/
14+
cp -rL node_modules roblox/
15+
cp -r roblox-model roblox/
1616

1717
for module_path in roblox/roblox-model/*; do
1818
module_name=$(basename $module_path)
@@ -26,15 +26,16 @@ build_with_darklua_config () {
2626
done
2727

2828
./scripts/remove-tests.sh roblox
29+
./scripts/remove-node-modules.sh roblox/node_modules/@jsdotlua
2930

3031
cp default.project.json roblox
3132

3233
rojo sourcemap roblox/default.project.json -o roblox/sourcemap.json
3334

3435
cp $DARKLUA_CONFIG roblox
3536

36-
darklua process --config roblox/$DARKLUA_CONFIG roblox/node_modules roblox/node_modules
3737
darklua process --config roblox/$DARKLUA_CONFIG roblox/roblox-model roblox/roblox-model
38+
darklua process --config roblox/$DARKLUA_CONFIG roblox/node_modules roblox/node_modules
3839

3940
mkdir -p $(dirname $OUTPUT)
4041

‎scripts/remove-node-modules.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
set -e
4+
5+
FOLDER=$1
6+
7+
find $FOLDER -name 'node_modules' -type d -depth -exec rm -r {} +

‎yarn.lock‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# Manual changes might be lost - proceed with caution!
33

44
__metadata:
5-
version: 8
6-
cacheKey: 10c0
5+
version: 6
6+
cacheKey: 8
77

88
"@jsdotlua/boolean@npm:^1.2.7":
99
version: 1.2.7
1010
resolution: "@jsdotlua/boolean@npm:1.2.7"
1111
dependencies:
1212
"@jsdotlua/number": "npm:^1.2.7"
13-
checksum: 10c0/a7342b8a5c5764a99446b91cf91e0e41ec789f468acdb5e657d33eb3c6c207b9c94590d318496466520cb8590b7f4c1baea0aca89798c7f88749f8d237e15c2f
13+
checksum: 42378426a1585a37260557b8ec2976904d6a5507da80112bc369a0a2b5ab7b6c7511715b549bcc7d7f9c843271199a54722a999c08191feaf924e3b8bbeb7985
1414
languageName: node
1515
linkType: hard
1616

@@ -20,7 +20,7 @@ __metadata:
2020
dependencies:
2121
"@jsdotlua/es7-types": "npm:^1.2.7"
2222
"@jsdotlua/instance-of": "npm:^1.2.7"
23-
checksum: 10c0/ee4dc2129bdfb2c07a81027738335292f5a37329bd6b34d2be11589384fc6d37d0cdb2bf198d794ad764b188b2441c49d21eea2eedcbf27c8214f4a432164122
23+
checksum: c08a49c36faf14cc7a96f9376fa6bb94aca90bd36cc76fd7e5e6a7e26cc553a071ccffa9fc4a9877958189cf6a2bb9c7469433a086ba0c1df5ca2ed7151f0917
2424
languageName: node
2525
linkType: hard
2626

@@ -29,21 +29,21 @@ __metadata:
2929
resolution: "@jsdotlua/console@npm:1.2.7"
3030
dependencies:
3131
"@jsdotlua/collections": "npm:^1.2.7"
32-
checksum: 10c0/0ea98ef96d23a78fadbcf365fe4f0fd6fc04c753305ed180550396ebb7084120c9224d18b323cea35f9261de94c6b29855cadb1d91c1961f3cdc888c4a319413
32+
checksum: 822d5a7826dd9b125c22b540dae5be0b08da20e40f0d13346589dc612df4e88856515780c8e6d37a8ce7cf7553c38528ffddf836d0abdc2cad646fa55ae079df
3333
languageName: node
3434
linkType: hard
3535

3636
"@jsdotlua/es7-types@npm:^1.2.7":
3737
version: 1.2.7
3838
resolution: "@jsdotlua/es7-types@npm:1.2.7"
39-
checksum: 10c0/c639dfb8b6039a385424e24b6636cc12607ba1ff09da046ec37bd1af47b55a95f7a4b3ae8f4bdbd2f0b7bed08316e00e32debbc11afc0acf252182afe06a8f71
39+
checksum: 28a8123cfa7b8202b5ee99c445d104b5216668c53d0cb2f55c4525ba0c785e5c0fb0746ac8c04a8b2fda7293cd67b474d481d44e096a92d04e42cdce11ce8d12
4040
languageName: node
4141
linkType: hard
4242

4343
"@jsdotlua/instance-of@npm:^1.2.7":
4444
version: 1.2.7
4545
resolution: "@jsdotlua/instance-of@npm:1.2.7"
46-
checksum: 10c0/a3ebb3fd7750fb23afb26338eaa0e4c0dfe7badfd9180b4a72749a0d910269d484ce93c53bdb3219318576a87c175932bbe87466dbff870141b66541c5943eda
46+
checksum: 55e769685c97a756855d634657d4b7ca838be0b4220a55dc5ae4432c623e4fedd859f014078dda6ffb423b298010f743bf317c103340b8cb1c7065d81b08bce2
4747
languageName: node
4848
linkType: hard
4949

@@ -61,79 +61,79 @@ __metadata:
6161
"@jsdotlua/string": "npm:^1.2.7"
6262
"@jsdotlua/timers": "npm:^1.2.7"
6363
symbol-luau: "npm:^1.0.0"
64-
checksum: 10c0/1f98940c9f7cff669c9202370e2faa1e577ec2c7fd32c85773fcf20a00a6255dc99dd49f8962799db30526f436b08af4d9710c86b2d2d30b9184da4b60620c5c
64+
checksum: 9ffc2f84f7d40b948701e9c69a2310897f49394ee394ae1456b53a67edef6e0194de256ce829d6eb5663347e95a7d3bf46a58280356926b7d6fe22e0afac46e6
6565
languageName: node
6666
linkType: hard
6767

6868
"@jsdotlua/math@npm:^1.2.7":
6969
version: 1.2.7
7070
resolution: "@jsdotlua/math@npm:1.2.7"
71-
checksum: 10c0/4e622511789a89d6c92c7c03856ac18763b402c1638b482df29dee43e56edd662b1131f27945919eb9a3960c26196767ca9e12bea118aa6c9781d2b10807291f
71+
checksum: 37d335a1f35d2a751e0d58916b38b60b04dbb51b8b1cbbf6eae24c72ba1690615c759e59d21f1c264667e2a124e8c39645c18fa86d9080418c9163a223406780
7272
languageName: node
7373
linkType: hard
7474

7575
"@jsdotlua/number@npm:^1.2.7":
7676
version: 1.2.7
7777
resolution: "@jsdotlua/number@npm:1.2.7"
78-
checksum: 10c0/ffb9ee335508f90f381419616e066bed3b294d3d77bbda73378fcabf3ccd1881b9f69364d1f4ed979e8b870c478a860a79921e12f7efbeb4b310e4208b75edfd
78+
checksum: 7d523a94ccd8b15f5fc21647afe11416355dc6fc0d5eb3deeb0d4cb498f31e37d4ad07be4901ad5758e84d9ad176d4b183ef20d1786302cc8430114ed34b69ee
7979
languageName: node
8080
linkType: hard
8181

8282
"@jsdotlua/promise@npm:^3.5.0":
8383
version: 3.5.0
8484
resolution: "@jsdotlua/promise@npm:3.5.0"
85-
checksum: 10c0/8771dac525b8d608ad319040b742cdde8f4cbbd4a075ae02dad4d510c8ab739dabf7de40ae1b15211e3890331cf3e7d9454fdcb3ec9a08471663436c0e9ec977
85+
checksum: 64a7bb576126dd3702d91f542793b52f43e83c051a422b4b4a63f0225a4c8fea4d416c52bf5e344093dfd18936e46f55f3c75c82a4c805f7662086ddd12efb42
8686
languageName: node
8787
linkType: hard
8888

8989
"@jsdotlua/react-cache@workspace:modules/react-cache":
9090
version: 0.0.0-use.local
9191
resolution: "@jsdotlua/react-cache@workspace:modules/react-cache"
9292
dependencies:
93-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
93+
"@jsdotlua/luau-polyfill": ^1.2.6
9494
"@jsdotlua/react": "workspace:^"
9595
"@jsdotlua/scheduler": "workspace:^"
9696
"@jsdotlua/shared": "workspace:^"
97-
npmluau: "npm:^0.1.0"
97+
npmluau: ^0.1.0
9898
languageName: unknown
9999
linkType: soft
100100

101101
"@jsdotlua/react-debug-tools@workspace:^, @jsdotlua/react-debug-tools@workspace:modules/react-debug-tools":
102102
version: 0.0.0-use.local
103103
resolution: "@jsdotlua/react-debug-tools@workspace:modules/react-debug-tools"
104104
dependencies:
105-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
105+
"@jsdotlua/luau-polyfill": ^1.2.6
106106
"@jsdotlua/react-reconciler": "workspace:^"
107107
"@jsdotlua/shared": "workspace:^"
108-
npmluau: "npm:^0.1.0"
108+
npmluau: ^0.1.0
109109
languageName: unknown
110110
linkType: soft
111111

112112
"@jsdotlua/react-devtools-extensions@workspace:modules/react-devtools-extensions":
113113
version: 0.0.0-use.local
114114
resolution: "@jsdotlua/react-devtools-extensions@workspace:modules/react-devtools-extensions"
115115
dependencies:
116-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
116+
"@jsdotlua/luau-polyfill": ^1.2.6
117117
"@jsdotlua/react": "workspace:^"
118118
"@jsdotlua/react-devtools-shared": "workspace:^"
119119
"@jsdotlua/react-roblox": "workspace:^"
120120
"@jsdotlua/shared": "workspace:^"
121-
npmluau: "npm:^0.1.0"
121+
npmluau: ^0.1.0
122122
languageName: unknown
123123
linkType: soft
124124

125125
"@jsdotlua/react-devtools-shared@workspace:^, @jsdotlua/react-devtools-shared@workspace:modules/react-devtools-shared":
126126
version: 0.0.0-use.local
127127
resolution: "@jsdotlua/react-devtools-shared@workspace:modules/react-devtools-shared"
128128
dependencies:
129-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
129+
"@jsdotlua/luau-polyfill": ^1.2.6
130130
"@jsdotlua/react": "workspace:^"
131131
"@jsdotlua/react-debug-tools": "workspace:^"
132132
"@jsdotlua/react-is": "workspace:^"
133133
"@jsdotlua/react-reconciler": "workspace:^"
134134
"@jsdotlua/react-roblox": "workspace:^"
135135
"@jsdotlua/shared": "workspace:^"
136-
npmluau: "npm:^0.1.0"
136+
npmluau: ^0.1.0
137137
languageName: unknown
138138
linkType: soft
139139

@@ -142,99 +142,99 @@ __metadata:
142142
resolution: "@jsdotlua/react-is@workspace:modules/react-is"
143143
dependencies:
144144
"@jsdotlua/shared": "workspace:^"
145-
npmluau: "npm:^0.1.0"
145+
npmluau: ^0.1.0
146146
languageName: unknown
147147
linkType: soft
148148

149149
"@jsdotlua/react-reconciler@workspace:^, @jsdotlua/react-reconciler@workspace:modules/react-reconciler":
150150
version: 0.0.0-use.local
151151
resolution: "@jsdotlua/react-reconciler@workspace:modules/react-reconciler"
152152
dependencies:
153-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
154-
"@jsdotlua/promise": "npm:^3.5.0"
153+
"@jsdotlua/luau-polyfill": ^1.2.6
154+
"@jsdotlua/promise": ^3.5.0
155155
"@jsdotlua/react": "workspace:^"
156156
"@jsdotlua/scheduler": "workspace:^"
157157
"@jsdotlua/shared": "workspace:^"
158-
npmluau: "npm:^0.1.0"
158+
npmluau: ^0.1.0
159159
languageName: unknown
160160
linkType: soft
161161

162162
"@jsdotlua/react-roblox@workspace:^, @jsdotlua/react-roblox@workspace:modules/react-roblox":
163163
version: 0.0.0-use.local
164164
resolution: "@jsdotlua/react-roblox@workspace:modules/react-roblox"
165165
dependencies:
166-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
166+
"@jsdotlua/luau-polyfill": ^1.2.6
167167
"@jsdotlua/react": "workspace:^"
168168
"@jsdotlua/react-reconciler": "workspace:^"
169169
"@jsdotlua/scheduler": "workspace:^"
170170
"@jsdotlua/shared": "workspace:^"
171-
npmluau: "npm:^0.1.0"
171+
npmluau: ^0.1.0
172172
languageName: unknown
173173
linkType: soft
174174

175175
"@jsdotlua/react-shallow-renderer@workspace:modules/react-shallow-renderer":
176176
version: 0.0.0-use.local
177177
resolution: "@jsdotlua/react-shallow-renderer@workspace:modules/react-shallow-renderer"
178178
dependencies:
179-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
179+
"@jsdotlua/luau-polyfill": ^1.2.6
180180
"@jsdotlua/react": "workspace:^"
181181
"@jsdotlua/react-is": "workspace:^"
182182
"@jsdotlua/shared": "workspace:^"
183-
npmluau: "npm:^0.1.0"
183+
npmluau: ^0.1.0
184184
languageName: unknown
185185
linkType: soft
186186

187187
"@jsdotlua/react-test-renderer@workspace:modules/react-test-renderer":
188188
version: 0.0.0-use.local
189189
resolution: "@jsdotlua/react-test-renderer@workspace:modules/react-test-renderer"
190190
dependencies:
191-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
191+
"@jsdotlua/luau-polyfill": ^1.2.6
192192
"@jsdotlua/react": "workspace:^"
193193
"@jsdotlua/react-reconciler": "workspace:^"
194194
"@jsdotlua/scheduler": "workspace:^"
195195
"@jsdotlua/shared": "workspace:^"
196-
npmluau: "npm:^0.1.0"
196+
npmluau: ^0.1.0
197197
languageName: unknown
198198
linkType: soft
199199

200200
"@jsdotlua/react@workspace:^, @jsdotlua/react@workspace:modules/react":
201201
version: 0.0.0-use.local
202202
resolution: "@jsdotlua/react@workspace:modules/react"
203203
dependencies:
204-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
204+
"@jsdotlua/luau-polyfill": ^1.2.6
205205
"@jsdotlua/shared": "workspace:^"
206-
npmluau: "npm:^0.1.0"
206+
npmluau: ^0.1.0
207207
languageName: unknown
208208
linkType: soft
209209

210210
"@jsdotlua/roact-compat@workspace:modules/roact-compat":
211211
version: 0.0.0-use.local
212212
resolution: "@jsdotlua/roact-compat@workspace:modules/roact-compat"
213213
dependencies:
214-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
214+
"@jsdotlua/luau-polyfill": ^1.2.6
215215
"@jsdotlua/react": "workspace:^"
216216
"@jsdotlua/react-roblox": "workspace:^"
217217
"@jsdotlua/shared": "workspace:^"
218-
npmluau: "npm:^0.1.0"
218+
npmluau: ^0.1.0
219219
languageName: unknown
220220
linkType: soft
221221

222222
"@jsdotlua/scheduler@workspace:^, @jsdotlua/scheduler@workspace:modules/scheduler":
223223
version: 0.0.0-use.local
224224
resolution: "@jsdotlua/scheduler@workspace:modules/scheduler"
225225
dependencies:
226-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
226+
"@jsdotlua/luau-polyfill": ^1.2.6
227227
"@jsdotlua/shared": "workspace:^"
228-
npmluau: "npm:^0.1.0"
228+
npmluau: ^0.1.0
229229
languageName: unknown
230230
linkType: soft
231231

232232
"@jsdotlua/shared@workspace:^, @jsdotlua/shared@workspace:modules/shared":
233233
version: 0.0.0-use.local
234234
resolution: "@jsdotlua/shared@workspace:modules/shared"
235235
dependencies:
236-
"@jsdotlua/luau-polyfill": "npm:^1.2.6"
237-
npmluau: "npm:^0.1.0"
236+
"@jsdotlua/luau-polyfill": ^1.2.6
237+
npmluau: ^0.1.0
238238
languageName: unknown
239239
linkType: soft
240240

@@ -244,7 +244,7 @@ __metadata:
244244
dependencies:
245245
"@jsdotlua/es7-types": "npm:^1.2.7"
246246
"@jsdotlua/number": "npm:^1.2.7"
247-
checksum: 10c0/2a4fea39734748f5b0e188b143cd178f460e32998745faf3b99364cb51fdd354d77c9c2a2138f28a71c5dad2cf10112a4368017aa2c9b12c36d198b84ccb079c
247+
checksum: 407f927ae6f6290430ca8e6f8b14d7e77ebc7a4fd5438be3e59bc879712053aa85bd3f764e3e8e9e3f8b17735e5554a1429ad5fdca22b435ef5ed49df5dae498
248248
languageName: node
249249
linkType: hard
250250

@@ -253,14 +253,14 @@ __metadata:
253253
resolution: "@jsdotlua/timers@npm:1.2.7"
254254
dependencies:
255255
"@jsdotlua/collections": "npm:^1.2.7"
256-
checksum: 10c0/ce7c1aeb0278436319325f45c6866f3a580453ca1e094ca9641421083268283b8e896a90e249108d89b8700fdd0571d39e687e94e2f27561628d5c83b33db673
256+
checksum: 7a86b575674f1abd85b5a373969395664fb1e806127a129fa3f2b360cb96d6f9094b6dfb0919e8f7cb2a7d6a2a80b1e2778231a58a15a53b6d6fdedc9eccb548
257257
languageName: node
258258
linkType: hard
259259

260260
"commander@npm:^11.0.0, commander@npm:^11.1.0":
261261
version: 11.1.0
262262
resolution: "commander@npm:11.1.0"
263-
checksum: 10c0/13cc6ac875e48780250f723fb81c1c1178d35c5decb1abb1b628b3177af08a8554e76b2c0f29de72d69eef7c864d12613272a71fabef8047922bc622ab75a179
263+
checksum: fd1a8557c6b5b622c89ecdfde703242ab7db3b628ea5d1755784c79b8e7cb0d74d65b4a262289b533359cd58e1bfc0bf50245dfbcd2954682a6f367c828b79ef
264264
languageName: node
265265
linkType: hard
266266

@@ -272,29 +272,29 @@ __metadata:
272272
walkdir: "npm:^0.4.1"
273273
bin:
274274
npmluau: main.js
275-
checksum: 10c0/9ae22c0dcff9e85c90b4da4e8c17bc51e9b567b4a417c9767d355ff68faca4f99a2934b581743ebc8729f6851d1ba5b64597312151747252e040517d1794fbca
275+
checksum: b0d2acd5ce126257119b9af306cdfc2b40ea5a4de0cec9b033d623425fba6976dabb75d138bc73abadef61ab4de2d271d1cfeddef961d1b573e2a9d7cdaf9b8e
276276
languageName: node
277277
linkType: hard
278278

279279
"symbol-luau@npm:^1.0.0":
280280
version: 1.0.1
281281
resolution: "symbol-luau@npm:1.0.1"
282-
checksum: 10c0/ab51a77331b2d5e4666528bada17e67b26aea355257bba9e97351016cd1836bd19f372355a14cf5bef2f4d5bc6b32fe91aeb09698d7bdc079d2c61330bedf251
282+
checksum: c857ff15c59201012ab5d409cf1ea61689e1347d5ce8c6379850ece8db3ad6a1d241c73f21a0452dd6a21cfdbd1451fc9516563632900a39ea0b566c81df7f31
283283
languageName: node
284284
linkType: hard
285285

286286
"walkdir@npm:^0.4.1":
287287
version: 0.4.1
288288
resolution: "walkdir@npm:0.4.1"
289-
checksum: 10c0/88e635aa9303e9196e4dc15013d2bd4afca4c8c8b4bb27722ca042bad213bb882d3b9141b3b0cca6bfb274f7889b30cf58d6374844094abec0016f335c5414dc
289+
checksum: 71045c21dc19aae3321f897b6e9e507cf8039202665c35a0b908eecccaf25636aab769b31cbd61ef8267237fe22fc316923a691ecc2d9d38840a15c59c0f2594
290290
languageName: node
291291
linkType: hard
292292

293293
"workspace@workspace:.":
294294
version: 0.0.0-use.local
295295
resolution: "workspace@workspace:."
296296
dependencies:
297-
commander: "npm:^11.1.0"
298-
npmluau: "npm:^0.1.1"
297+
commander: ^11.1.0
298+
npmluau: ^0.1.1
299299
languageName: unknown
300300
linkType: soft

0 commit comments

Comments
 (0)