Skip to content

Commit 663bd49

Browse files
grilme99grilme99
authored
Merge pull request #8 from jsdotlua/fix/broken-release
Fix broken releases
2 parents 5b0f770 + b2d35ca commit 663bd49

File tree

10 files changed

+119
-35
lines changed

10 files changed

+119
-35
lines changed

‎.github/workflows/release.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
- name: Install Aftman
1919
uses: ok-nick/setup-aftman@v0
2020

21+
- name: Install Just
22+
uses: extractions/setup-just@v1
23+
2124
- name: Authenticate Wally
2225
run: |
2326
cd packages/react
@@ -34,6 +37,9 @@ jobs:
3437
- name: Publish changed packages
3538
run: bash ./scripts/publish.sh ${{ steps.latest-release.outputs.tag_name }}
3639

40+
- name: Install dependencies for build
41+
run: just install-packages
42+
3743
- name: Build project
3844
run: rojo build --output ReactLua.rbxm
3945

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
deps/
2+
13
.DS_Store
24

35
sourcemap.json

‎.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.justfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
analyze: install-packages
2+
rojo sourcemap default.project.json --output sourcemap.json
3+
curl -O https://raw.githubusercontent.com/JohnnyMorganz/luau-lsp/main/scripts/globalTypes.d.lua
4+
luau-lsp analyze --definitions=globalTypes.d.lua --base-luaurc=.luaurc --sourcemap=sourcemap.json packages/
5+
6+
# Installs packages and proxies their type information with `wally-package-types` tool
7+
# In addition, the packages/ directory is temporarily renamed so that it isn't removed by Wally
8+
install-packages:
9+
rm -rf deps/
10+
mv packages/ temp/
11+
12+
wally install
13+
14+
mv Packages deps/
15+
mv temp/ packages/
16+
17+
rojo sourcemap default.project.json --output sourcemap.json
18+
wally-package-types --sourcemap sourcemap.json deps/

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Fixed
11+
12+
- Fixed React build not including correct dependencies (#8)
13+
1014
## [17.0.1-rc.19] - 2023-04-07
1115

1216
### Added

‎aftman.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[tools]
22
rojo = "rojo-rbx/[email protected]"
3-
wally = "grilme99/wally@0.4.0"
3+
wally = "UpliftGames/wally@0.3.2"
44
stylua = "johnnymorganz/[email protected]"
55
selene = "Kampfkarren/[email protected]"
66
luau-lsp = "johnnymorganz/[email protected]"
7+
wally-package-types = "johnnymorganz/[email protected]"

‎default.project.json

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,21 @@
2323
"RoactCompat": {
2424
"$path": "packages/roact-compat/default.project.json"
2525
},
26-
"scheduler": {
26+
"Scheduler": {
2727
"$path": "packages/scheduler/default.project.json"
2828
},
2929
"Shared": {
3030
"$path": "packages/shared/default.project.json"
3131
},
32-
"Boolean": {
33-
"$path": "vendor/luau-polyfill/packages/boolean/default.project.json"
34-
},
35-
"Collections": {
36-
"$path": "vendor/luau-polyfill/packages/collections/default.project.json"
37-
},
38-
"Console": {
39-
"$path": "vendor/luau-polyfill/packages/console/default.project.json"
40-
},
41-
"ES7Types": {
42-
"$path": "vendor/luau-polyfill/packages/es7-types/default.project.json"
43-
},
44-
"InstanceOf": {
45-
"$path": "vendor/luau-polyfill/packages/instance-of/default.project.json"
32+
33+
"_Index": {
34+
"$path": "deps/_Index"
4635
},
4736
"LuauPolyfill": {
48-
"$path": "vendor/luau-polyfill/packages/luau-polyfill/default.project.json"
49-
},
50-
"Math": {
51-
"$path": "vendor/luau-polyfill/packages/math/default.project.json"
52-
},
53-
"Number": {
54-
"$path": "vendor/luau-polyfill/packages/number/default.project.json"
55-
},
56-
"String": {
57-
"$path": "vendor/luau-polyfill/packages/string/default.project.json"
58-
},
59-
"Symbol": {
60-
"$path": "vendor/luau-polyfill/packages/symbol/default.project.json"
37+
"$path": "deps/LuauPolyfill.lua"
6138
},
62-
"Timers": {
63-
"$path": "vendor/luau-polyfill/packages/timers/default.project.json"
39+
"Promise": {
40+
"$path": "deps/Promise.lua"
6441
}
6542
}
6643
}

‎vendor/luau-polyfill

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎wally.lock

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# This file is automatically @generated by Wally.
2+
# It is not intended for manual editing.
3+
registry = "test"
4+
5+
[[package]]
6+
name = "evaera/promise"
7+
version = "4.0.0"
8+
dependencies = []
9+
10+
[[package]]
11+
name = "jsdotlua/boolean"
12+
version = "1.2.3"
13+
dependencies = [["Number", "jsdotlua/[email protected]"]]
14+
15+
[[package]]
16+
name = "jsdotlua/collections"
17+
version = "1.2.3"
18+
dependencies = [["ES7Types", "jsdotlua/[email protected]"], ["InstanceOf", "jsdotlua/[email protected]"]]
19+
20+
[[package]]
21+
name = "jsdotlua/console"
22+
version = "1.2.3"
23+
dependencies = [["Collections", "jsdotlua/[email protected]"]]
24+
25+
[[package]]
26+
name = "jsdotlua/es7-types"
27+
version = "1.2.3"
28+
dependencies = []
29+
30+
[[package]]
31+
name = "jsdotlua/instance-of"
32+
version = "1.2.3"
33+
dependencies = []
34+
35+
[[package]]
36+
name = "jsdotlua/luau-polyfill"
37+
version = "1.2.3"
38+
dependencies = [["Boolean", "jsdotlua/[email protected]"], ["Collections", "jsdotlua/[email protected]"], ["Console", "jsdotlua/[email protected]"], ["ES7Types", "jsdotlua/[email protected]"], ["InstanceOf", "jsdotlua/[email protected]"], ["Math", "jsdotlua/[email protected]"], ["Number", "jsdotlua/[email protected]"], ["String", "jsdotlua/[email protected]"], ["Symbol", "jsdotlua/[email protected]"], ["Timers", "jsdotlua/[email protected]"]]
39+
40+
[[package]]
41+
name = "jsdotlua/math"
42+
version = "1.2.3"
43+
dependencies = []
44+
45+
[[package]]
46+
name = "jsdotlua/no-op"
47+
version = "0.1.0"
48+
dependencies = [["LuauPolyfill", "jsdotlua/[email protected]"], ["Promise", "evaera/[email protected]"]]
49+
50+
[[package]]
51+
name = "jsdotlua/number"
52+
version = "1.2.3"
53+
dependencies = []
54+
55+
[[package]]
56+
name = "jsdotlua/string"
57+
version = "1.2.3"
58+
dependencies = [["ES7Types", "jsdotlua/[email protected]"], ["Number", "jsdotlua/[email protected]"]]
59+
60+
[[package]]
61+
name = "jsdotlua/symbol"
62+
version = "1.0.0"
63+
dependencies = []
64+
65+
[[package]]
66+
name = "jsdotlua/timers"
67+
version = "1.2.3"
68+
dependencies = [["Collections", "jsdotlua/[email protected]"]]

‎wally.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This config exists so we can import the dependencies of all packages for analysis and release.
2+
# THIS PACKAGE IS NOT DIRECTLY PUBLISHED!
3+
4+
[package]
5+
name = "jsdotlua/no-op"
6+
version = "0.1.0"
7+
registry = "https://github.com/UpliftGames/wally-index"
8+
realm = "shared"
9+
10+
[dependencies]
11+
LuauPolyfill = "jsdotlua/[email protected]"
12+
Promise = "evaera/[email protected]"

0 commit comments

Comments
 (0)