Skip to content

Commit 26a24d0

Browse files
committed
Merge branch 'release-v2.0.4' into release
2 parents dbdc78e + 0267620 commit 26a24d0

File tree

27 files changed

+30458
-764
lines changed

27 files changed

+30458
-764
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Unreleased changes
22

3-
[Full changelog](https://github.com/mozilla/glean.js/compare/v2.0.3...main)
3+
[Full changelog](https://github.com/mozilla/glean.js/compare/v2.0.4...main)
4+
5+
# v2.0.4 (2023-10-10)
6+
7+
[Full changelog](https://github.com/mozilla/glean.js/compare/v2.0.3...v2.0.4)
8+
9+
* [#1772](https://github.com/mozilla/glean.js/pull/1772): Fix bug where `window.Glean` functions were getting set on non-browser properties.
10+
* [#1784](https://github.com/mozilla/glean.js/pull/1784): Store `window.Glean` debugging values in `sessionStorage`. This will set debug options on page init while the current session is still active.
411

512
# v2.0.3 (2023-09-27)
613

automation/compat/tests/utils.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,30 @@ export async function runWebTest(driver) {
7474
await driver.get(`http://localhost:${PORT}/`);
7575
// Give it time to send the ping request.
7676
const successTextContainer = await driver.findElement(By.id("msg"));
77+
78+
const areGleanWindowVarsSet = await driver.executeScript(() => {
79+
// Verify that all Glean `window` vars are properly set.
80+
if (
81+
window &&
82+
window.Glean &&
83+
window.Glean.setDebugViewTag &&
84+
window.Glean.setLogPings &&
85+
window.Glean.setSourceTags
86+
) {
87+
return true;
88+
}
89+
90+
// One of our expected values wasn't set, so the test should fail.
91+
return false;
92+
}).catch(() => {
93+
// In case `window` isn't available or something unexpected happens.
94+
return false;
95+
});
96+
97+
if (!areGleanWindowVarsSet) {
98+
throw new Error("`window.Glean` variables are not set.");
99+
}
100+
77101
await driver.wait(
78102
until.elementTextIs(
79103
successTextContainer,

automation/package-lock.json

Lines changed: 74 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

automation/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"author": "The Glean Team <glean-team@mozilla.com>",
2020
"license": "MPL-2.0",
2121
"devDependencies": {
22-
"@octokit/request": "^8.1.1",
22+
"@octokit/request": "^8.1.2",
2323
"browserstack-local": "^1.5.4",
24-
"geckodriver": "^4.2.0",
24+
"geckodriver": "^4.2.1",
2525
"selenium-webdriver": "^4.4.0",
2626
"webpack": "^5.88.2",
2727
"webpack-cli": "^5.1.4",

docs/reference/sizes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To check out a comprehensive list of which metrics are collected by Glean and th
1212
<!-- ! -->
1313
|| Size |
1414
|--|--|
15-
|web|**60 KB**|
15+
|web|**61 KB**|
1616
|webext|**61 KB**|
1717
|node|**61 KB**|
1818
|QML|**104 KB**|

0 commit comments

Comments
 (0)