Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update E2E dependencies #7293

Draft
wants to merge 13 commits into
base: dev
Choose a base branch
from
Draft

Update E2E dependencies #7293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7461d54
Update react across samples and msal-react
hectormmg Sep 5, 2024
b2e7184
Update package-lock
hectormmg Sep 5, 2024
2973113
Change files
hectormmg Sep 5, 2024
4d00377
Merge branch 'dev' into clean-dependencies
hectormmg Sep 5, 2024
5713484
Update package-lock
hectormmg Sep 5, 2024
c418f78
Merge branch 'clean-dependencies' of https://github.com/AzureAD/micro…
hectormmg Sep 5, 2024
cb4a366
Update package-lock and 1p build yml
hectormmg Sep 5, 2024
4161163
Update package-lock
hectormmg Sep 7, 2024
4dc586c
Merge branch 'dev' into clean-dependencies
hectormmg Sep 20, 2024
fd6ab57
Merge branch 'dev' into clean-dependencies
hectormmg Sep 20, 2024
d270202
Merge branch 'dev' into clean-dependencies
hectormmg Sep 23, 2024
a4a4f54
Update lockfile
hectormmg Sep 23, 2024
5d4cb44
Merge branch 'dev' into clean-dependencies
hectormmg Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pipelines/1p-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ resources:
- repository: 1P
type: git
name: IDDP/msal-javascript-1p
ref: master
ref: clean-dependencies

extends:
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
Expand Down
7 changes: 7 additions & 0 deletions change/@azure-msal-react-75993c34-365d-4e2c-9eed-689b77fbbada.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Update react peer depedency version",
"packageName": "@azure/msal-react",
"email": "[email protected]",
"dependentChangeType": "none"
}
6 changes: 3 additions & 3 deletions lib/msal-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@
"@testing-library/react": "^13.4.0",
"@types/jest": "^29.5.0",
"@types/node": "^20.5.1",
"@types/react": "^18.2.13",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.2.6",
"eslint-config-msal": "file:../../shared-configs/eslint-config-msal",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"prettier": "2.8.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"rollup": "^4.9.6",
"ts-jest": "^29.1.0",
"ts-jest-resolver": "^2.0.1",
Expand Down
18,934 changes: 14,592 additions & 4,342 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions samples/msal-node-samples/ElectronSystemBrowserTestApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@electron/asar": "^3.2.3",
"@playwright/test": "^1.31.1",
"@types/jest": "^29.5.0",
"@types/react": "^18.0.28",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.0.11",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
Expand Down Expand Up @@ -60,10 +60,10 @@
"axios": "^1.7.4",
"bootstrap": "^5.2.3",
"electron-squirrel-startup": "^1.0.0",
"react": "^18.2.0",
"react-bootstrap": "^2.7.2",
"react-dom": "^18.2.0",
"react-router-dom": "^6.9.0"
"react": "^18.3.1",
"react-bootstrap": "^2.10.4",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.1"
},
"config": {
"forge": {
Expand Down
8 changes: 4 additions & 4 deletions samples/msal-react-samples/b2c-sample/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"@emotion/styled": "^11.9.3",
"@mui/icons-material": "^5.8.4",
"@mui/material": "^5.9.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.7.0"
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.1"
},
"devDependencies": {
"@azure/msal-common": "^14.7.0",
Expand All @@ -20,7 +20,7 @@
"e2e-test-utils": "file:../../e2eTestUtils",
"jest": "^29.5.0",
"jest-junit": "^16.0.0",
"react-scripts": "5.0.1",
"react-scripts": "^5.0.1",
"ts-jest": "^29.1.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions samples/msal-react-samples/nextjs-sample/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@mui/icons-material": "^5.10.14",
"@mui/material": "^5.10.14",
"next": "^14.2.10",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@azure/msal-common": "^14.7.0",
Expand Down
6 changes: 3 additions & 3 deletions samples/msal-react-samples/react-router-sample/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"@emotion/styled": "^11.10.5",
"@mui/icons-material": "^5.10.16",
"@mui/material": "^5.10.17",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.7.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.1",
"react-scripts": "^5.0.1"
},
"scripts": {
Expand Down
12 changes: 6 additions & 6 deletions samples/msal-react-samples/typescript-sample/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"@mui/icons-material": "^5.10.16",
"@mui/material": "^5.10.17",
"@types/node": "^16.18.10",
"@types/react": "^18.0.26",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.0.9",
"@types/react-router-dom": "^5.1.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.7.0",
"react-scripts": "5.0.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.1",
"react-scripts": "^5.0.1",
"typescript": "^4.9.4"
},
"scripts": {
Expand Down Expand Up @@ -51,5 +51,5 @@
"suiteNameTemplate": "TypeScript Sample Tests",
"outputDirectory": ".",
"outputName": "test-results.xml"
}
}
}
Loading