Skip to content

Commit 242bce1

Browse files
authored
Merge pull request #5452 from KelvinTegelaar/dev
Dev to hotfix
2 parents 2875b2b + 3b55cb3 commit 242bce1

25 files changed

+705
-258
lines changed

.github/workflows/Check_for_Version_Update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-slim
1212
steps:
1313
- name: Check for Changed Files
14-
uses: brettcannon/check-for-changed-files@v1.1.0
14+
uses: brettcannon/check-for-changed-files@v1.2.1
1515
with:
1616
file-pattern: public/version.json
1717
failure-message: "You have not updated version.json. This is a required file to update at each PR. Please sync your latest changes and update the version number."

.github/workflows/Close_Stale_Issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
if: github.repository_owner == 'KelvinTegelaar'
99
runs-on: ubuntu-slim
1010
steps:
11-
- uses: actions/stale@v4
11+
- uses: actions/stale@v10
1212
with:
1313
stale-issue-message: "This issue is stale because it has been open 10 days with no activity. We will close this issue soon. If you want this feature implemented you can contribute it. See: https://docs.cipp.app/dev-documentation/contributing-to-the-code . Please notify the team if you are working on this yourself."
1414
close-issue-message: "This issue was closed because it has been stalled for 14 days with no activity."

.github/workflows/Label_Issues.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
issues: write
1313
steps:
1414
- name: Label Issues
15-
uses: andymckay/labeler@5c59dabdfd4dd5bd9c6e6d255b01b9d764af4414
15+
uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90
1616
with:
1717
add-labels: "not-assigned"
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -23,7 +23,7 @@ jobs:
2323
issues: write
2424
steps:
2525
- name: Label Issues
26-
uses: andymckay/labeler@5c59dabdfd4dd5bd9c6e6d255b01b9d764af4414
26+
uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90
2727
with:
2828
add-labels: "enhancement, not-assigned"
2929
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Node_Project_Check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v6
2222
- name: Use Node.js ${{ matrix.node-version }}
23-
uses: actions/setup-node@v6
23+
uses: actions/setup-node@v6.2.0
2424
with:
2525
node-version: ${{ matrix.node-version }}
2626
- name: Install and Build Test

.github/workflows/cipp_dev_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
# Checkout the repository
1717
- name: Checkout Code
18-
uses: actions/checkout@v4.2.2
18+
uses: actions/checkout@v6
1919

2020
# Set up Node.js
2121
- name: Get Node version
@@ -26,7 +26,7 @@ jobs:
2626
echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT
2727
2828
- name: Set up Node.js
29-
uses: actions/setup-node@v4.2.0
29+
uses: actions/setup-node@v6.2.0
3030
with:
3131
node-version: ${{ steps.get_node_version.outputs.node_version }}
3232

.github/workflows/cipp_frontend_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
# Checkout the repository
1717
- name: Checkout Code
18-
uses: actions/checkout@v4.2.2
18+
uses: actions/checkout@v6
1919

2020
# Set up Node.js
2121
- name: Get Node version
@@ -26,7 +26,7 @@ jobs:
2626
echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT
2727
2828
- name: Set up Node.js
29-
uses: actions/setup-node@v4.2.0
29+
uses: actions/setup-node@v6.2.0
3030
with:
3131
node-version: ${{ steps.get_node_version.outputs.node_version }}
3232

.github/workflows/dev_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
name: Build and Deploy Job
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
with:
1616
submodules: true
1717
- name: Build And Deploy

Tools/Start-CippDevEmulators.ps1

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
1+
Write-Host 'Starting CIPP Dev Emulators' -ForegroundColor Cyan
2+
3+
# Verify Windows Terminal is available
14
Get-Command wt -ErrorAction Stop | Out-Null
5+
6+
# Stop any existing node processes
27
Get-Process node -ErrorAction SilentlyContinue | Stop-Process -ErrorAction SilentlyContinue
8+
9+
# Get paths
310
$Path = (Get-Item $PSScriptRoot).Parent.Parent.FullName
4-
Write-Host "CIPP Dev Emulators starting in $Path" -ForegroundColor Green
511

