Merge pull request #1565 from hydephp/2.x-dev

HydePHP v2.x Development

Author: emmadesilva

.github/workflows/compile-typescript.yml

@@ -0,0 +1,48 @@
+name: Compile TypeScript
+
+on:
+  push:
+    paths:
+      - 'packages/**/src/**/*.ts'
+
+jobs:
+  compile:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Needed for the git commit step
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: |
+          npm ci
+          cd packages/vite-plugin && npm ci
+          cd ../..
+
+      - name: Compile TypeScript
+        run: |
+          cd packages/vite-plugin
+          npm run build
+          cd ../..
+
+      - name: Check for changes
+        id: check_changes
+        run: |
+          git diff --exit-code --quiet packages/vite-plugin/dist || echo "changes=true" >> $GITHUB_OUTPUT
+
+      - name: Commit changes
+        if: steps.check_changes.outputs.changes == 'true'
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git add packages/vite-plugin/dist
+          git commit -m "Compile TypeScript"
+          git push

.github/workflows/continuous-integration.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
           extensions: fileinfo
 
       - uses: actions/checkout@v4
@@ -74,7 +74,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        php: [8.1, 8.2, 8.3]
+        php: [8.2, 8.3, 8.4]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -109,41 +109,6 @@ jobs:
         run: php monorepo/scripts/tests/${{ matrix.script }}.php
 
 
-  build-hydefront-assets:
-
-    runs-on: ubuntu-latest
-    needs: run-smoke-tests
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          cache: 'npm'
-
-      - name: Install Node.js dependencies
-        working-directory: 'packages/hydefront'
-        run: npm ci
-
-      - name: Build assets for production
-        working-directory: 'packages/hydefront'
-        run: npm run prod
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: 'hydefront'
-          path: 'packages/hydefront/dist'
-
-      - name: Commit changes
-        uses: EndBug/add-and-commit@v9
-        with:
-          add: 'packages/hydefront/dist'
-          message: 'Compile HydeFront assets for production'
-          new_branch: compile-hydefront
-
-
   build-tailwindcss:
 
     runs-on: ubuntu-latest
@@ -164,7 +129,7 @@ jobs:
         run: sed -i 's/\.\/vendor\/hyde\/framework\/resources\/views\/\*\*\/\*\.blade\.php/\.\/packages\/framework\/resources\/views\/\*\*\/\*\.blade\.php/' tailwind.config.js
 
       - name: Build assets for production
-        run: npm run prod
+        run: npm run build
 
       - name: Copy compiled app.css file to HydeFront dist folder
         run: cp _media/app.css packages/hydefront/dist/app.css
@@ -196,7 +161,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
           coverage: xdebug
           extensions: fileinfo
       - uses: actions/checkout@v4
@@ -290,7 +255,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
 
       - name: Cache Composer packages
         id: composer-cache
@@ -332,7 +297,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
 
       - name: Cache Composer packages
         id: composer-cache
@@ -377,7 +342,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
 
       - name: Cache Composer packages
         id: composer-cache
@@ -544,7 +509,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
       - uses: actions/checkout@v4
 
       - name: Download static analysis tools
@@ -564,7 +529,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
       - uses: actions/checkout@v4
 
       - name: Install Composer Dependencies
@@ -582,7 +547,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
       - uses: actions/checkout@v4
 
       - name: Install Composer Dependencies

.github/workflows/coverage-tests.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
           coverage: xdebug
           extensions: fileinfo
       - uses: actions/checkout@v4

.github/workflows/end-to-end-tests.yml

@@ -33,7 +33,7 @@ jobs:
         run: vendor/bin/pest --stop-on-failure
 
       - name: Prepare the Environment
-        run: echo -e "APP_URL=http://localhost:8080 \nDUSK_ENABLED=true\nSERVER_DASHBOARD=false" > .env
+        run: echo -e "APP_URL=http://localhost:8080 \nDUSK_ENABLED=true\nSERVER_DASHBOARD=false\nSERVER_SAVE_PREVIEW=true" > .env
 
       - name: Upgrade Chrome Driver
         run: php hyde dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`

.github/workflows/matrix-tests.yml

@@ -2,7 +2,7 @@ name: Matrix Tests
 
 on:
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "2.x-dev" ]
     paths:
       - 'app/**'
       - 'packages/**'
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        php: [8.1, 8.2, 8.3]
+        php: [8.2, 8.3, 8.4]
     runs-on: ${{ matrix.os }}
 
     steps:

.github/workflows/split-monorepo.yml

@@ -390,3 +390,53 @@ jobs:
           git commit --author="$COMMIT_AUTHOR_NAME <$COMMIT_AUTHOR_EMAIL>" -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
 
           git push upstream master
+
+  vite-plugin:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    environment:
+      name: hydephp/vite-plugin
+      url: https://github.com/hydephp/vite-plugin/tree/master
+
+    steps:
+      - name: Checkout hydephp/develop
+        uses: actions/checkout@v4
+        with:
+          path: develop
+          persist-credentials: false
+
+      - name: Checkout hydephp/vite-plugin
+        uses: actions/checkout@v4
+        with:
+          repository: hydephp/vite-plugin
+          path: vite-plugin
+          ref: master
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Empty the destination directory
+        run: rm -rf vite-plugin/*
+
+      - name: Copy over files
+        run: cp -rf develop/packages/vite-plugin/. vite-plugin -v
+
+      - name: Commit and push changes
+        env:
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+          COMMIT_AUTHOR_NAME: ${{ github.event.head_commit.author.name }}
+          COMMIT_AUTHOR_EMAIL: ${{ github.event.head_commit.author.email }}
+        run: |
+          cd vite-plugin
+          if ! [[ `git status --porcelain` ]]; then
+            echo "No changes to this package. Exiting gracefully.";
+            exit 0;
+          fi
+
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git remote add upstream https://oauth2:${{ secrets.SPLIT_MONOREPO_TOKEN }}@github.com/hydephp/vite-plugin.git
+
+          git add .
+          git commit --author="$COMMIT_AUTHOR_NAME <$COMMIT_AUTHOR_EMAIL>" -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
+
+          git push upstream master

.github/workflows/static-analysis.yml

@@ -2,7 +2,7 @@ name: 🔎 Static Analysis
 
 on:
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "2.x-dev" ]
 
 jobs: