diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b48815a6..6ad5d912 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Aftman uses: ok-nick/setup-aftman@v0 - name: Lint @@ -26,8 +26,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: JohnnyMorganz/stylua-action@v2 + - uses: JohnnyMorganz/stylua-action@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - version: v0.17.1 + version: v0.18.2 args: --check ./src diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index b166c00d..0b62337a 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -10,10 +10,10 @@ jobs: name: Build and deploy docs runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: 18 - run: npm i -g moonwave@latest - name: Publish run: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c4c33401..98cd5cb1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Aftman uses: ok-nick/setup-aftman@v0 - name: Publish release to Wally @@ -43,7 +43,8 @@ jobs: remodel run publish.lua - name: Get version id: get_version - run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} + # run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} + run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT - name: Changelog run: python3 last_changelog.py CHANGELOG.md > log.md - name: Release diff --git a/CHANGELOG.md b/CHANGELOG.md index 7989d69f..f6c8ffe3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.5.2 + +- Update dependencies +- Prevent KnitServer from destroying itself in edit mode + ## 1.5.1 - Bugfix for main Knit init file diff --git a/aftman.toml b/aftman.toml index df95cd9f..4ea77326 100644 --- a/aftman.toml +++ b/aftman.toml @@ -1 +1 @@ -tools = { rojo = "rojo-rbx/rojo@7.2.1" , wally = "UpliftGames/wally@0.3.1" , selene = "Kampfkarren/selene@0.25.0" , stylua = "JohnnyMorganz/StyLua@0.17.1" , remodel = "rojo-rbx/remodel@0.11.0" } +tools = { rojo = "rojo-rbx/rojo@7.3.0" , wally = "UpliftGames/wally@0.3.2" , selene = "Kampfkarren/selene@0.25.0" , stylua = "JohnnyMorganz/StyLua@0.18.2" , remodel = "rojo-rbx/remodel@0.11.0" } diff --git a/src/init.lua b/src/init.lua index 5fe1b424..21949163 100644 --- a/src/init.lua +++ b/src/init.lua @@ -4,7 +4,7 @@ if RunService:IsServer() then return require(script.KnitServer) else local KnitServer = script:FindFirstChild("KnitServer") - if KnitServer then + if KnitServer and not RunService:IsEdit() then KnitServer:Destroy() end return require(script.KnitClient) diff --git a/src/wally.toml b/src/wally.toml index 7520cf4b..e0126bb9 100644 --- a/src/wally.toml +++ b/src/wally.toml @@ -1,7 +1,7 @@ [package] name = "sleitnick/knit" description = "Knit is a lightweight game framework" -version = "1.5.1" +version = "1.5.2" license = "MIT" registry = "https://github.com/UpliftGames/wally-index" realm = "shared" diff --git a/src/wally_bundle.toml b/src/wally_bundle.toml index 60dd51fe..8160bad6 100644 --- a/src/wally_bundle.toml +++ b/src/wally_bundle.toml @@ -14,5 +14,5 @@ Signal = "sleitnick/signal@^1" Streamable = "sleitnick/streamable@^1" TableUtil = "sleitnick/table-util@^1" Timer = "sleitnick/timer@^1" -Trove = "sleitnick/trove@^0.5" +Trove = "sleitnick/trove@^1" Promise = "evaera/promise@^4"