merge

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: 'project-error'
+ko_fi: 'projecterror'
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -9,9 +9,9 @@ body:
     value: |
       Please fill out this short template to the best of your ability.
 - type: dropdown
-  id: developement-issue
+  id: development-issue
   attributes:
-    label: Developement Issue
+    label: Development Issue
     description: Is this issue related to the phone still being in development?
     options:
       - "Yes"

.github/actions/bump-manifest-version.js

@@ -0,0 +1,9 @@
+const fs = require('fs')
+
+const newVersion = process.env.TGT_RELEASE_VERSION
+
+const manifestFile = fs.readFileSync('fxmanifest.lua', {encoding: 'utf8'})
+
+const newFileContent = manifestFile.replace(/\bversion+(.*)$/gm, `version("${newVersion}")`)
+
+fs.writeFileSync('fxmanifest.lua', newFileContent) 

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/apps/phone"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/apps/game"
+    schedule:
+      interval: "weekly"

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - Dependency
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/ci.yml

@@ -3,64 +3,34 @@ name: Test Suite
 on: [push, pull_request]
 
 jobs:
-  nui_preformatting_tests:
-    name: Tests for NUI
+  nui__and_game_scripts:
+    name: Tests for NUI and Game scripts
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: phone
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v2
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2.2.2
         with:
-          node-version: '16.x'
-          cache: 'yarn'
-      - name: Install dependencies NUI
-        run: yarn --frozen-lockfile
-      - name: Run Enzyme Tests
-        run: yarn test
-      - name: Check build status
-        run: yarn build
-        env:
-          CI: true
+          version: latest
 
-  game_scripts_test:
-    name: Tests for Game Scripts
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: resources
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16.x'
-          cache: 'yarn'
-      - name: Install dependencies NUI
-        run: yarn --frozen-lockfile
-      - name: Run Jest Tests
-        run: yarn test
+      - name: Install dependencis
+        run: pnpm i --frozen-lockfile
       - name: Check build status
-        run: yarn build
+        run: pnpm build
         env:
           CI: true
 
-
   lint:
     name: Lint Lua scripts
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: resources
+        working-directory: apps/game 
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Lint
-        uses: GoatG33k/fivem-lua-lint-action@v1
+        uses: GoatG33k/fivem-lua-lint-action@v1

.github/workflows/nightly.yml

@@ -0,0 +1,121 @@
+name: Nightly release
+
+permissions:
+  id-token: write
+  contents: write
+  actions: write
+  deployments: write
+  pull-requests: read
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  bump_manifest:
+    name: Bump manifest version
+    runs-on: ubuntu-latest
+    outputs:
+      release_tag: ${{ steps.get_tag.outputs.release_tag }}
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get tag
+        uses: project-error/[email protected]
+        with:
+          environment: "dev"
+          prerelease: true
+        id: get_tag
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+      - name: Bump manifest version
+        run: node .github/actions/bump-manifest-version.js
+        env:
+          TGT_RELEASE_VERSION: ${{ steps.get_tag.outputs.release_tag }}
+
+      - name: Push manifest change
+        uses: EndBug/add-and-commit@v8
+        id: commit_manifest
+        with:
+          add: fxmanifest.lua
+          push: true
+          author_name: Manifest Bumper
+          author_email: 41898282+github-actions[bot]@users.noreply.github.com
+          message: "chore: bump manifest version to nightly ${{ steps.get_tag.outputs.release_tag }}"
+
+  create-nightly-release:
+    name: Create Nightly release
+    runs-on: ubuntu-latest
+    needs: [bump_manifest]
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install pnpm
+        uses: pnpm/[email protected]
+        with:
+          version: 7.29.1
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.x
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm i --frozen-lockfile
+
+      - name: Run build
+        run: REACT_APP_VERSION=${{ needs.bump_manifest.outputs.release_tag }} pnpm build
+
+      #- name: Create Sentry Release (NPWD)
+      #  run: |
+      #    curl -sL https://sentry.io/get-cli/ | bash
+      #    export SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
+      #    export SENTRY_ORG=project-error
+      #    export SENTRY_PROJECT=npwd
+      #    export SENTRY_URL=https://sentry.projecterror.dev/
+      #    export VERSION=${{ steps.get_tag.outputs.VERSION_TAG }}
+
+      #    sentry-cli releases new "$VERSION"
+      #    sentry-cli releases set-commits "$VERSION" --auto
+      #    sentry-cli releases files "$VERSION" upload-sourcemaps resources/html --ext map --url-prefix '~/resources/html'
+      #    sentry-cli releases finalize "$VERSION"
+
+      #    sentry-cli releases deploys "$VERSION" new -e production
+      - name: Bundle built files
+        run: |
+          mkdir -p ./temp/npwd/dist
+          cp ./{LICENSE,README.md,config.json,import.sql,fxmanifest.lua} ./temp/npwd/
+          cp -r ./dist/{game,html} ./temp/npwd/dist
+          cd ./temp && zip -r ../npwd.zip ./npwd
+
+      - name: Create Release
+        uses: "project-error/[email protected]"
+        id: auto_release
+        with:
+          environment: "dev"
+          title: NPWD Nightly ${{ needs.bump_manifest.outputs.release_tag }}
+          prerelease: true
+          automatic_release_tag: ${{ needs.bump_manifest.outputs.release_tag }}
+          files: npwd.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload artifacts
+        run: |
+          curl -L \
+          -X POST \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          -H "Content-Type: application/octet-stream" \
+          "https://uploads.github.com/repos/project-error/npwd/releases/${{ steps.auto_release.outputs.release_id }}/assets?name=npwd.zip" \
+          --data-binary "@npwd.zip"