Skip to content

Commit 4ac77d4

Browse files
authored
Merge branch 'dev' into user/louisv/external_load_refresh_tokens
2 parents 9c8bce5 + fe12dee commit 4ac77d4

29 files changed

Lines changed: 215 additions & 1462 deletions

.github/workflows/build-test-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
pull_request:
99
paths:
1010
- 'lib/**/*'
11+
- 'extensions/msal-node-extensions/**/*'
1112
- '!**.md'
1213
- '.github/workflows/build-test-pr.yml'
1314

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "Make popup poll interval configurable #5276",
4+
"packageName": "@azure/msal-browser",
5+
"email": "hemoral@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fixed broken homeAccountId check in CacheManager #5246",
4+
"packageName": "@azure/msal-common",
5+
"email": "rginsburg@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Migrate from nan to node-api #5280",
4+
"packageName": "@azure/msal-node-extensions",
5+
"email": "thomas.norling@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

extensions/msal-node-extensions/binding.gyp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,23 @@
22
"targets": [
33
{
44
'target_name': 'dpapi',
5+
'cflags!': [ '-fno-exceptions' ],
6+
'cflags_cc!': [ '-fno-exceptions' ],
7+
'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
8+
'CLANG_CXX_LIBRARY': 'libc++',
9+
'MACOSX_DEPLOYMENT_TARGET': '10.7',
10+
},
11+
'msvs_settings': {
12+
'VCCLCompilerTool': { 'ExceptionHandling': 1 },
13+
},
514
'version': '0.1.0',
615
'sources': [
716
'src/dpapi-addon/main.cpp',
817
'src/dpapi-addon/dpapi_addon.h'
918
],
1019
'include_dirs': [
11-
"<!(node -e \"require('nan')\")",
20+
'<!(node -p "require(\'node-addon-api\').include_dir")',
21+
1222
"include"
1323
],
1424
'conditions': [

0 commit comments

Comments
 (0)