Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .darklua.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"current": {
"name": "path",
"sources": {
"@pkg": "./Packages",
"@pkg": "./roblox_packages",
"@root": "./src"
}
},
Expand All @@ -22,4 +22,4 @@
"remove_nil_declaration",
"remove_empty_do"
]
}
}
14 changes: 10 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Install pesde
uses: 0x5eal/semver-luau/.github/actions/setup-pesde@main

- name: Install packages
run: lune run wally-install
run: pesde install

- name: Lint
run: lune run lint
Expand Down Expand Up @@ -45,11 +48,14 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Lune typedefs
run: lune setup
- name: Install pesde
uses: 0x5eal/semver-luau/.github/actions/setup-pesde@main

- name: Install packages
run: lune run wally-install
run: pesde install

- name: Setup Lune typedefs
run: lune setup

- name: Run Luau analysis
run: lune run analyze
16 changes: 13 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Install pesde
uses: 0x5eal/semver-luau/.github/actions/setup-pesde@main

- name: Install packages
run: pesde install

- name: Get model file name
run: |
name=$(jq -r .name default.project.json)
echo "MODEL_FILE=$name.rbxm" >> $GITHUB_ENV

- name: Install packages
run: lune run wally-install

- name: Build
run: lune run build -- --target prod --output ${{ env.MODEL_FILE }}

Expand All @@ -36,6 +39,13 @@ jobs:
if: ${{ github.event.release }}
run: wally publish

- name: Login to Pesde registry
run: pesde auth login --token ${{ secrets.PESDE_REGISTRY_TOKEN }}

- name: Publish to Pesde
if: ${{ github.event.release }}
run: pesde publish

- uses: softprops/action-gh-release@v1
if: ${{ github.event.release }}
with:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ dist
sourcemap*.json
globalTypes.d.luau

# Pesde
roblox_packages
pesde.lock

# Wally
/DevPackages
/Packages
Expand Down
4 changes: 2 additions & 2 deletions .luaurc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"languageMode": "strict",
"aliases": {
"pkg": "./Packages",
"pkg": "./roblox_packages",
"root": "./src"
}
}
}
2 changes: 1 addition & 1 deletion .lune/analyze.luau
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ run("luau-lsp", {
`--sourcemap={project.SOURCEMAP_PATH}`,
`--defs={globalDefsPath}`,
"--settings=./.vscode/settings.json",
"--ignore=**/_Index/**",
"--ignore=**/.pesde/**",
project.SOURCE_PATH,
project.LUNE_SCRIPTS_PATH,
})
14 changes: 14 additions & 0 deletions .lune/build.luau
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ local output = if args.output then args.output else project.MODEL_FILENAME
assert(typeof(output) == "string", `bad value for output (string expected, got {typeof(output)})`)

local WALLY_BUILD_DIR = ".build/wally"
local PESDE_BUILD_DIR = ".build/pesde"

local function buildWallyPackage()
run("rm", { "-rf", WALLY_BUILD_DIR })
Expand All @@ -28,6 +29,18 @@ local function buildWallyPackage()
run("rm", { archivePath })
end

local function buildPesdePackage()
run("rm", { "-rf", PESDE_BUILD_DIR })

run("mkdir", { "-p", PESDE_BUILD_DIR })

run("pesde", { "publish", "--dry-run" })

local archivePath = "package.tar.gz"
run("tar", { "-xzf", archivePath, "-C", PESDE_BUILD_DIR })
run("rm", { archivePath })
end

local function build()
compile(target)

Expand All @@ -40,6 +53,7 @@ local function build()
run("rojo", { "build", "-o", output })

buildWallyPackage()
buildPesdePackage()
end

build()
Expand Down
5 changes: 0 additions & 5 deletions .lune/wally-install.luau

This file was deleted.

4 changes: 4 additions & 0 deletions .pesde/roblox_sync_config_generator.luau
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
local process = require("@lune/process")
local home_dir = if process.os == "windows" then process.env.userprofile else process.env.HOME

require(home_dir .. "/.pesde/scripts/lune/rojo/roblox_sync_config_generator.luau")
4 changes: 4 additions & 0 deletions .pesde/sourcemap_generator.luau
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
local process = require("@lune/process")
local home_dir = if process.os == "windows" then process.env.userprofile else process.env.HOME

require(home_dir .. "/.pesde/scripts/lune/rojo/sourcemap_generator.luau")
6 changes: 3 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"luau-lsp.sourcemap.rojoProjectFile": "analysis.project.json",
"luau-lsp.require.mode": "relativeToFile",
"luau-lsp.ignoreGlobs": [
"**/_Index/**",
"**/.pesde/**",
"**/dist/**"
],
"luau-lsp.require.directoryAliases": {
"@pkg": "./Packages",
"@pkg": "./roblox_packages",
"@root": "./src",
"@lune/": "~/.lune/.typedefs/0.8.7/"
}
}
}
4 changes: 2 additions & 2 deletions build.project.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "Packages",
"tree": {
"$path": "Packages",
"$path": "roblox_packages",
"Storyteller": {
"$path": "src"
}
}
}
}
36 changes: 36 additions & 0 deletions pesde.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name = "flipbook_labs/storyteller"
version = "0.5.0"
description = "Discovery and rendering of UI stories in Roblox"
authors = ["Marin Minnerly"]
repository = "https://github.com/flipbook-labs/storyteller"
license = "MIT"

includes = ["dist/", "pesde.toml", "README.md", "LICENSE"]

[target]
environment = "roblox"
lib = "dist/init.luau"
build_files = ["dist"]

[scripts]
roblox_sync_config_generator = ".pesde/roblox_sync_config_generator.luau"
sourcemap_generator = ".pesde/sourcemap_generator.luau"

[indices]
default = "https://github.com/daimond113/pesde-index"

[wally_indices]
default = "https://github.com/UpliftGames/wally-index"

[dependencies]
Sift = { wally = "wally#csqrl/sift", version = "^0.0.9" }
ModuleLoader = { wally = "wally#flipbook-labs/module-loader", version = "^0.6.2" }
t = { wally = "wally#osyrisrblx/t", version = "^3.1.1" }
React = { wally = "wally#jsdotlua/react", version = "^17.2.0" }

[dev_dependencies]
ReactRoblox = { wally = "wally#jsdotlua/react-roblox", version = "^17.2.0" }
Roact = { wally = "wally#roblox/roact", version = "^1.4.4" }
Fusion = { wally = "wally#elttob/fusion", version = "^0.2.0" }
Jest = { wally = "wally#jsdotlua/jest", version = "^3.6.1-rc.2" }
JestGlobals = { wally = "wally#jsdotlua/jest-globals", version = "^3.6.1-rc.2" }
4 changes: 2 additions & 2 deletions tests.project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"$className": "DataModel",
"ReplicatedStorage": {
"Packages": {
"$path": "Packages",
"$path": "roblox_packages",
"Storyteller": {
"$path": "default.project.json"
}
}
}
}
}
}