diff --git a/AISKU/package.json b/AISKU/package.json index ba4e4bb64..b912327d7 100644 --- a/AISKU/package.json +++ b/AISKU/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-web", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights JavaScript SDK - Web", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -65,12 +65,15 @@ "dependencies": { "@microsoft/dynamicproto-js": "^1.1.4", "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-analytics-js": "2.6.5", - "@microsoft/applicationinsights-channel-js": "2.6.5", - "@microsoft/applicationinsights-common": "2.6.5", - "@microsoft/applicationinsights-core-js": "2.6.5", - "@microsoft/applicationinsights-dependencies-js": "2.6.5", - "@microsoft/applicationinsights-properties-js": "2.6.5" + "@microsoft/applicationinsights-analytics-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-channel-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-common": "2.7.0-beta.1", + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-dependencies-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-properties-js": "2.7.0-beta.1" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/AISKU/scripts/listCdnVersions.ps1 b/AISKU/scripts/listCdnVersions.ps1 index ca04437ee..7d5a04e89 100644 --- a/AISKU/scripts/listCdnVersions.ps1 +++ b/AISKU/scripts/listCdnVersions.ps1 @@ -379,7 +379,7 @@ Function ValidateAccess Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType @@ -574,7 +574,7 @@ Function ListVersions( if ($paths.ContainsKey($thePath) -ne $true) { $paths[$thePath] = 1 - $value = "{0,-28}" -f $thePath + $value = "{0,-35}" -f $thePath $pathList = "$pathList$value " } else { $paths[$thePath] = ($paths[$thePath] + 1) @@ -582,12 +582,12 @@ Function ListVersions( } foreach ($thePath in $paths.Keys | Sort-Object) { - Log $(" - {1,-48} ({0})" -f $paths[$thePath],$thePath) + Log $(" - {1,-55} ({0})" -f $paths[$thePath],$thePath) } - #Log $("v{0,-8} ({1,2}) - {2}" -f $key,$($fileList.Count),$pathList.Trim()) + Log $("v{0,-16} ({1,2}) - {2}" -f $key,$($fileList.Count),$pathList.Trim()) } else { - Log $("v{0,-12} ({1,2})" -f $key,$($fileList.Count)) + Log $("v{0,-16} ({1,2})" -f $key,$($fileList.Count)) foreach ($theBlob in $fileList) { $blob = $theBlob.blob $blob.ICloudBlob.FetchAttributes() @@ -614,7 +614,7 @@ Function ListVersions( $cacheControl = $cacheControl -replace "immutable","im" $cacheControl = $cacheControl -replace ", "," " - Log $(" - {0,-48}{3,-13}{1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss} {4,10} {5}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified,$sdkVersion,$cacheControl,$metaTags) + Log $(" - {0,-55}{3,-16}{1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss} {4,10} {5}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified,$sdkVersion,$cacheControl,$metaTags) } } } diff --git a/AISKU/scripts/publishReleaseToCdn.ps1 b/AISKU/scripts/publishReleaseToCdn.ps1 index 32107a455..0571e7ee8 100644 --- a/AISKU/scripts/publishReleaseToCdn.ps1 +++ b/AISKU/scripts/publishReleaseToCdn.ps1 @@ -305,7 +305,7 @@ Function GetReleaseFiles Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType diff --git a/AISKU/scripts/setActiveCdnVersion.ps1 b/AISKU/scripts/setActiveCdnVersion.ps1 index 5ec5bfe11..7c2e626e9 100644 --- a/AISKU/scripts/setActiveCdnVersion.ps1 +++ b/AISKU/scripts/setActiveCdnVersion.ps1 @@ -377,10 +377,36 @@ Function ValidateAccess } } +Function Get-VersionDetails ( + [string] $ver +) { + [hashtable] $version = @{} + $version.full = $ver + + $parts = $ver -split "\+", 2 + if ($parts.Length -eq 2) { + $version.bldNum = $parts[1] + $ver = $parts[0] + } else { + $version.bldNum = "" + } + + $parts = $ver -split "-", 2 + $version.ver = $parts[0] + if ($parts.Length -eq 2) { + $version.preRel = $parts[1] + $version.type = ((($parts[1] -split "\+")[0] -split "\.")[0] -split "-")[0] + } else { + $version.preRel = "" + $version.type = "release" + } + + return $version; +} Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType @@ -604,7 +630,8 @@ Function SetProperties( Function SetActiveVersion( [system.collections.generic.list[hashtable]] $fileList, - [string] $storePath + [string] $storePath, + [string] $container ) { $destContext = GetContainerContext $storePath @@ -617,31 +644,42 @@ Function SetActiveVersion( foreach ($theBlob in $fileList) { $blob = $theBlob.blob $blobContext = $theBlob.context.azureContext - Log $("Copying: {0,-40} {1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified) + Log $("Copying: {0,-55} {1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified) $version = GetVersion $blob.Name if ($null -ne $version) { - $verParts = $version.ver.Split(".") + $verDetails = Get-VersionDetails $version.ver + $verParts = $verDetails.ver.Split(".") if ($verParts.Length -ne 3) { - Log-Failure "ScriptError: Invalid Version! [$activeVersion]" + Write-LogFailure "ScriptError: Invalid Version! [$activeVersion]" + } + + $preRel = "" + if ($verDetails.type -ne "release") { + $preRel = "-" + $verDetails.type + + if ($verDetails.type -eq $container) { + # remove any "beta" tag when deploying to the beta container etc. + $preRel = "" + } } # Don't try and publish anything if any errors have been logged if ($global:hasErrors -eq $true) { exit 2 } - - $stageName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($version.ext).stage" + + $stageName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($preRel)$($version.ext).stage" CopyBlob $blobContext $blob $destContext $stageName $stagedBlob = Get-AzureStorageBlob -Context $destContext.azureContext -Container $destContext.storageContainer -Blob $stageName SetProperties $stagedBlob "[$($destContext.storageContainer)]/$($blob.Name)" $version.ver - $minorName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($version.ext)" + $minorName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($preRel)$($version.ext)" CopyBlob $blobContext $stagedBlob $destContext $minorName if ($minorOnly -eq $false) { - $majorName = "$($version.path)$($version.prefix)$($verParts[0])$($version.ext)" + $majorName = "$($version.path)$($version.prefix)$($verParts[0])$($preRel)$($version.ext)" CopyBlob $blobContext $stagedBlob $destContext $majorName } @@ -742,6 +780,6 @@ if ($global:hasErrors -eq $true) { exit 2 } -SetActiveVersion $files[$activeVersion] $storePath +SetActiveVersion $files[$activeVersion] $storePath $container Log "======================================================================" diff --git a/AISKULight/package.json b/AISKULight/package.json index 61be0514c..059c041ef 100644 --- a/AISKULight/package.json +++ b/AISKULight/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-web-basic", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights Javascript SDK core and channel", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -45,9 +45,12 @@ "dependencies": { "@microsoft/dynamicproto-js": "^1.1.4", "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-common": "2.6.5", - "@microsoft/applicationinsights-channel-js": "2.6.5", - "@microsoft/applicationinsights-core-js": "2.6.5" + "@microsoft/applicationinsights-common": "2.7.0-beta.1", + "@microsoft/applicationinsights-channel-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/RELEASES.md b/RELEASES.md index 569a0d245..189527cd4 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,5 +1,35 @@ # Releases +## 2.7.0 (General Release -- Not Yet Released) + +___Major change___: Upgrades build environment to TypeScript 4.x + +[2.7.0-beta.1 Milestone](https://github.com/microsoft/ApplicationInsights-JS/)milestone/54 + +## Changelog + +- #617 Add performance.mark and performance.measure for performance browser tool integration + +### 2.7.0-beta.1 (August 17th, 2021) + +- #1171 ___Update to TypeScript 4.x___ +- #1526 [TypeScript Compile Error] Property 'sessionManager' does not exist on type 'ITelemetryContext' + - #1627 Add sesId to allow access to sessionManager session info +- #1471 Convert undefined to blank in customDimensions? + - #1630 Convert undefined custom properties to empty string +- #1585 ai_user cookie not present after reenabling the cookie +- #1561 How to enrich dependencies logs with context at the beginning of api call? + - #1624 Provide a way to enrich dependencies logs with context at the beginning of api call +- #1633 Add GitHub Automated Lock closed issue action + +### Update React plugin to v3.2.0-beta.1 + +- Update Core dependency to v2.7.0-beta.1 Core changes + +### Update React Native plugin to v2.4.0-beta.1 + +- Update Core dependency to v2.7.0-beta.1 Core changes + ## 2.6.5 (August 3rd, 2021) [2.6.5 Milestone](https://github.com/microsoft/ApplicationInsights-JS/milestone/53) diff --git a/channels/applicationinsights-channel-js/Tests/Unit/src/Sender.tests.ts b/channels/applicationinsights-channel-js/Tests/Unit/src/Sender.tests.ts index 4ef57d7f4..ae00c4c7a 100644 --- a/channels/applicationinsights-channel-js/Tests/Unit/src/Sender.tests.ts +++ b/channels/applicationinsights-channel-js/Tests/Unit/src/Sender.tests.ts @@ -555,7 +555,7 @@ export class SenderTests extends AITestClass { QUnit.assert.ok(baseData.ver); QUnit.assert.equal(2, baseData.ver); - QUnit.assert.equal("javascript:2.6.5", appInsightsEnvelope.tags["ai.internal.sdkVersion"]); + QUnit.assert.equal("javascript:2.7.0-beta.1", appInsightsEnvelope.tags["ai.internal.sdkVersion"]); } }) diff --git a/channels/applicationinsights-channel-js/package.json b/channels/applicationinsights-channel-js/package.json index c9dfd82ca..05842ab72 100644 --- a/channels/applicationinsights-channel-js/package.json +++ b/channels/applicationinsights-channel-js/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-channel-js", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights JavaScript SDK Channel", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -48,8 +48,11 @@ "dependencies": { "@microsoft/dynamicproto-js": "^1.1.4", "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-core-js": "2.6.5", - "@microsoft/applicationinsights-common": "2.6.5" + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-common": "2.7.0-beta.1" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/channels/applicationinsights-channel-js/src/EnvelopeCreator.ts b/channels/applicationinsights-channel-js/src/EnvelopeCreator.ts index 4ae52fd95..7ecc40d4a 100644 --- a/channels/applicationinsights-channel-js/src/EnvelopeCreator.ts +++ b/channels/applicationinsights-channel-js/src/EnvelopeCreator.ts @@ -23,7 +23,7 @@ function _setValueIf(target:T, field:keyof T, value:any) { } export abstract class EnvelopeCreator { - public static Version = "2.6.5"; + public static Version = "2.7.0-beta.1"; protected static extractPropsAndMeasurements(data: { [key: string]: any }, properties: { [key: string]: any }, measurements: { [key: string]: any }) { if (!isNullOrUndefined(data)) { diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json index 40c07d78f..c5b75a7eb 100644 --- a/common/config/rush/npm-shrinkwrap.json +++ b/common/config/rush/npm-shrinkwrap.json @@ -3210,7 +3210,7 @@ "node_modules/@rush-temp/applicationinsights-analytics-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-analytics-js.tgz", - "integrity": "sha512-6X2fZiGjclhx0BBR+yeZCjV6vfhQ7vplJ/YmIbZfNwHtzwM5XpyObyU6QHi0ZrwT/0ytPC9ei1j8/ybHlfapCg==", + "integrity": "sha512-lEcMJsEJfsA+CA2zN7IavSjHl94SheR+kThe+MS/4UuQNmJr40DK12VURGzan6xXhLDRBjdTGXobPa5bL25dpQ==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3237,7 +3237,7 @@ "node_modules/@rush-temp/applicationinsights-channel-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-channel-js.tgz", - "integrity": "sha512-zZmAoglCnDX+Z2dmrk3jcaLe44imRLzLjdbeyrUUdQZm9dbTgfILvegcSCQ9e19fbeccaURfl0X/0n1mgHYcbw==", + "integrity": "sha512-lSYvmvJ127hAx3Y07vbVziRbsPwR4CKN9Km8adPCDqc1d6Bv4Vgq5Gb4bm4rg/b9huEKz3ddu9TeF5hge8HD2Q==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3262,7 +3262,7 @@ "node_modules/@rush-temp/applicationinsights-clickanalytics-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-clickanalytics-js.tgz", - "integrity": "sha512-1Heg3djxwUiEsXYOUWMsJFdh5ibeoEc92Xk95Q05ahpgzeDFZcSDFTlhSqgaPPyEj3K8Vx221aAj/EngX91mVg==", + "integrity": "sha512-e6uqKOBrNFn0N3EgiVisml8ORZ0JobKVS+dt7F0p4g2ygtjI0pAXlusXObn0mh3UHlib/jw2lsTNxqoJX6B1yQ==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3286,7 +3286,7 @@ "node_modules/@rush-temp/applicationinsights-common": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-common.tgz", - "integrity": "sha512-iUeq/WypS7UBVLFwqKLNm1c+4sPac+u0Kjx6HY7Y3HDipbKYA1sOPPTMncXr7fovkDppongGbHqV01SFmRYEig==", + "integrity": "sha512-Z7qCN1Pu9OJWcURMe1JfbfEHGqJcXrlkL2e6zVIx4m4lMzA1BBaUg1VLFi1oP4+UuJMKnMz+fbgwZDATSbdRYA==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3335,7 +3335,7 @@ "node_modules/@rush-temp/applicationinsights-debugplugin-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-debugplugin-js.tgz", - "integrity": "sha512-cQow1Qjh64q5H245smD/X8FGH37JddzsGj9qoanf8zKdOuz+AcMXgP6e2gsP5gOX2RsvC4jYIi+nmA/QqoYFpw==", + "integrity": "sha512-zSKc2nwNw76yCJoQD4IiLtqpRm0hQbLCu5RinvlUwyeLBIavA877H6SweFOxH7vjUXNlQOiQmBGgvRyrp2lVYw==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3359,7 +3359,7 @@ "node_modules/@rush-temp/applicationinsights-dependencies-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-dependencies-js.tgz", - "integrity": "sha512-4ckV/tfQeDO4eDn5R8izCyfBRbm8d23aX81Nf3Ok/TayeKFIEodJUvUHQ9lwCSLd+GGpXjuxvpO8BhoztuN0xg==", + "integrity": "sha512-NFVytRLfdrQ9Vsmir4rBNt1e1JfBYVf2VV/EzvAgPyUjRdX9psKzxuUl78S6XDxhaggwjWg/8gVsh+anI8/5MQ==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3394,7 +3394,7 @@ "node_modules/@rush-temp/applicationinsights-perfmarkmeasure-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-perfmarkmeasure-js.tgz", - "integrity": "sha512-GtHjIOg0E6Y3eljy6uw3WBb9VoW0t23+QoaCdDrG9RIQ+3tPfmGKg6vhQ3a8k0fp7j/2jI7VSvNL5g1bmnEfHA==", + "integrity": "sha512-+3Eb6prmdkgDlNKZZ8jbgWnTCGBwgDIfl+2wH6rR6Gea8DvX2Syhu2/lT/6dxaQnfzgERjY6jhSFxGgi/Nae5w==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3418,7 +3418,7 @@ "node_modules/@rush-temp/applicationinsights-properties-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-properties-js.tgz", - "integrity": "sha512-0bheT6x5p3Gm4w2mrojkOHfinE8z6uUwlWh/IlQgUN4wyTZOLi8ysSGmm3umAbFqWLXUlCKzFsZD3zrLbzb6Ug==", + "integrity": "sha512-1PmnsU72DQypobhxNOab3r5DMzI/zwxgbaA2mdbh3VJJ5ivGDfu0dVxVczewIvmgXRg7bmvxcHI9vGUHImDVHA==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3445,7 +3445,7 @@ "node_modules/@rush-temp/applicationinsights-react-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-react-js.tgz", - "integrity": "sha512-cxPlhw2fjsctMrMntEP+rffDM9YvuJcLhQubmkYDLPRupXztxoOy8hjo2zMAL4O3JMZdDXXzNexcItutro2m6w==", + "integrity": "sha512-F9oCHX1oW3tmhbZWi7Tskz4CJ/WLmxulvK6nnPKS9PiP34+pDi2E68cUHpq6QsRI4tPil1H/WWYDk/d1+f9gRw==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3484,7 +3484,7 @@ "node_modules/@rush-temp/applicationinsights-react-native": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-react-native.tgz", - "integrity": "sha512-pQlHfgO4z3u2GW0hbIUsZ/8Fu256V2dPKiEkiHK4/y1C4t/k/QrY6Ci6ECGZeLRmOyeauKUFn2RF1xVS+Fvy9w==", + "integrity": "sha512-ucdA4yK1dofsBazxjGT8lV3QXxfPoCbpek/9JAlbJZKn2CjZAP3S4kH0DRdhBAxpOMN4uWDElc8ktu9Fupb6Aw==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3832,7 +3832,7 @@ "node_modules/@rush-temp/applicationinsights-web": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-web.tgz", - "integrity": "sha512-2GuJGT3tPNUkpUNjl628Ya79/QGwZgQEyABS5Cii2RvclbDSwzMxgWPcnh8jv0+xXV2YAOzsAxqvusyt45HH3w==", + "integrity": "sha512-99OS0Kx8QxjcN/YDhk7ICF0Wi/sJLknZcgrfeiu2cnWFD+CQOze9HPinyHs52er71yAoUS7oRNGsLNQ9/fzY2A==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -3862,7 +3862,7 @@ "node_modules/@rush-temp/applicationinsights-web-basic": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-web-basic.tgz", - "integrity": "sha512-b7oUade7HJZDwCXxhhDqHYzL2TcZZtu/g1JzmBaqHGTuVb6Spjg6yqQttl60khDSoNRGy2RTKpOvsu15REnIvQ==", + "integrity": "sha512-kOJqiJgZjkykE6onEn9LeVJLCDAdEAiBqmRQfjr1PMCY7WuA8gub4yC7O6L/T2jbV3OsxqZn5eVkqO4vpGp7hQ==", "dependencies": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -5415,15 +5415,6 @@ "node": "*" } }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "optional": true, - "dependencies": { - "file-uri-to-path": "1.0.0" - } - }, "node_modules/bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", @@ -6181,9 +6172,9 @@ } }, "node_modules/core-js-compat": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.1.tgz", - "integrity": "sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ==", + "version": "3.16.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.2.tgz", + "integrity": "sha512-4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ==", "dependencies": { "browserslist": "^4.16.7", "semver": "7.0.0" @@ -6202,9 +6193,9 @@ } }, "node_modules/core-js-pure": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.1.tgz", - "integrity": "sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg==", + "version": "3.16.2", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.2.tgz", + "integrity": "sha512-oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -6617,9 +6608,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "node_modules/electron-to-chromium": { - "version": "1.3.806", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.806.tgz", - "integrity": "sha512-AH/otJLAAecgyrYp0XK1DPiGVWcOgwPeJBOLeuFQ5l//vhQhwC9u6d+GijClqJAmsHG4XDue81ndSQPohUu0xA==" + "version": "1.3.808", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.808.tgz", + "integrity": "sha512-espnsbWTuUw0a2jMwfabCc09py2ujB+FZZE1hZWn5yYijEmxzEhdhTLKUfZGjynHvdIMQ4X/Pr/t8s4eiyH/QQ==" }, "node_modules/emoji-regex": { "version": "8.0.0", @@ -7792,12 +7783,6 @@ "node": "^10.12.0 || >=12.0.0" } }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "optional": true - }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -8108,24 +8093,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "node_modules/fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - }, - "engines": { - "node": ">= 4.0" - } - }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -12888,19 +12855,6 @@ "node": ">= 8" } }, - "node_modules/metro-core/node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/metro-core/node_modules/jest-haste-map": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz", @@ -13404,19 +13358,6 @@ "klaw": "^1.0.0" } }, - "node_modules/metro/node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/metro/node_modules/jest-haste-map": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz", @@ -13768,12 +13709,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", - "optional": true - }, "node_modules/nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -15129,9 +15064,9 @@ } }, "node_modules/react-devtools-core": { - "version": "4.15.0", - "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.15.0.tgz", - "integrity": "sha512-Y1NwrWSKRg4TtwcES2upzXFDmccAW9jrGQG2D8EGQrZhK+0hmuhgFnSdKpFc3z04CSeDT5t83RMXcmX5TkR1dA==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.16.0.tgz", + "integrity": "sha512-fqyVbp+wVVey6O4uVBk5s3J/vTiPludp7lulr6a8asTBm7DIA0vLBbjmAOLCnOlkWcgdy4mjsqOgNCbu8uICWw==", "dependencies": { "shell-quote": "^1.6.1", "ws": "^7" @@ -15664,19 +15599,6 @@ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==" }, - "node_modules/rollup/node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/rsvp": { "version": "4.8.5", "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", @@ -20396,7 +20318,7 @@ }, "@rush-temp/applicationinsights-analytics-js": { "version": "file:projects\\applicationinsights-analytics-js.tgz", - "integrity": "sha512-6X2fZiGjclhx0BBR+yeZCjV6vfhQ7vplJ/YmIbZfNwHtzwM5XpyObyU6QHi0ZrwT/0ytPC9ei1j8/ybHlfapCg==", + "integrity": "sha512-lEcMJsEJfsA+CA2zN7IavSjHl94SheR+kThe+MS/4UuQNmJr40DK12VURGzan6xXhLDRBjdTGXobPa5bL25dpQ==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20422,7 +20344,7 @@ }, "@rush-temp/applicationinsights-channel-js": { "version": "file:projects\\applicationinsights-channel-js.tgz", - "integrity": "sha512-zZmAoglCnDX+Z2dmrk3jcaLe44imRLzLjdbeyrUUdQZm9dbTgfILvegcSCQ9e19fbeccaURfl0X/0n1mgHYcbw==", + "integrity": "sha512-lSYvmvJ127hAx3Y07vbVziRbsPwR4CKN9Km8adPCDqc1d6Bv4Vgq5Gb4bm4rg/b9huEKz3ddu9TeF5hge8HD2Q==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20446,7 +20368,7 @@ }, "@rush-temp/applicationinsights-clickanalytics-js": { "version": "file:projects\\applicationinsights-clickanalytics-js.tgz", - "integrity": "sha512-1Heg3djxwUiEsXYOUWMsJFdh5ibeoEc92Xk95Q05ahpgzeDFZcSDFTlhSqgaPPyEj3K8Vx221aAj/EngX91mVg==", + "integrity": "sha512-e6uqKOBrNFn0N3EgiVisml8ORZ0JobKVS+dt7F0p4g2ygtjI0pAXlusXObn0mh3UHlib/jw2lsTNxqoJX6B1yQ==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20469,7 +20391,7 @@ }, "@rush-temp/applicationinsights-common": { "version": "file:projects\\applicationinsights-common.tgz", - "integrity": "sha512-iUeq/WypS7UBVLFwqKLNm1c+4sPac+u0Kjx6HY7Y3HDipbKYA1sOPPTMncXr7fovkDppongGbHqV01SFmRYEig==", + "integrity": "sha512-Z7qCN1Pu9OJWcURMe1JfbfEHGqJcXrlkL2e6zVIx4m4lMzA1BBaUg1VLFi1oP4+UuJMKnMz+fbgwZDATSbdRYA==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20516,7 +20438,7 @@ }, "@rush-temp/applicationinsights-debugplugin-js": { "version": "file:projects\\applicationinsights-debugplugin-js.tgz", - "integrity": "sha512-cQow1Qjh64q5H245smD/X8FGH37JddzsGj9qoanf8zKdOuz+AcMXgP6e2gsP5gOX2RsvC4jYIi+nmA/QqoYFpw==", + "integrity": "sha512-zSKc2nwNw76yCJoQD4IiLtqpRm0hQbLCu5RinvlUwyeLBIavA877H6SweFOxH7vjUXNlQOiQmBGgvRyrp2lVYw==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20539,7 +20461,7 @@ }, "@rush-temp/applicationinsights-dependencies-js": { "version": "file:projects\\applicationinsights-dependencies-js.tgz", - "integrity": "sha512-4ckV/tfQeDO4eDn5R8izCyfBRbm8d23aX81Nf3Ok/TayeKFIEodJUvUHQ9lwCSLd+GGpXjuxvpO8BhoztuN0xg==", + "integrity": "sha512-NFVytRLfdrQ9Vsmir4rBNt1e1JfBYVf2VV/EzvAgPyUjRdX9psKzxuUl78S6XDxhaggwjWg/8gVsh+anI8/5MQ==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20572,7 +20494,7 @@ }, "@rush-temp/applicationinsights-perfmarkmeasure-js": { "version": "file:projects\\applicationinsights-perfmarkmeasure-js.tgz", - "integrity": "sha512-GtHjIOg0E6Y3eljy6uw3WBb9VoW0t23+QoaCdDrG9RIQ+3tPfmGKg6vhQ3a8k0fp7j/2jI7VSvNL5g1bmnEfHA==", + "integrity": "sha512-+3Eb6prmdkgDlNKZZ8jbgWnTCGBwgDIfl+2wH6rR6Gea8DvX2Syhu2/lT/6dxaQnfzgERjY6jhSFxGgi/Nae5w==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20595,7 +20517,7 @@ }, "@rush-temp/applicationinsights-properties-js": { "version": "file:projects\\applicationinsights-properties-js.tgz", - "integrity": "sha512-0bheT6x5p3Gm4w2mrojkOHfinE8z6uUwlWh/IlQgUN4wyTZOLi8ysSGmm3umAbFqWLXUlCKzFsZD3zrLbzb6Ug==", + "integrity": "sha512-1PmnsU72DQypobhxNOab3r5DMzI/zwxgbaA2mdbh3VJJ5ivGDfu0dVxVczewIvmgXRg7bmvxcHI9vGUHImDVHA==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20621,7 +20543,7 @@ }, "@rush-temp/applicationinsights-react-js": { "version": "file:projects\\applicationinsights-react-js.tgz", - "integrity": "sha512-cxPlhw2fjsctMrMntEP+rffDM9YvuJcLhQubmkYDLPRupXztxoOy8hjo2zMAL4O3JMZdDXXzNexcItutro2m6w==", + "integrity": "sha512-F9oCHX1oW3tmhbZWi7Tskz4CJ/WLmxulvK6nnPKS9PiP34+pDi2E68cUHpq6QsRI4tPil1H/WWYDk/d1+f9gRw==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20659,7 +20581,7 @@ }, "@rush-temp/applicationinsights-react-native": { "version": "file:projects\\applicationinsights-react-native.tgz", - "integrity": "sha512-pQlHfgO4z3u2GW0hbIUsZ/8Fu256V2dPKiEkiHK4/y1C4t/k/QrY6Ci6ECGZeLRmOyeauKUFn2RF1xVS+Fvy9w==", + "integrity": "sha512-ucdA4yK1dofsBazxjGT8lV3QXxfPoCbpek/9JAlbJZKn2CjZAP3S4kH0DRdhBAxpOMN4uWDElc8ktu9Fupb6Aw==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20945,7 +20867,7 @@ }, "@rush-temp/applicationinsights-web": { "version": "file:projects\\applicationinsights-web.tgz", - "integrity": "sha512-2GuJGT3tPNUkpUNjl628Ya79/QGwZgQEyABS5Cii2RvclbDSwzMxgWPcnh8jv0+xXV2YAOzsAxqvusyt45HH3w==", + "integrity": "sha512-99OS0Kx8QxjcN/YDhk7ICF0Wi/sJLknZcgrfeiu2cnWFD+CQOze9HPinyHs52er71yAoUS7oRNGsLNQ9/fzY2A==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -20974,7 +20896,7 @@ }, "@rush-temp/applicationinsights-web-basic": { "version": "file:projects\\applicationinsights-web-basic.tgz", - "integrity": "sha512-b7oUade7HJZDwCXxhhDqHYzL2TcZZtu/g1JzmBaqHGTuVb6Spjg6yqQttl60khDSoNRGy2RTKpOvsu15REnIvQ==", + "integrity": "sha512-kOJqiJgZjkykE6onEn9LeVJLCDAdEAiBqmRQfjr1PMCY7WuA8gub4yC7O6L/T2jbV3OsxqZn5eVkqO4vpGp7hQ==", "requires": { "@microsoft/api-extractor": "^7.18.1", "@microsoft/dynamicproto-js": "^1.1.4", @@ -22201,15 +22123,6 @@ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "optional": true, - "requires": { - "file-uri-to-path": "1.0.0" - } - }, "bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", @@ -22799,9 +22712,9 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "core-js-compat": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.1.tgz", - "integrity": "sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ==", + "version": "3.16.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.2.tgz", + "integrity": "sha512-4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ==", "requires": { "browserslist": "^4.16.7", "semver": "7.0.0" @@ -22815,9 +22728,9 @@ } }, "core-js-pure": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.1.tgz", - "integrity": "sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg==" + "version": "3.16.2", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.2.tgz", + "integrity": "sha512-oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw==" }, "core-util-is": { "version": "1.0.2", @@ -23143,9 +23056,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.806", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.806.tgz", - "integrity": "sha512-AH/otJLAAecgyrYp0XK1DPiGVWcOgwPeJBOLeuFQ5l//vhQhwC9u6d+GijClqJAmsHG4XDue81ndSQPohUu0xA==" + "version": "1.3.808", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.808.tgz", + "integrity": "sha512-espnsbWTuUw0a2jMwfabCc09py2ujB+FZZE1hZWn5yYijEmxzEhdhTLKUfZGjynHvdIMQ4X/Pr/t8s4eiyH/QQ==" }, "emoji-regex": { "version": "8.0.0", @@ -24046,12 +23959,6 @@ "flat-cache": "^3.0.4" } }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "optional": true - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -24292,16 +24199,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true, - "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - } - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -27965,12 +27862,6 @@ "klaw": "^1.0.0" } }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "optional": true - }, "jest-haste-map": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz", @@ -28315,12 +28206,6 @@ "picomatch": "^2.0.4" } }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "optional": true - }, "jest-haste-map": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz", @@ -28752,12 +28637,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", - "optional": true - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -29758,9 +29637,9 @@ } }, "react-devtools-core": { - "version": "4.15.0", - "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.15.0.tgz", - "integrity": "sha512-Y1NwrWSKRg4TtwcES2upzXFDmccAW9jrGQG2D8EGQrZhK+0hmuhgFnSdKpFc3z04CSeDT5t83RMXcmX5TkR1dA==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.16.0.tgz", + "integrity": "sha512-fqyVbp+wVVey6O4uVBk5s3J/vTiPludp7lulr6a8asTBm7DIA0vLBbjmAOLCnOlkWcgdy4mjsqOgNCbu8uICWw==", "requires": { "shell-quote": "^1.6.1", "ws": "^7" @@ -30129,14 +30008,6 @@ "integrity": "sha512-s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ==", "requires": { "fsevents": "~2.3.2" - }, - "dependencies": { - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "optional": true - } } }, "rollup-plugin-cleanup": { diff --git a/extensions/applicationinsights-analytics-js/package.json b/extensions/applicationinsights-analytics-js/package.json index 1e17311ce..470edab42 100644 --- a/extensions/applicationinsights-analytics-js/package.json +++ b/extensions/applicationinsights-analytics-js/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-analytics-js", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights JavaScript SDK - Web Analytics", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -26,9 +26,9 @@ "@microsoft/ai-test-framework": "0.0.1", "@microsoft/applicationinsights-rollup-plugin-uglify3-js": "1.0.0", "@microsoft/applicationinsights-rollup-es3": "1.1.3", - "@microsoft/applicationinsights-properties-js": "2.6.5", - "@microsoft/applicationinsights-channel-js": "2.6.5", - "@microsoft/api-extractor" : "^7.18.1", + "@microsoft/applicationinsights-properties-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-channel-js": "2.7.0-beta.1", + "@microsoft/api-extractor": "^7.18.1", "typescript": "^4.3.4", "tslib": "^2.0.0", "globby": "^11.0.0", @@ -54,8 +54,11 @@ "dependencies": { "@microsoft/dynamicproto-js": "^1.1.4", "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-core-js": "2.6.5", - "@microsoft/applicationinsights-common": "2.6.5" + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-common": "2.7.0-beta.1" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/extensions/applicationinsights-analytics-js/src/JavaScriptSDK/ApplicationInsights.ts b/extensions/applicationinsights-analytics-js/src/JavaScriptSDK/ApplicationInsights.ts index 2d1c60896..51a8d64c4 100644 --- a/extensions/applicationinsights-analytics-js/src/JavaScriptSDK/ApplicationInsights.ts +++ b/extensions/applicationinsights-analytics-js/src/JavaScriptSDK/ApplicationInsights.ts @@ -54,7 +54,7 @@ function _getReason(error: any) { } export class ApplicationInsights extends BaseTelemetryPlugin implements IAppInsights, IAppInsightsInternal { - public static Version = "2.6.5"; // Not currently used anywhere + public static Version = "2.7.0-beta.1"; // Not currently used anywhere public static getDefaultConfig(config?: IConfig): IConfig { if (!config) { diff --git a/extensions/applicationinsights-clickanalytics-js/package.json b/extensions/applicationinsights-clickanalytics-js/package.json index 76295c832..caec2fd6a 100644 --- a/extensions/applicationinsights-clickanalytics-js/package.json +++ b/extensions/applicationinsights-clickanalytics-js/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-clickanalytics-js", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights Click Analytics extension", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -45,13 +45,16 @@ "dependencies": { "@microsoft/dynamicproto-js": "^1.1.4", "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-core-js": "2.6.5", - "@microsoft/applicationinsights-common": "2.6.5", - "@microsoft/applicationinsights-properties-js": "2.6.5" + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-common": "2.7.0-beta.1", + "@microsoft/applicationinsights-properties-js": "2.7.0-beta.1" }, "repository": { "type": "git", "url": "https://github.com/microsoft/ApplicationInsights-JS/tree/master/extensions/applicationinsights-clickanalytics-js" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/extensions/applicationinsights-clickanalytics-js/rollup.config.js b/extensions/applicationinsights-clickanalytics-js/rollup.config.js index 8cc5143c1..5527de20e 100644 --- a/extensions/applicationinsights-clickanalytics-js/rollup.config.js +++ b/extensions/applicationinsights-clickanalytics-js/rollup.config.js @@ -8,7 +8,7 @@ import { updateDistEsmFiles } from "../../tools/updateDistEsm/updateDistEsm"; const version = require("./package.json").version; const outputName = "applicationinsights-clickanalytics-js"; -const verParts = version.split(".") +const verParts = version.split("-")[0].split(".") if (verParts.length != 3) { throw "Invalid Version! [" + version + "]" } diff --git a/extensions/applicationinsights-clickanalytics-js/scripts/listCdnVersions.ps1 b/extensions/applicationinsights-clickanalytics-js/scripts/listCdnVersions.ps1 index 3e001ee0f..259a21861 100644 --- a/extensions/applicationinsights-clickanalytics-js/scripts/listCdnVersions.ps1 +++ b/extensions/applicationinsights-clickanalytics-js/scripts/listCdnVersions.ps1 @@ -378,7 +378,7 @@ Function ValidateAccess Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType @@ -573,7 +573,7 @@ Function ListVersions( if ($paths.ContainsKey($thePath) -ne $true) { $paths[$thePath] = $true - $value = "{0,-28}" -f $thePath + $value = "{0,-35}" -f $thePath $pathList = "$pathList$value " } else { $paths[$thePath] = ($paths[$thePath] + 1) @@ -581,12 +581,12 @@ Function ListVersions( } foreach ($thePath in $paths.Keys | Sort-Object) { - Log $(" - {1,-48} ({0})" -f $paths[$thePath],$thePath) + Log $(" - {1,-55} ({0})" -f $paths[$thePath],$thePath) } - Log $("v{0,-12} ({1,2}) - {2}" -f $key,$($fileList.Count),$pathList.Trim()) + Log $("v{0,-16} ({1,2}) - {2}" -f $key,$($fileList.Count),$pathList.Trim()) } else { - Log $("v{0,-12} ({1,2})" -f $key,$($fileList.Count)) + Log $("v{0,-16} ({1,2})" -f $key,$($fileList.Count)) foreach ($theBlob in $fileList) { $blob = $theBlob.blob $blob.ICloudBlob.FetchAttributes() @@ -613,7 +613,7 @@ Function ListVersions( $cacheControl = $cacheControl -replace "immutable","im" $cacheControl = $cacheControl -replace ", "," " - Log $(" - {0,-48}{3,-13}{1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss} {4,10} {5}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified,$sdkVersion,$cacheControl,$metaTags) + Log $(" - {0,-55}{3,-16}{1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss} {4,10} {5}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified,$sdkVersion,$cacheControl,$metaTags) } } } diff --git a/extensions/applicationinsights-clickanalytics-js/scripts/publishReleaseToCdn.ps1 b/extensions/applicationinsights-clickanalytics-js/scripts/publishReleaseToCdn.ps1 index 9a3d4ca5c..d26feec6c 100644 --- a/extensions/applicationinsights-clickanalytics-js/scripts/publishReleaseToCdn.ps1 +++ b/extensions/applicationinsights-clickanalytics-js/scripts/publishReleaseToCdn.ps1 @@ -284,7 +284,7 @@ Function GetReleaseFiles $files = New-Object 'system.collections.generic.dictionary[string,string]' Log "Adding files"; - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.integrity.json" + AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.integrity.json" $true AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.js" AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.js.map" AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.min.js" @@ -304,7 +304,7 @@ Function GetReleaseFiles Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType diff --git a/extensions/applicationinsights-clickanalytics-js/scripts/setActiveCdnVersion.ps1 b/extensions/applicationinsights-clickanalytics-js/scripts/setActiveCdnVersion.ps1 index ce85d1c06..edf76c748 100644 --- a/extensions/applicationinsights-clickanalytics-js/scripts/setActiveCdnVersion.ps1 +++ b/extensions/applicationinsights-clickanalytics-js/scripts/setActiveCdnVersion.ps1 @@ -377,10 +377,37 @@ Function ValidateAccess } } +Function Get-VersionDetails ( + [string] $ver +) { + [hashtable] $version = @{} + $version.full = $ver + + $parts = $ver -split "\+", 2 + if ($parts.Length -eq 2) { + $version.bldNum = $parts[1] + $ver = $parts[0] + } else { + $version.bldNum = "" + } + + $parts = $ver -split "-", 2 + $version.ver = $parts[0] + if ($parts.Length -eq 2) { + $version.preRel = $parts[1] + $version.type = ((($parts[1] -split "\+")[0] -split "\.")[0] -split "-")[0] + } else { + $version.preRel = "" + $version.type = "release" + } + + return $version; +} + Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType @@ -604,7 +631,8 @@ Function SetProperties( Function SetActiveVersion( [system.collections.generic.list[hashtable]] $fileList, - [string] $storePath + [string] $storePath, + [string] $container ) { $destContext = GetContainerContext $storePath @@ -617,31 +645,42 @@ Function SetActiveVersion( foreach ($theBlob in $fileList) { $blob = $theBlob.blob $blobContext = $theBlob.context.azureContext - Log $("Copying: {0,-40} {1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified) + Log $("Copying: {0,-55} {1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified) $version = GetVersion $blob.Name if ($null -ne $version) { - $verParts = $version.ver.Split(".") + $verDetails = Get-VersionDetails $version.ver + $verParts = $verDetails.ver.Split(".") if ($verParts.Length -ne 3) { - Log-Failure "ScriptError: Invalid Version! [$activeVersion]" + Write-LogFailure "ScriptError: Invalid Version! [$activeVersion]" + } + + $preRel = "" + if ($verDetails.type -ne "release") { + $preRel = "-" + $verDetails.type + + if ($verDetails.type -eq $container) { + # remove any "beta" tag when deploying to the beta container etc. + $preRel = "" + } } # Don't try and publish anything if any errors have been logged if ($global:hasErrors -eq $true) { exit 2 } - - $stageName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($version.ext).stage" + + $stageName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($preRel)$($version.ext).stage" CopyBlob $blobContext $blob $destContext $stageName $stagedBlob = Get-AzureStorageBlob -Context $destContext.azureContext -Container $destContext.storageContainer -Blob $stageName SetProperties $stagedBlob "[$($destContext.storageContainer)]/$($blob.Name)" $version.ver - $minorName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($version.ext)" + $minorName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($preRel)$($version.ext)" CopyBlob $blobContext $stagedBlob $destContext $minorName if ($minorOnly -eq $false) { - $majorName = "$($version.path)$($version.prefix)$($verParts[0])$($version.ext)" + $majorName = "$($version.path)$($version.prefix)$($verParts[0])$($preRel)$($version.ext)" CopyBlob $blobContext $stagedBlob $destContext $majorName } @@ -740,6 +779,6 @@ if ($global:hasErrors -eq $true) { exit 2 } -SetActiveVersion $files[$activeVersion] $storePath +SetActiveVersion $files[$activeVersion] $storePath $container Log "======================================================================" diff --git a/extensions/applicationinsights-clickanalytics-js/src/ClickAnalyticsPlugin.ts b/extensions/applicationinsights-clickanalytics-js/src/ClickAnalyticsPlugin.ts index 1fd08d55e..5aa23e985 100644 --- a/extensions/applicationinsights-clickanalytics-js/src/ClickAnalyticsPlugin.ts +++ b/extensions/applicationinsights-clickanalytics-js/src/ClickAnalyticsPlugin.ts @@ -27,7 +27,7 @@ export { BehaviorMapValidator, BehaviorValueValidator, BehaviorEnumValidator } export class ClickAnalyticsPlugin extends BaseTelemetryPlugin { public identifier: string = 'ClickAnalyticsPlugin'; public priority: number = 181; - public static Version = "2.6.5"; + public static Version = "2.7.0-beta.1"; private _config: IClickAnalyticsConfiguration; private pageAction: PageAction; private _autoCaptureHandler: IAutoCaptureHandler; diff --git a/extensions/applicationinsights-debugplugin-js/package.json b/extensions/applicationinsights-debugplugin-js/package.json index 3b38394ea..f57e62c06 100644 --- a/extensions/applicationinsights-debugplugin-js/package.json +++ b/extensions/applicationinsights-debugplugin-js/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-debugplugin-js", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights JavaScript SDK - Debug Plugin extension", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -47,9 +47,12 @@ }, "dependencies": { "@microsoft/dynamicproto-js": "^1.1.4", - "@microsoft/applicationinsights-common": "2.6.5", - "@microsoft/applicationinsights-core-js": "2.6.5", + "@microsoft/applicationinsights-common": "2.7.0-beta.1", + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", "@microsoft/applicationinsights-shims": "2.0.0" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/extensions/applicationinsights-debugplugin-js/rollup.config.js b/extensions/applicationinsights-debugplugin-js/rollup.config.js index 89528a4a1..f1f9f995b 100644 --- a/extensions/applicationinsights-debugplugin-js/rollup.config.js +++ b/extensions/applicationinsights-debugplugin-js/rollup.config.js @@ -20,7 +20,7 @@ const replaceValues = { "// Licensed under the MIT License.": "" }; -const verParts = version.split(".") +const verParts = version.split("-")[0].split(".") if (verParts.length != 3) { throw "Invalid Version! [" + version + "]" } diff --git a/extensions/applicationinsights-debugplugin-js/scripts/listCdnVersions.ps1 b/extensions/applicationinsights-debugplugin-js/scripts/listCdnVersions.ps1 index 0bdd19565..fcbf865d6 100644 --- a/extensions/applicationinsights-debugplugin-js/scripts/listCdnVersions.ps1 +++ b/extensions/applicationinsights-debugplugin-js/scripts/listCdnVersions.ps1 @@ -378,7 +378,7 @@ Function ValidateAccess Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType @@ -573,7 +573,7 @@ Function ListVersions( if ($paths.ContainsKey($thePath) -ne $true) { $paths[$thePath] = $true - $value = "{0,-28}" -f $thePath + $value = "{0,-35}" -f $thePath $pathList = "$pathList$value " } else { $paths[$thePath] = ($paths[$thePath] + 1) @@ -581,12 +581,12 @@ Function ListVersions( } foreach ($thePath in $paths.Keys | Sort-Object) { - Log $(" - {1,-48} ({0})" -f $paths[$thePath],$thePath) + Log $(" - {1,-55} ({0})" -f $paths[$thePath],$thePath) } - Log $("v{0,-12} ({1,2}) - {2}" -f $key,$($fileList.Count),$pathList.Trim()) + Log $("v{0,-16} ({1,2}) - {2}" -f $key,$($fileList.Count),$pathList.Trim()) } else { - Log $("v{0,-12} ({1,2})" -f $key,$($fileList.Count)) + Log $("v{0,-16} ({1,2})" -f $key,$($fileList.Count)) foreach ($theBlob in $fileList) { $blob = $theBlob.blob $blob.ICloudBlob.FetchAttributes() @@ -613,7 +613,7 @@ Function ListVersions( $cacheControl = $cacheControl -replace "immutable","im" $cacheControl = $cacheControl -replace ", "," " - Log $(" - {0,-48}{3,-13}{1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss} {4,10} {5}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified,$sdkVersion,$cacheControl,$metaTags) + Log $(" - {0,-55}{3,-16}{1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss} {4,10} {5}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified,$sdkVersion,$cacheControl,$metaTags) } } } diff --git a/extensions/applicationinsights-debugplugin-js/scripts/publishReleaseToCdn.ps1 b/extensions/applicationinsights-debugplugin-js/scripts/publishReleaseToCdn.ps1 index 1c231cca4..a14f4f4d3 100644 --- a/extensions/applicationinsights-debugplugin-js/scripts/publishReleaseToCdn.ps1 +++ b/extensions/applicationinsights-debugplugin-js/scripts/publishReleaseToCdn.ps1 @@ -305,7 +305,7 @@ Function GetReleaseFiles Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType diff --git a/extensions/applicationinsights-debugplugin-js/scripts/setActiveCdnVersion.ps1 b/extensions/applicationinsights-debugplugin-js/scripts/setActiveCdnVersion.ps1 index 83a317e14..02a90c5a5 100644 --- a/extensions/applicationinsights-debugplugin-js/scripts/setActiveCdnVersion.ps1 +++ b/extensions/applicationinsights-debugplugin-js/scripts/setActiveCdnVersion.ps1 @@ -377,10 +377,37 @@ Function ValidateAccess } } +Function Get-VersionDetails ( + [string] $ver +) { + [hashtable] $version = @{} + $version.full = $ver + + $parts = $ver -split "\+", 2 + if ($parts.Length -eq 2) { + $version.bldNum = $parts[1] + $ver = $parts[0] + } else { + $version.bldNum = "" + } + + $parts = $ver -split "-", 2 + $version.ver = $parts[0] + if ($parts.Length -eq 2) { + $version.preRel = $parts[1] + $version.type = ((($parts[1] -split "\+")[0] -split "\.")[0] -split "-")[0] + } else { + $version.preRel = "" + $version.type = "release" + } + + return $version; +} + Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType @@ -604,7 +631,8 @@ Function SetProperties( Function SetActiveVersion( [system.collections.generic.list[hashtable]] $fileList, - [string] $storePath + [string] $storePath, + [string] $container ) { $destContext = GetContainerContext $storePath @@ -617,31 +645,42 @@ Function SetActiveVersion( foreach ($theBlob in $fileList) { $blob = $theBlob.blob $blobContext = $theBlob.context.azureContext - Log $("Copying: {0,-40} {1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified) + Log $("Copying: {0,-55} {1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified) $version = GetVersion $blob.Name if ($null -ne $version) { - $verParts = $version.ver.Split(".") + $verDetails = Get-VersionDetails $version.ver + $verParts = $verDetails.ver.Split(".") if ($verParts.Length -ne 3) { - Log-Failure "ScriptError: Invalid Version! [$activeVersion]" + Write-LogFailure "ScriptError: Invalid Version! [$activeVersion]" + } + + $preRel = "" + if ($verDetails.type -ne "release") { + $preRel = "-" + $verDetails.type + + if ($verDetails.type -eq $container) { + # remove any "beta" tag when deploying to the beta container etc. + $preRel = "" + } } # Don't try and publish anything if any errors have been logged if ($global:hasErrors -eq $true) { exit 2 } - - $stageName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($version.ext).stage" + + $stageName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($preRel)$($version.ext).stage" CopyBlob $blobContext $blob $destContext $stageName $stagedBlob = Get-AzureStorageBlob -Context $destContext.azureContext -Container $destContext.storageContainer -Blob $stageName SetProperties $stagedBlob "[$($destContext.storageContainer)]/$($blob.Name)" $version.ver - $minorName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($version.ext)" + $minorName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($preRel)$($version.ext)" CopyBlob $blobContext $stagedBlob $destContext $minorName if ($minorOnly -eq $false) { - $majorName = "$($version.path)$($version.prefix)$($verParts[0])$($version.ext)" + $majorName = "$($version.path)$($version.prefix)$($verParts[0])$($preRel)$($version.ext)" CopyBlob $blobContext $stagedBlob $destContext $majorName } @@ -741,6 +780,6 @@ if ($global:hasErrors -eq $true) { exit 2 } -SetActiveVersion $files[$activeVersion] $storePath +SetActiveVersion $files[$activeVersion] $storePath $container Log "======================================================================" diff --git a/extensions/applicationinsights-dependencies-js/package.json b/extensions/applicationinsights-dependencies-js/package.json index c84cba61e..ed1a1ea81 100644 --- a/extensions/applicationinsights-dependencies-js/package.json +++ b/extensions/applicationinsights-dependencies-js/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-dependencies-js", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights XHR dependencies plugin", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -51,8 +51,11 @@ "dependencies": { "@microsoft/dynamicproto-js": "^1.1.4", "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-core-js": "2.6.5", - "@microsoft/applicationinsights-common": "2.6.5" + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-common": "2.7.0-beta.1" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/extensions/applicationinsights-perfmarkmeasure-js/package.json b/extensions/applicationinsights-perfmarkmeasure-js/package.json index 5c4eba074..d5cf6a073 100644 --- a/extensions/applicationinsights-perfmarkmeasure-js/package.json +++ b/extensions/applicationinsights-perfmarkmeasure-js/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-perfmarkmeasure-js", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights Performance Mark and Measure Manager plugin", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -45,11 +45,14 @@ }, "peerDependencies": { "tslib": "*" - }, + }, "dependencies": { "@microsoft/dynamicproto-js": "^1.1.4", "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-core-js": "2.6.5" + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/extensions/applicationinsights-perfmarkmeasure-js/rollup.config.js b/extensions/applicationinsights-perfmarkmeasure-js/rollup.config.js index 4430eb3f5..254c75323 100644 --- a/extensions/applicationinsights-perfmarkmeasure-js/rollup.config.js +++ b/extensions/applicationinsights-perfmarkmeasure-js/rollup.config.js @@ -8,7 +8,7 @@ import { updateDistEsmFiles } from "../../tools/updateDistEsm/updateDistEsm"; const version = require("./package.json").version; const outputName = "applicationinsights-perfmarkmeasure-js"; -const verParts = version.split(".") +const verParts = version.split("-")[0].split(".") if (verParts.length != 3) { throw "Invalid Version! [" + version + "]" } diff --git a/extensions/applicationinsights-perfmarkmeasure-js/scripts/listCdnVersions.ps1 b/extensions/applicationinsights-perfmarkmeasure-js/scripts/listCdnVersions.ps1 index 3e001ee0f..b3da111c4 100644 --- a/extensions/applicationinsights-perfmarkmeasure-js/scripts/listCdnVersions.ps1 +++ b/extensions/applicationinsights-perfmarkmeasure-js/scripts/listCdnVersions.ps1 @@ -378,7 +378,7 @@ Function ValidateAccess Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType @@ -573,7 +573,7 @@ Function ListVersions( if ($paths.ContainsKey($thePath) -ne $true) { $paths[$thePath] = $true - $value = "{0,-28}" -f $thePath + $value = "{0,-35}" -f $thePath $pathList = "$pathList$value " } else { $paths[$thePath] = ($paths[$thePath] + 1) @@ -581,12 +581,12 @@ Function ListVersions( } foreach ($thePath in $paths.Keys | Sort-Object) { - Log $(" - {1,-48} ({0})" -f $paths[$thePath],$thePath) + Log $(" - {1,-55} ({0})" -f $paths[$thePath],$thePath) } - Log $("v{0,-12} ({1,2}) - {2}" -f $key,$($fileList.Count),$pathList.Trim()) + Log $("v{0,-16} ({1,2}) - {2}" -f $key,$($fileList.Count),$pathList.Trim()) } else { - Log $("v{0,-12} ({1,2})" -f $key,$($fileList.Count)) + Log $("v{0,-16} ({1,2})" -f $key,$($fileList.Count)) foreach ($theBlob in $fileList) { $blob = $theBlob.blob $blob.ICloudBlob.FetchAttributes() @@ -613,7 +613,7 @@ Function ListVersions( $cacheControl = $cacheControl -replace "immutable","im" $cacheControl = $cacheControl -replace ", "," " - Log $(" - {0,-48}{3,-13}{1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss} {4,10} {5}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified,$sdkVersion,$cacheControl,$metaTags) + Log $(" - {0,-55}{3,-16}{1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss} {4,10} {5}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified,$sdkVersion,$cacheControl,$metaTags) } } } @@ -669,17 +669,17 @@ $files = New-Object 'system.collections.generic.dictionary[string, system.collec # Get the beta files if ([string]::IsNullOrWhiteSpace($container) -eq $true -or $container -eq "beta") { - GetVersionFiles $files "beta/ext" "ai.clck." + GetVersionFiles $files "beta/ext" "ai.prfmm-mgr." } # Get the next files if ([string]::IsNullOrWhiteSpace($container) -eq $true -or $container -eq "next") { - GetVersionFiles $files "next/ext" "ai.clck." + GetVersionFiles $files "next/ext" "ai.prfmm-mgr." } # Get the public files (scripts/b) if ([string]::IsNullOrWhiteSpace($container) -eq $true -or $container -eq "public") { - GetVersionFiles $files "scripts/b/ext" "ai.clck." + GetVersionFiles $files "scripts/b/ext" "ai.prfmm-mgr." } ListVersions $files diff --git a/extensions/applicationinsights-perfmarkmeasure-js/scripts/publishReleaseToCdn.ps1 b/extensions/applicationinsights-perfmarkmeasure-js/scripts/publishReleaseToCdn.ps1 index 9a3d4ca5c..c2000038a 100644 --- a/extensions/applicationinsights-perfmarkmeasure-js/scripts/publishReleaseToCdn.ps1 +++ b/extensions/applicationinsights-perfmarkmeasure-js/scripts/publishReleaseToCdn.ps1 @@ -284,19 +284,19 @@ Function GetReleaseFiles $files = New-Object 'system.collections.generic.dictionary[string,string]' Log "Adding files"; - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.integrity.json" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.js" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.js.map" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.min.js" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.min.js.map" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.cjs.js" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.cjs.js.map" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.cjs.min.js" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.cjs.min.js.map" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.gbl.js" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.gbl.js.map" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.gbl.min.js" - AddReleaseFile $files $jsSdkSrcDir "ai.clck.$version.gbl.min.js.map" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.integrity.json" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.js" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.js.map" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.min.js" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.min.js.map" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.cjs.js" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.cjs.js.map" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.cjs.min.js" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.cjs.min.js.map" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.gbl.js" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.gbl.js.map" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.gbl.min.js" + AddReleaseFile $files $jsSdkSrcDir "ai.prfmm-mgr.$version.gbl.min.js.map" return $files } @@ -304,7 +304,7 @@ Function GetReleaseFiles Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType diff --git a/extensions/applicationinsights-perfmarkmeasure-js/scripts/setActiveCdnVersion.ps1 b/extensions/applicationinsights-perfmarkmeasure-js/scripts/setActiveCdnVersion.ps1 index ce85d1c06..02f4de3c0 100644 --- a/extensions/applicationinsights-perfmarkmeasure-js/scripts/setActiveCdnVersion.ps1 +++ b/extensions/applicationinsights-perfmarkmeasure-js/scripts/setActiveCdnVersion.ps1 @@ -377,10 +377,37 @@ Function ValidateAccess } } +Function Get-VersionDetails ( + [string] $ver +) { + [hashtable] $version = @{} + $version.full = $ver + + $parts = $ver -split "\+", 2 + if ($parts.Length -eq 2) { + $version.bldNum = $parts[1] + $ver = $parts[0] + } else { + $version.bldNum = "" + } + + $parts = $ver -split "-", 2 + $version.ver = $parts[0] + if ($parts.Length -eq 2) { + $version.preRel = $parts[1] + $version.type = ((($parts[1] -split "\+")[0] -split "\.")[0] -split "-")[0] + } else { + $version.preRel = "" + $version.type = "release" + } + + return $version; +} + Function GetVersion( [string] $name ) { - $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[^\.]+)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' + $regMatch = '^(.*\/)*([^\/\d]*\.)(\d+(\.\d+)*(-[\w\d\-\+]+\.?[\d\-\+]*)?)(\.(?:gbl\.js|gbl\.min\.js|cjs\.js|cjs\.min\.js|js|min\.js|integrity\.json)(?:\.map)?)$' $match = ($name | select-string $regMatch -AllMatches).matches $contentType = $jsContentType @@ -604,7 +631,8 @@ Function SetProperties( Function SetActiveVersion( [system.collections.generic.list[hashtable]] $fileList, - [string] $storePath + [string] $storePath, + [string] $container ) { $destContext = GetContainerContext $storePath @@ -617,31 +645,42 @@ Function SetActiveVersion( foreach ($theBlob in $fileList) { $blob = $theBlob.blob $blobContext = $theBlob.context.azureContext - Log $("Copying: {0,-40} {1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified) + Log $("Copying: {0,-55} {1,6:N1} Kb {2:yyyy-MM-dd HH:mm:ss}" -f $($blob.ICloudBlob.Container.Name + "/" + $blob.Name),($blob.Length/1kb),$blob.LastModified) $version = GetVersion $blob.Name if ($null -ne $version) { - $verParts = $version.ver.Split(".") + $verDetails = Get-VersionDetails $version.ver + $verParts = $verDetails.ver.Split(".") if ($verParts.Length -ne 3) { - Log-Failure "ScriptError: Invalid Version! [$activeVersion]" + Write-LogFailure "ScriptError: Invalid Version! [$activeVersion]" + } + + $preRel = "" + if ($verDetails.type -ne "release") { + $preRel = "-" + $verDetails.type + + if ($verDetails.type -eq $container) { + # remove any "beta" tag when deploying to the beta container etc. + $preRel = "" + } } # Don't try and publish anything if any errors have been logged if ($global:hasErrors -eq $true) { exit 2 } - - $stageName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($version.ext).stage" + + $stageName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($preRel)$($version.ext).stage" CopyBlob $blobContext $blob $destContext $stageName $stagedBlob = Get-AzureStorageBlob -Context $destContext.azureContext -Container $destContext.storageContainer -Blob $stageName SetProperties $stagedBlob "[$($destContext.storageContainer)]/$($blob.Name)" $version.ver - $minorName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($version.ext)" + $minorName = "$($version.path)$($version.prefix)$($verParts[0]).$($verParts[1])$($preRel)$($version.ext)" CopyBlob $blobContext $stagedBlob $destContext $minorName if ($minorOnly -eq $false) { - $majorName = "$($version.path)$($version.prefix)$($verParts[0])$($version.ext)" + $majorName = "$($version.path)$($version.prefix)$($verParts[0])$($preRel)$($version.ext)" CopyBlob $blobContext $stagedBlob $destContext $majorName } @@ -722,10 +761,10 @@ $files = New-Object 'system.collections.generic.dictionary[string, system.collec $storePath = $container if ($container -eq "beta" -or $container -eq "next") { $storePath = "$container/ext" - GetVersionFiles $files $storePath "ai.clck." + GetVersionFiles $files $storePath "ai.prfmm-mgr." } elseif ($container -eq "public") { $storePath = "scripts/b/ext" - GetVersionFiles $files $storePath "ai.clck." + GetVersionFiles $files $storePath "ai.prfmm-mgr." } if ($files.ContainsKey($activeVersion) -ne $true) { @@ -740,6 +779,6 @@ if ($global:hasErrors -eq $true) { exit 2 } -SetActiveVersion $files[$activeVersion] $storePath +SetActiveVersion $files[$activeVersion] $storePath $container Log "======================================================================" diff --git a/extensions/applicationinsights-properties-js/package.json b/extensions/applicationinsights-properties-js/package.json index 17760f0a5..11c5c441a 100644 --- a/extensions/applicationinsights-properties-js/package.json +++ b/extensions/applicationinsights-properties-js/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-properties-js", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights properties (Part A) plugin", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -52,8 +52,11 @@ "dependencies": { "@microsoft/dynamicproto-js": "^1.1.4", "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-core-js": "2.6.5", - "@microsoft/applicationinsights-common": "2.6.5" + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-common": "2.7.0-beta.1" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/extensions/applicationinsights-properties-js/src/Context/Internal.ts b/extensions/applicationinsights-properties-js/src/Context/Internal.ts index 02b6cffa5..6094d6ea9 100644 --- a/extensions/applicationinsights-properties-js/src/Context/Internal.ts +++ b/extensions/applicationinsights-properties-js/src/Context/Internal.ts @@ -4,7 +4,7 @@ import { IInternal } from '@microsoft/applicationinsights-common'; import { ITelemetryConfig } from '../Interfaces/ITelemetryConfig'; -const Version = "2.6.5"; +const Version = "2.7.0-beta.1"; export class Internal implements IInternal { diff --git a/extensions/applicationinsights-react-js/package.json b/extensions/applicationinsights-react-js/package.json index 2b87a32db..f9d5fe8cc 100644 --- a/extensions/applicationinsights-react-js/package.json +++ b/extensions/applicationinsights-react-js/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-react-js", - "version": "3.1.5", + "version": "3.2.0-beta.1", "description": "Microsoft Application Insights React plugin", "main": "dist/applicationinsights-react-js.js", "module": "dist-esm/applicationinsights-react-js.js", @@ -57,8 +57,8 @@ }, "dependencies": { "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-core-js": "2.6.5", - "@microsoft/applicationinsights-common": "2.6.5", + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", + "@microsoft/applicationinsights-common": "2.7.0-beta.1", "@microsoft/dynamicproto-js": "^1.1.4", "history": "^4.10.1" }, @@ -66,5 +66,8 @@ "tslib": "*", "react": "^17.0.1" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/extensions/applicationinsights-react-native/package.json b/extensions/applicationinsights-react-native/package.json index 20eb4cb52..60d085b68 100644 --- a/extensions/applicationinsights-react-native/package.json +++ b/extensions/applicationinsights-react-native/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-react-native", - "version": "2.3.5", + "version": "2.4.0-beta.1", "description": "Microsoft Application Insights React Native Plugin", "main": "dist-esm/index.js", "types": "types/index.d.ts", @@ -54,8 +54,8 @@ "uglify-js": "^3.11.0" }, "dependencies": { - "@microsoft/applicationinsights-common": "2.6.5", - "@microsoft/applicationinsights-core-js": "2.6.5", + "@microsoft/applicationinsights-common": "2.7.0-beta.1", + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", "@microsoft/applicationinsights-shims": "2.0.0", "@microsoft/dynamicproto-js": "^1.1.4" }, @@ -64,5 +64,8 @@ "react-native": "*", "react-native-device-info": "^5.2.1" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/package.json b/package.json index 74a669dd2..9eaba16b0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@microsoft/applicationinsights-web", "description": "Microsoft Application Insights JavaScript SDK", - "version": "2.6.5", + "version": "2.7.0-beta.1", "keywords": [ "browser performance monitoring", "script errors", @@ -59,5 +59,8 @@ "connect": "^3.7.0", "puppeteer": "^10.1.0", "chromium": "^3.0.2" + }, + "publishConfig": { + "tag": "beta" } } diff --git a/shared/AppInsightsCommon/package.json b/shared/AppInsightsCommon/package.json index cc97c2ee2..7d43d9d89 100644 --- a/shared/AppInsightsCommon/package.json +++ b/shared/AppInsightsCommon/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/applicationinsights-common", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights Common JavaScript Library", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "author": "Microsoft Application Insights Team", @@ -47,8 +47,11 @@ }, "dependencies": { "@microsoft/applicationinsights-shims": "2.0.0", - "@microsoft/applicationinsights-core-js": "2.6.5", + "@microsoft/applicationinsights-core-js": "2.7.0-beta.1", "@microsoft/dynamicproto-js": "^1.1.4" }, - "license": "MIT" + "license": "MIT", + "publishConfig": { + "tag": "beta" + } } diff --git a/shared/AppInsightsCore/package.json b/shared/AppInsightsCore/package.json index eff8864c8..c6c4acc23 100644 --- a/shared/AppInsightsCore/package.json +++ b/shared/AppInsightsCore/package.json @@ -1,7 +1,7 @@ { "name": "@microsoft/applicationinsights-core-js", "author": "Microsoft Application Insights Team", - "version": "2.6.5", + "version": "2.7.0-beta.1", "description": "Microsoft Application Insights Core Javascript SDK", "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "keywords": [ @@ -63,5 +63,8 @@ "dependencies": { "@microsoft/applicationinsights-shims": "2.0.0", "@microsoft/dynamicproto-js": "^1.1.4" + }, + "publishConfig": { + "tag": "beta" } } diff --git a/version.json b/version.json index 31263a149..276db7d27 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,59 @@ { "description": "The release value identifies the base version that will be applied via the tools/release-tools/setVersion.js", "usage": "When creating a new release you should update this value directly or via the eg. 'npm run setVersion -- 3.2.0' or 'npm run setVersion -- -patch' or 'npm run setVersion -- -minor'", - "release": "2.6.5" + "release": "2.7.0-beta.1", + "pkgs": { + "@microsoft/applicationinsights-web": { + "package": "package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-web-basic": { + "package": "AISKULight/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-channel-js": { + "package": "channels/applicationinsights-channel-js/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-analytics-js": { + "package": "extensions/applicationinsights-analytics-js/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-clickanalytics-js": { + "package": "extensions/applicationinsights-clickanalytics-js/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-debugplugin-js": { + "package": "extensions/applicationinsights-debugplugin-js/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-dependencies-js": { + "package": "extensions/applicationinsights-dependencies-js/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-perfmarkmeasure-js": { + "package": "extensions/applicationinsights-perfmarkmeasure-js/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-properties-js": { + "package": "extensions/applicationinsights-properties-js/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-common": { + "package": "shared/AppInsightsCommon/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-core-js": { + "package": "shared/AppInsightsCore/package.json", + "release": "2.7.0-beta.1" + }, + "@microsoft/applicationinsights-react-js": { + "package": "extensions/applicationinsights-react-js/package.json", + "release": "3.2.0-beta.1" + }, + "@microsoft/applicationinsights-react-native": { + "package": "extensions/applicationinsights-react-native/package.json", + "release": "2.4.0-beta.1" + } + } }