diff --git a/package.json b/package.json index aaea52c5c378..49ca6a9e3982 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,18 @@ "check-format": "turbo run check-format", "cspell": "cspell --no-progress .", "format": "turbo run format", + "integration-test": "turbo run integration-test", + "integration-test:browser": "turbo run integration-test:browser", + "integration-test:node": "turbo run integration-test:node", "lint": "turbo run lint", "lint:fix": "turbo run lint:fix", "preinstall": "npx only-allow pnpm", - "purge": "rimraf --glob \"sdk/**/node_modules/\"" + "purge": "rimraf --glob \"sdk/**/node_modules/\"", + "test": "turbo run test", + "unit-test": "turbo run unit-test", + "unit-test:browser": "turbo run unit-test:browser", + "unit-test:node": "turbo run unit-test:node", + "update-snippets": "turbo run update-snippets" }, "devDependencies": { "@vitest/browser": "^2.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 89f863a66748..cdab38d21296 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,6 +60,16 @@ catalogs: vitest: specifier: ^2.1.2 version: 2.0.5 + identity: + '@azure/msal-browser': + specifier: ^3.26.1 + version: 3.26.1 + '@azure/msal-node': + specifier: ^2.15.0 + version: 2.15.0 + '@azure/msal-node-extensions': + specifier: ^1.3.0 + version: 1.3.0 internal: '@azure/eventgrid': specifier: ^5.8.0 @@ -4255,8 +4265,8 @@ importers: specifier: catalog:internal version: 4.5.0 '@azure/msal-node': - specifier: ^2.9.2 - version: 2.13.0 + specifier: catalog:identity + version: 2.15.0 '@types/chai': specifier: catalog:legacy version: 4.3.17 @@ -13044,10 +13054,10 @@ importers: specifier: workspace:* version: link:../../core/logger '@azure/msal-browser': - specifier: ^3.26.1 + specifier: catalog:identity version: 3.26.1 '@azure/msal-node': - specifier: ^2.15.0 + specifier: catalog:identity version: 2.15.0 events: specifier: ^3.0.0 @@ -13174,10 +13184,10 @@ importers: specifier: workspace:* version: link:../identity '@azure/msal-node': - specifier: ^2.15.0 + specifier: catalog:identity version: 2.15.0 '@azure/msal-node-extensions': - specifier: ^1.3.0 + specifier: catalog:identity version: 1.3.0 keytar: specifier: ^7.6.0 @@ -26013,9 +26023,9 @@ importers: '@azure-tools/test-recorder': specifier: workspace:* version: link:../../test-utils/recorder - '@azure-tools/test-utils': + '@azure-tools/test-utils-vitest': specifier: workspace:* - version: link:../../test-utils/test-utils + version: link:../../test-utils/test-utils-vitest '@azure/dev-tool': specifier: workspace:* version: link:../../../common/tools/dev-tool diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 213da933a72f..7ead3129e18d 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -196,3 +196,7 @@ catalogs: '@opentelemetry/sdk-trace-node': ^1.27.0 '@opentelemetry/semantic-conventions': ^1.27.0 '@opentelemetry/winston-transport': ^0.7.0 + identity: + '@azure/msal-browser': ^3.26.1 + '@azure/msal-node': ^2.15.0 + '@azure/msal-node-extensions': ^1.3.0 diff --git a/sdk/communication/communication-identity/package.json b/sdk/communication/communication-identity/package.json index 01684d35a4c1..e9ce54189adf 100644 --- a/sdk/communication/communication-identity/package.json +++ b/sdk/communication/communication-identity/package.json @@ -77,7 +77,7 @@ "@azure/dev-tool": "workspace:*", "@azure/eslint-plugin-azure-sdk": "workspace:*", "@azure/identity": "catalog:internal", - "@azure/msal-node": "^2.9.2", + "@azure/msal-node": "catalog:identity", "@types/chai": "catalog:legacy", "@types/mocha": "catalog:legacy", "@types/node": "catalog:", diff --git a/sdk/identity/identity-broker/package.json b/sdk/identity/identity-broker/package.json index 372513721a0c..b0bdae1fc65a 100644 --- a/sdk/identity/identity-broker/package.json +++ b/sdk/identity/identity-broker/package.json @@ -55,8 +55,8 @@ "dependencies": { "@azure/core-auth": "workspace:*", "@azure/identity": "workspace:*", - "@azure/msal-node": "^2.15.0", - "@azure/msal-node-extensions": "^1.3.0", + "@azure/msal-node": "catalog:identity", + "@azure/msal-node-extensions": "catalog:identity", "tslib": "catalog:" }, "devDependencies": { diff --git a/sdk/identity/identity-cache-persistence/package.json b/sdk/identity/identity-cache-persistence/package.json index 2ebbdca1dc21..f58ad0928f59 100644 --- a/sdk/identity/identity-cache-persistence/package.json +++ b/sdk/identity/identity-cache-persistence/package.json @@ -57,8 +57,8 @@ "dependencies": { "@azure/core-auth": "workspace:*", "@azure/identity": "workspace:*", - "@azure/msal-node": "^2.15.0", - "@azure/msal-node-extensions": "^1.3.0", + "@azure/msal-node": "catalog:identity", + "@azure/msal-node-extensions": "catalog:identity", "keytar": "^7.6.0", "tslib": "catalog:" }, diff --git a/sdk/identity/identity/package.json b/sdk/identity/identity/package.json index 400aa44369b3..89e2fc3b8896 100644 --- a/sdk/identity/identity/package.json +++ b/sdk/identity/identity/package.json @@ -92,8 +92,8 @@ "@azure/core-tracing": "workspace:*", "@azure/core-util": "workspace:*", "@azure/logger": "workspace:*", - "@azure/msal-browser": "^3.26.1", - "@azure/msal-node": "^2.15.0", + "@azure/msal-browser": "catalog:identity", + "@azure/msal-node": "catalog:identity", "events": "^3.0.0", "jws": "^4.0.0", "open": "^8.0.0", diff --git a/turbo.json b/turbo.json index 0b0a8349b739..4ea6ed42889d 100644 --- a/turbo.json +++ b/turbo.json @@ -6,20 +6,27 @@ "dependsOn": ["^build"], "outputs": ["dist/**", "dist-esm/**", "dist-test/**", "types/**"] }, + "check-format": { + "dependsOn": ["^check-format"], + "cache": false + }, "clean": { "dependsOn": ["^clean"], "cache": false }, - "test": { - "dependsOn": ["^build"] - }, "format": { - "dependsOn": ["^format"] - }, - "check-format": { - "dependsOn": ["^check-format"], + "dependsOn": ["^format"], "cache": false }, + "integration-test": { + "dependsOn": ["^integration-test"] + }, + "integration-test:browser": { + "dependsOn": ["^integration-test:browser"] + }, + "integration-test:node": { + "dependsOn": ["^integration-test:node"] + }, "lint": { "dependsOn": ["^lint"], "cache": false @@ -28,6 +35,22 @@ "dependsOn": ["^lint:fix"], "cache": false }, + "test": { + "dependsOn": ["^test"] + }, + "unit-test": { + "dependsOn": ["^unit-test"] + }, + "unit-test:browser": { + "dependsOn": ["^unit-test:browser"] + }, + "unit-test:node": { + "dependsOn": ["^unit-test:node"] + }, + "update-snippets": { + "dependsOn": ["^update-snippets"], + "cache": false + }, "dev": { "cache": true, "persistent": true