6-
pwsh -file (Join-Path $PSScriptRoot 'Start-CippDevInstallation.ps1')
12+
# Run installation script to ensure dependencies are installed and updated before starting emulators
13+
pwsh -File (Join-Path $PSScriptRoot 'Start-CippDevInstallation.ps1')
14+
$ApiPath = Join-Path -Path $Path -ChildPath 'CIPP-API'
15+
$FrontendPath = Join-Path -Path $Path -ChildPath 'CIPP'
716

8-
Write-Host 'Starting CIPP Dev Emulators'
17+
Write-Host 'Starting emulators...' -ForegroundColor Cyan
918

10-
if (Test-Path (Join-Path $Path 'CIPP-API-Processor')) {
11-
$Process = Read-Host -Prompt 'Start Process Function (y/N)?'
12-
}
19+
# Build commands with error handling
20+
$azuriteCommand = 'try { azurite } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
21+
$apiCommand = 'try { func start } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
22+
$frontendCommand = 'try { npm run dev } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
23+
$swaCommand = 'try { npm run start-swa } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
1324

14-
if ($Process -eq 'y') {
15-
wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run dev`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa`; new-tab --title 'CIPP-API-Processor' -d $Path\CIPP-API-Processor pwsh -c func start --port 7072
16-
} else {
17-
wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run dev`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa
18-
}
25+
# Start Windows Terminal with all tabs
26+
wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c $azuriteCommand`; new-tab --title 'FunctionApp' -d $ApiPath pwsh -c $apiCommand`; new-tab --title 'CIPP Frontend' -d $FrontendPath pwsh -c $frontendCommand`; new-tab --title 'SWA' -d $FrontendPath pwsh -c $swaCommand

Tools/Start-CippDevInstallation.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ if (-not(yarn global list | Select-String -Pattern 'next')) {
2929
yarn global add 'next'
3030
}
3131

32-
yarn install --cwd (Join-Path $Path "CIPP") --network-timeout 500000
32+
Write-Host 'Running yarn install for CIPP frontend...' -ForegroundColor Cyan
33+
yarn install --cwd (Join-Path $Path 'CIPP') --network-timeout 500000

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cipp",
3-
"version": "10.1.0",
3+
"version": "10.1.1",
44
"author": "CIPP Contributors",
55
"homepage": "https://cipp.app/",
66
"bugs": {
@@ -34,7 +34,7 @@
3434
"@mui/lab": "7.0.0-beta.17",
3535
"@mui/material": "7.3.7",
3636
"@mui/system": "7.3.2",
37-
"@mui/x-date-pickers": "^8.27.0",
37+
"@mui/x-date-pickers": "^8.27.2",
3838
"@musement/iso-duration": "^1.0.0",
3939
"@nivo/core": "^0.99.0",
4040
"@nivo/sankey": "^0.99.0",
@@ -71,7 +71,7 @@
7171
"lodash.isequal": "4.5.0",
7272
"material-react-table": "^3.0.1",
7373
"monaco-editor": "^0.55.1",
74-
"mui-tiptap": "^1.14.0",
74+
"mui-tiptap": "^1.29.0",
7575
"next": "^16.1.6",
7676
"nprogress": "0.2.0",
7777
"numeral": "2.0.6",
@@ -88,7 +88,7 @@
8888
"react-hook-form": "^7.71.1",
8989
"react-hot-toast": "2.6.0",
9090
"react-html-parser": "^2.0.2",
91-
"react-i18next": "15.7.3",
91+
"react-i18next": "16.2.4",
9292
"react-leaflet": "5.0.0",
9393
"react-leaflet-markercluster": "^5.0.0-rc.0",
9494
"react-markdown": "10.1.0",
@@ -98,9 +98,9 @@
9898
"react-redux": "9.2.0",
9999
"react-syntax-highlighter": "^16.1.0",
100100
"react-time-ago": "^7.3.3",
101-
"react-virtuoso": "^4.12.8",
101+
"react-virtuoso": "^4.18.1",
102102
"react-window": "^2.2.5",
103-
"recharts": "^3.6.0",
103+
"recharts": "^3.7.0",
104104
"redux": "5.0.1",
105105
"redux-devtools-extension": "2.13.9",
106106
"redux-persist": "^6.0.0",

0 commit comments

Comments
 (0)