Merge pull request #1144 from Lan2Play/dev

fix idehelper generation, update idehelper files, npm path and dependency updates

Author: Apfelwurm

.github/workflows/generate_idehelper.yml

@@ -60,3 +60,45 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 
+      - name: Check for existing PR
+        if: env.has_changes == 'true'
+        id: check_pr
+        run: |
+          PR_NUMBER=$(gh pr list --base dev --state open --search "Auto-generated IDE helper update" --json number --jq '.[0].number' || echo "")
+          if [[ -n "$PR_NUMBER" ]]; then
+            echo "Existing PR found: #$PR_NUMBER"
+            echo "pr_number=$PR_NUMBER" >> $GITHUB_ENV
+          else
+            echo "No existing PR found."
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Close existing PR (if found)
+        if: env.pr_number != ''
+        run: |
+          gh pr close ${{ env.pr_number }} --delete-branch
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Pull Request (always create a new PR)
+        if: env.has_changes == 'true'
+        run: |
+          gh pr create \
+            --base dev \
+            --head ${{ env.branch_name }} \
+            --title "Auto-generated IDE helper update" \
+            --body "This PR updates the IDE helper files automatically."
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Clean up old branches
+        run: |
+          for branch in $(git ls-remote --heads origin "maint/update-ide-helper-*" | awk '{print $2}' | sed 's#refs/heads/##'); do
+            if [[ "$branch" != "$branch_name" ]]; then
+              echo "Deleting old branch: $branch"
+              git push origin --delete "$branch"
+            fi
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -315,96 +315,96 @@ composer-add-dep-dev:
 # Install JS Dependencies via NPM
 npm-install:
 	docker run --rm --name js-maintainence --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
     --user 82:82 \
 	node:22.9 /bin/bash -ci "npm install --no-audit && npm run production"
 
 # Install PRD JS Dependencies via NPM locally
 npm-install-local:
 	docker run --rm --name js-maintainence-dev --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
 	$(user) \
 	node:22.9 /bin/bash -ci "npm install --no-audit && npm run production"
 
 # Install JS Dependencies via NPM
 npm-install-gh:
 	docker run --rm --name js-maintainence --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
     --user 0 \
 	node:22.9 /bin/bash -ci "npm install --no-audit && npm run production && chown -R $(userId):$(groupId) /usr/src/app"
 
 # Install Dev JS Dependencies via NPM
 npm-install-dev:
 	docker run --rm --name js-maintainence-dev --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
 	$(user) \
 	node:22.9 /bin/bash -ci "npm install --no-audit && npm run dev"
 
 #list npm package - usage make npm-ls module=module
 npm-ls:
 	docker run --rm --name js-maintainence-list --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
 	$(user) \
 	node:22.9 /bin/bash -ci "npm ls $(module)"
 
 #update npm packages - usage make npm-update
 npm-update:
 	docker run --rm --name js-maintainence-list --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
 	$(user) \
 	node:22.9 /bin/bash -ci "npm update"
 
 #audit npm packages - usage make npm-audit
 npm-audit:
 	docker run --rm --name js-maintainence-list --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
 	$(user) \
 	node:22.9 /bin/bash -ci "npm audit"
 
 #audit fix npm packages - usage make npm-audit-fix
 npm-audit-fix:
 	docker run --rm --name js-maintainence-list --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
 	$(user) \
 	node:22.9 /bin/bash -ci "npm audit fix"
 
 
 #list outdated npm packages
 npm-outdated:
 	docker run --rm --name js-maintainence-outdated --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
 	$(user) \
 	node:22.9 /bin/bash -ci "npm outdated"
 
 #rebuild node
 npm-rebuild:
 	docker run --rm --name js-maintainence-outdated --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
 	$(user) \
 	node:22.9 /bin/bash -ci "npm rebuild"
 
 # npm mix Runner
 mix:
 	docker run --rm --name js-maintainence-dev --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
     --user 82:82 \
 	node:22.9 /bin/bash -ci "npm run production"
 
 mix-dev:
 	docker run --rm --name js-maintainence-dev --interactive \
-	-v $(currentDir)/src:/usr/src/app \
-	-w /usr/src/app \
+	-v $(currentDir)/src:/usr/src \
+	-w /usr/src \
 	$(user) \
 	node:22.9 /bin/bash -ci "npm run development"