@@ -136,22 +151,34 @@ exports[`MarkerTable renders some basic markers and updates when needed 1`] = `
>
0.000s
+
0s
+
UserTiming
+
0.002s
+
+
Paint
+
0.108s
+
unknown
+
IPC
+
0.153s
+
584.00ns
+
Text
+
0.153s
+
584.00ns
+
Text
+
0.158s
+
+
Log
+
0.162s
+
1ms
+
FileIO
+
diff --git a/src/test/components/__snapshots__/ProfileCallTreeView.test.js.snap b/src/test/components/__snapshots__/ProfileCallTreeView.test.js.snap
index 53f3829e06..25b2329a40 100644
--- a/src/test/components/__snapshots__/ProfileCallTreeView.test.js.snap
+++ b/src/test/components/__snapshots__/ProfileCallTreeView.test.js.snap
@@ -150,9 +150,11 @@ exports[`ProfileCallTreeView with JS Allocations matches the snapshot for JS all
>
Total Size (bytes)
+
Self (bytes)
+
+
100%
15
+
—
+
+
@@ -821,9 +928,11 @@ exports[`ProfileCallTreeView with balanced native allocations matches the snapsh
>
Total Size (bytes)
+
Self (bytes)
+
+
-100%
-15
+
—
+
+
@@ -1492,9 +1706,11 @@ exports[`ProfileCallTreeView with balanced native allocations matches the snapsh
>
Total Size (bytes)
+
Self (bytes)
+
+
100%
41
+
—
+
+
@@ -2151,9 +2472,11 @@ exports[`ProfileCallTreeView with unbalanced native allocations matches the snap
>
Total Size (bytes)
+
Self (bytes)
+
+
100%
15
+
—
+
+
@@ -2810,9 +3238,11 @@ exports[`ProfileCallTreeView with unbalanced native allocations matches the snap
>
Total Size (bytes)
+
Self (bytes)
+
+
-100%
-41
+
—
+
+
@@ -3765,9 +4274,11 @@ exports[`calltree/ProfileCallTreeView renders an inverted call tree 1`] = `
>
Total (samples)
+
Self
+
+
67%
2
+
2
+
+
@@ -4391,9 +5007,11 @@ exports[`calltree/ProfileCallTreeView renders an unfiltered call tree 1`] = `
>
Total (samples)
+
Self
+
+
100%
3
+
—
+
+
@@ -5017,9 +5740,11 @@ exports[`calltree/ProfileCallTreeView renders an unfiltered call tree with filen
>
Total (samples)
+
Self
+
+
100%
1
+
—
+
+
@@ -5466,9 +6257,11 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
>
Total (samples)
+
Self
+
+
100%
3
+
—
+
+
@@ -6092,9 +6990,11 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
>
Total (samples)
+
Self
+
+
100%
2
+
—
+
+
@@ -6659,9 +7651,11 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
>
Total (samples)
+
Self
+
+
100%
2
+
—
+
+
@@ -7226,9 +8312,11 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
>
Total (samples)
+
Self
+
+
100%
1
+
—
+
+
@@ -7676,9 +8830,11 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
>
Total (samples)
+
Self
+
+
100%
1
+
—
+
+
@@ -8126,9 +9348,11 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
>
Total (samples)
+
Self
+
+
100%
2
+
—
+
+
diff --git a/src/test/components/__snapshots__/Timeline.test.js.snap b/src/test/components/__snapshots__/Timeline.test.js.snap
new file mode 100644
index 0000000000..77465d5312
--- /dev/null
+++ b/src/test/components/__snapshots__/Timeline.test.js.snap
@@ -0,0 +1,331 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TimelineSelection renders the vertical line indicating the time position from the mouse cursor 1`] = `
+
+
+
+`;
diff --git a/src/test/components/__snapshots__/TrackPower.test.js.snap b/src/test/components/__snapshots__/TrackPower.test.js.snap
index baeb177d6c..9c8b7ca90f 100644
--- a/src/test/components/__snapshots__/TrackPower.test.js.snap
+++ b/src/test/components/__snapshots__/TrackPower.test.js.snap
@@ -27,7 +27,7 @@ exports[`TrackPower has a tooltip that matches the snapshot 1`] = `
Energy used in the visible range
:
- 7.2 µWh
+ 7.2 µWh (0.003 mg CO₂e)
`;
diff --git a/src/test/fixtures/mocks/domrect.js b/src/test/fixtures/mocks/domrect.js
index 6bd930ed82..1cee7af459 100644
--- a/src/test/fixtures/mocks/domrect.js
+++ b/src/test/fixtures/mocks/domrect.js
@@ -16,7 +16,7 @@ class DOMRect {
height: number;
constructor(x: number, y: number, width: number, height: number) {
- this.x = y;
+ this.x = x;
this.y = y;
this.width = width;
this.height = height;
diff --git a/src/test/fixtures/profiles/gecko-profile.js b/src/test/fixtures/profiles/gecko-profile.js
index 9d7d86bfb3..2ec9204c65 100644
--- a/src/test/fixtures/profiles/gecko-profile.js
+++ b/src/test/fixtures/profiles/gecko-profile.js
@@ -336,7 +336,7 @@ type TestDefinedGeckoMarker = {|
+endTime: Milliseconds | null,
+phase: MarkerPhase,
+category?: IndexIntoCategoryList,
- +data?: MarkerPayload_Gecko,
+ +data?: MarkerPayload_Gecko | null,
|};
function _createGeckoThreadWithMarkers(
diff --git a/src/test/fixtures/profiles/processed-profile.js b/src/test/fixtures/profiles/processed-profile.js
index e7b046d046..8678958473 100644
--- a/src/test/fixtures/profiles/processed-profile.js
+++ b/src/test/fixtures/profiles/processed-profile.js
@@ -75,7 +75,7 @@ export type TestDefinedMarkers = Array<
MarkerName,
MarkerTime, // start time
MarkerTime | null, // end time
- MarkerPayload | MockPayload
+ MarkerPayload | MockPayload | null
]
>;
@@ -86,7 +86,7 @@ export type TestDefinedRawMarker = {|
+endTime: Milliseconds | null,
+phase: MarkerPhase,
+category?: IndexIntoCategoryList,
- +data?: MarkerPayload,
+ +data?: MarkerPayload | null,
|};
export type TestDefinedJsTracerEvent = [
@@ -131,7 +131,7 @@ export function addMarkersToThreadWithCorrespondingSamples(
const startTime = tuple[1];
// Flow doesn't support variadic tuple types.
const maybeEndTime = (tuple: any)[2] || null;
- const payload: MarkerPayload = (tuple: any)[3] || null;
+ const payload: MarkerPayload | null = (tuple: any)[3] || null;
markersTable.name.push(stringTable.indexForString(name));
if (maybeEndTime === null) {
@@ -1042,7 +1042,13 @@ function _buildThreadFromTextOnlyStacks(
/**
* This returns a merged profile from a number of profile strings.
*/
-export function getMergedProfileFromTextSamples(...profileStrings: string[]): {
+export function getMergedProfileFromTextSamples(
+ profileStrings: string[],
+ cpuValuesPerProfile: Array<{|
+ threadCPUDelta: Array,
+ threadCPUDeltaUnit: ThreadCPUDeltaUnit,
+ |} | null> = []
+): {
profile: Profile,
funcNamesPerThread: Array,
funcNamesDictPerThread: Array<{ [funcName: string]: number }>,
@@ -1051,6 +1057,16 @@ export function getMergedProfileFromTextSamples(...profileStrings: string[]): {
getProfileFromTextSamples(str)
);
const profiles = profilesAndFuncNames.map(({ profile }) => profile);
+ cpuValuesPerProfile.forEach((cpuValues, profileIndex) => {
+ if (cpuValues) {
+ addCpuUsageValues(
+ profiles[profileIndex],
+ cpuValues.threadCPUDelta,
+ cpuValues.threadCPUDeltaUnit
+ );
+ }
+ });
+
const profileState = stateFromLocation({
pathname: '/public/fakehash1/',
search: '?thread=0&v=3',
diff --git a/src/test/store/profile-view.test.js b/src/test/store/profile-view.test.js
index 5d02a43a8f..a80f9020ac 100644
--- a/src/test/store/profile-view.test.js
+++ b/src/test/store/profile-view.test.js
@@ -540,10 +540,10 @@ describe('actions/ProfileView', function () {
trackIndex: 2,
};
- const { profile } = getMergedProfileFromTextSamples(
+ const { profile } = getMergedProfileFromTextSamples([
'A B C',
- 'A B B'
- );
+ 'A B B',
+ ]);
const { getState, dispatch } = storeWithProfile(profile);
dispatch(App.changeSelectedTab('flame-graph'));
@@ -2900,18 +2900,18 @@ describe('getTimingsForSidebar', () => {
describe('for a diffing track', function () {
function setup() {
const { profile, funcNamesDictPerThread } =
- getMergedProfileFromTextSamples(
+ getMergedProfileFromTextSamples([
`
- A A A
- B B C
- D[cat:Layout] E F
- `,
+ A A A
+ B B C
+ D[cat:Layout] E F
+ `,
`
- A A A
- B B B
- Gjs I E
- `
- );
+ A A A
+ B B B
+ Gjs I E
+ `,
+ ]);
const store = storeWithProfile(profile);
store.dispatch(ProfileView.changeSelectedThreads(new Set([2])));
diff --git a/src/test/store/receive-profile.test.js b/src/test/store/receive-profile.test.js
index 452023d21d..4b353a557c 100644
--- a/src/test/store/receive-profile.test.js
+++ b/src/test/store/receive-profile.test.js
@@ -3,9 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// @flow
-import type { Profile } from 'firefox-profiler/types';
-
import { oneLineTrim } from 'common-tags';
+import JSZip from 'jszip';
+import { indexedDB } from 'fake-indexeddb';
import { ensureExists } from 'firefox-profiler/utils/flow';
import {
@@ -14,7 +14,6 @@ import {
} from '../../profile-logic/data-structures';
import { getTimeRangeForThread } from '../../profile-logic/profile-data';
import { viewProfileFromPathInZipFile } from '../../actions/zipped-profiles';
-import { blankStore } from '../fixtures/stores';
import * as ProfileViewSelectors from '../../selectors/profile';
import * as ZippedProfilesSelectors from '../../selectors/zipped-profiles';
import * as UrlStateSelectors from '../../selectors/url-state';
@@ -35,10 +34,9 @@ import {
changeTimelineTrackOrganization,
} from '../../actions/receive-profile';
import { SymbolsNotFoundError } from '../../profile-logic/errors';
-import { indexedDB } from 'fake-indexeddb';
import { createGeckoProfile } from '../fixtures/profiles/gecko-profile';
-import JSZip from 'jszip';
+import { blankStore, storeWithProfile } from '../fixtures/stores';
import {
makeProfileSerializable,
processGeckoProfile,
@@ -46,6 +44,7 @@ import {
} from '../../profile-logic/process-profile';
import {
getProfileFromTextSamples,
+ getMergedProfileFromTextSamples,
addMarkersToThreadWithCorrespondingSamples,
getProfileWithMarkers,
getProfileWithThreadCPUDelta,
@@ -58,6 +57,8 @@ import { waitUntilState } from '../fixtures/utils';
import { compress } from '../../utils/gz';
+import type { Profile } from 'firefox-profiler/types';
+
// Mocking SymbolStoreDB. By default the functions will return undefined, which
// will make the symbolication move forward with some bogus information.
// If you need to simulate that it doesn't have the information, use the
@@ -397,6 +398,22 @@ describe('actions/receive-profile', function () {
]);
});
+ it(`won't hide any tracks in a profile resulting from a compare operation`, () => {
+ const { profile } = getMergedProfileFromTextSamples([
+ 'A',
+ 'A '.repeat(100),
+ ]);
+
+ const store = storeWithProfile(profile);
+
+ store.dispatch(viewProfile(profile));
+ expect(getHumanReadableTracks(store.getState())).toEqual([
+ 'show [thread Empty default] SELECTED',
+ 'show [thread Empty default]',
+ 'show [thread Diff between 1 and 2 comparison]',
+ ]);
+ });
+
describe('with threadCPUDelta', function () {
it('will show a thread when the relative CPU usage is above 10%', function () {
const store = blankStore();
@@ -474,6 +491,31 @@ describe('actions/receive-profile', function () {
' - show [thread Thread with 10% CPU] SELECTED', // <- Ensure this thread is not hidden.
]);
});
+
+ it(`won't hide any tracks in a profile resulting from a compare operation`, () => {
+ const { profile } = getMergedProfileFromTextSamples(
+ ['A A A A', 'B B B B'],
+ [
+ {
+ threadCPUDelta: [10, 10, 10, 10_000_000],
+ threadCPUDeltaUnit: 'ns',
+ },
+ {
+ threadCPUDelta: [10, 10_000_000, 10, 25],
+ threadCPUDeltaUnit: 'ns',
+ },
+ ]
+ );
+
+ const store = storeWithProfile(profile);
+
+ store.dispatch(viewProfile(profile));
+ expect(getHumanReadableTracks(store.getState())).toEqual([
+ 'show [thread Empty default] SELECTED',
+ 'show [thread Empty default]',
+ 'show [thread Diff between 1 and 2 comparison]',
+ ]);
+ });
});
describe('too many threads', function () {
diff --git a/src/test/store/useful-tabs.test.js b/src/test/store/useful-tabs.test.js
index 70fe17e467..96a2a890f8 100644
--- a/src/test/store/useful-tabs.test.js
+++ b/src/test/store/useful-tabs.test.js
@@ -51,7 +51,7 @@ describe('getUsefulTabs', function () {
});
it('shows only the call tree when a diffing track is selected', function () {
- const { profile } = getMergedProfileFromTextSamples('A B C', 'A B B');
+ const { profile } = getMergedProfileFromTextSamples(['A B C', 'A B B']);
const { getState, dispatch } = storeWithProfile(profile);
expect(selectedThreadSelectors.getUsefulTabs(getState())).toEqual([
'calltree',
diff --git a/src/test/unit/__snapshots__/profile-conversion.test.js.snap b/src/test/unit/__snapshots__/profile-conversion.test.js.snap
index 942d87f59a..9b27ebba3a 100644
--- a/src/test/unit/__snapshots__/profile-conversion.test.js.snap
+++ b/src/test/unit/__snapshots__/profile-conversion.test.js.snap
@@ -402777,14 +402777,14 @@ Object {
],
"column": Array [
null,
- 1757,
+ 1758,
null,
null,
- 1363,
- 1783,
- 3420,
- 463,
- 1783,
+ 1364,
+ 1784,
+ 3421,
+ 464,
+ 1784,
null,
null,
null,
@@ -402793,14 +402793,14 @@ Object {
null,
null,
null,
- 4543,
- 1326,
+ 4544,
+ 1327,
null,
- 29,
+ 30,
null,
- 5197,
- 5375,
- 296,
+ 5198,
+ 5376,
+ 297,
null,
],
"func": Array [
@@ -402891,14 +402891,14 @@ Object {
"length": 26,
"line": Array [
null,
- 1,
+ 2,
null,
null,
- 1,
- 25,
- 25,
- 1,
- 25,
+ 2,
+ 26,
+ 26,
+ 2,
+ 26,
null,
null,
null,
@@ -402907,14 +402907,14 @@ Object {
null,
null,
null,
- 25,
- 28,
+ 26,
+ 29,
null,
- 1,
+ 2,
null,
- 25,
- 25,
- 1,
+ 26,
+ 26,
+ 2,
null,
],
"nativeSymbol": Array [
@@ -403005,13 +403005,13 @@ Object {
"funcTable": Object {
"columnNumber": Array [
null,
- 1757,
+ 1758,
null,
null,
- 1363,
- 1783,
- 3420,
- 463,
+ 1364,
+ 1784,
+ 3421,
+ 464,
null,
null,
null,
@@ -403020,14 +403020,14 @@ Object {
null,
null,
null,
- 4543,
- 1326,
+ 4544,
+ 1327,
null,
- 29,
+ 30,
null,
- 5197,
- 5375,
- 296,
+ 5198,
+ 5376,
+ 297,
null,
],
"fileName": Array [
@@ -403087,13 +403087,13 @@ Object {
"length": 25,
"lineNumber": Array [
null,
- 1,
+ 2,
null,
null,
- 1,
- 25,
- 25,
- 1,
+ 2,
+ 26,
+ 26,
+ 2,
null,
null,
null,
@@ -403102,14 +403102,14 @@ Object {
null,
null,
null,
- 25,
- 28,
+ 26,
+ 29,
null,
- 1,
+ 2,
null,
- 25,
- 25,
- 1,
+ 26,
+ 26,
+ 2,
null,
],
"name": Array [
@@ -444269,50 +444269,50 @@ Object {
"column": Array [
null,
null,
- 32,
+ 33,
null,
null,
null,
null,
null,
- 22,
- 22,
- 16,
+ 23,
+ 23,
+ 17,
null,
- 34,
- 22,
- 20,
- 20,
- 26,
- 52,
- 29,
+ 35,
+ 23,
+ 21,
+ 21,
+ 27,
+ 53,
+ 30,
null,
null,
null,
+ 26,
25,
- 24,
null,
- 37,
- 21,
- 32,
+ 38,
+ 22,
+ 33,
null,
null,
null,
- 16,
+ 17,
null,
null,
- 16,
- 22,
- 20,
- 29,
- 18,
+ 17,
+ 23,
+ 21,
30,
- 18,
- 74,
- 24,
+ 19,
+ 31,
+ 19,
+ 75,
+ 25,
null,
- 30,
- 30,
+ 31,
+ 31,
null,
],
"func": Array [
@@ -444467,50 +444467,50 @@ Object {
"line": Array [
null,
null,
- 3338,
+ 3339,
null,
null,
null,
null,
null,
- 75674,
- 75624,
- 65,
+ 75675,
+ 75625,
+ 66,
null,
- 70,
- 73232,
- 73084,
- 72908,
- 74574,
- 74061,
- 74281,
+ 71,
+ 73233,
+ 73085,
+ 72909,
+ 74575,
+ 74062,
+ 74282,
null,
null,
null,
- 27197,
- 27498,
+ 27198,
+ 27499,
null,
- 26821,
- 27773,
- 28117,
+ 26822,
+ 27774,
+ 28118,
null,
null,
null,
- 137,
+ 138,
null,
null,
- 32,
- 73232,
- 73084,
- 74281,
- 74613,
- 13073,
- 79762,
- 74085,
- 73822,
+ 33,
+ 73233,
+ 73085,
+ 74282,
+ 74614,
+ 13074,
+ 79763,
+ 74086,
+ 73823,
null,
- 13073,
- 13382,
+ 13074,
+ 13383,
null,
],
"nativeSymbol": Array [
@@ -444665,45 +444665,45 @@ Object {
"columnNumber": Array [
null,
null,
- 32,
+ 33,
null,
null,
null,
null,
- 22,
- 22,
- 16,
+ 23,
+ 23,
+ 17,
null,
- 34,
- 22,
- 20,
- 20,
- 26,
- 52,
- 29,
+ 35,
+ 23,
+ 21,
+ 21,
+ 27,
+ 53,
+ 30,
null,
null,
null,
null,
+ 26,
25,
- 24,
null,
- 37,
- 21,
- 32,
+ 38,
+ 22,
+ 33,
null,
null,
null,
- 16,
+ 17,
null,
null,
- 16,
- 18,
- 30,
- 18,
- 74,
- 24,
- 30,
+ 17,
+ 19,
+ 31,
+ 19,
+ 75,
+ 25,
+ 31,
],
"fileName": Array [
null,
@@ -444795,45 +444795,45 @@ Object {
"lineNumber": Array [
null,
null,
- 3338,
+ 3339,
null,
null,
null,
null,
- 75674,
- 75624,
- 65,
+ 75675,
+ 75625,
+ 66,
null,
- 70,
- 73232,
- 73084,
- 72908,
- 74574,
- 74061,
- 74281,
+ 71,
+ 73233,
+ 73085,
+ 72909,
+ 74575,
+ 74062,
+ 74282,
null,
null,
null,
null,
- 27197,
- 27498,
+ 27198,
+ 27499,
null,
- 26821,
- 27773,
- 28117,
+ 26822,
+ 27774,
+ 28118,
null,
null,
null,
- 137,
+ 138,
null,
null,
- 32,
- 74613,
- 13073,
- 79762,
- 74085,
- 73822,
- 13382,
+ 33,
+ 74614,
+ 13074,
+ 79763,
+ 74086,
+ 73823,
+ 13383,
],
"name": Array [
0,
@@ -447302,50 +447302,50 @@ Object {
"column": Array [
null,
null,
- 32,
+ 33,
null,
null,
null,
null,
null,
- 22,
- 22,
- 16,
+ 23,
+ 23,
+ 17,
null,
- 34,
- 22,
- 20,
- 20,
- 26,
- 52,
- 29,
+ 35,
+ 23,
+ 21,
+ 21,
+ 27,
+ 53,
+ 30,
null,
null,
null,
+ 26,
25,
- 24,
null,
- 37,
- 21,
- 32,
+ 38,
+ 22,
+ 33,
null,
null,
null,
- 16,
+ 17,
null,
null,
- 16,
- 22,
- 20,
- 29,
- 18,
+ 17,
+ 23,
+ 21,
30,
- 18,
- 74,
- 24,
+ 19,
+ 31,
+ 19,
+ 75,
+ 25,
null,
- 30,
- 30,
+ 31,
+ 31,
null,
],
"func": Array [
@@ -447500,50 +447500,50 @@ Object {
"line": Array [
null,
null,
- 3338,
+ 3339,
null,
null,
null,
null,
null,
- 75674,
- 75624,
- 65,
+ 75675,
+ 75625,
+ 66,
null,
- 70,
- 73232,
- 73084,
- 72908,
- 74574,
- 74061,
- 74281,
+ 71,
+ 73233,
+ 73085,
+ 72909,
+ 74575,
+ 74062,
+ 74282,
null,
null,
null,
- 27197,
- 27498,
+ 27198,
+ 27499,
null,
- 26821,
- 27773,
- 28117,
+ 26822,
+ 27774,
+ 28118,
null,
null,
null,
- 137,
+ 138,
null,
null,
- 32,
- 73232,
- 73084,
- 74281,
- 74613,
- 13073,
- 79762,
- 74085,
- 73822,
+ 33,
+ 73233,
+ 73085,
+ 74282,
+ 74614,
+ 13074,
+ 79763,
+ 74086,
+ 73823,
null,
- 13073,
- 13382,
+ 13074,
+ 13383,
null,
],
"nativeSymbol": Array [
@@ -447698,45 +447698,45 @@ Object {
"columnNumber": Array [
null,
null,
- 32,
+ 33,
null,
null,
null,
null,
- 22,
- 22,
- 16,
+ 23,
+ 23,
+ 17,
null,
- 34,
- 22,
- 20,
- 20,
- 26,
- 52,
- 29,
+ 35,
+ 23,
+ 21,
+ 21,
+ 27,
+ 53,
+ 30,
null,
null,
null,
null,
+ 26,
25,
- 24,
null,
- 37,
- 21,
- 32,
+ 38,
+ 22,
+ 33,
null,
null,
null,
- 16,
+ 17,
null,
null,
- 16,
- 18,
- 30,
- 18,
- 74,
- 24,
- 30,
+ 17,
+ 19,
+ 31,
+ 19,
+ 75,
+ 25,
+ 31,
],
"fileName": Array [
null,
@@ -447828,45 +447828,45 @@ Object {
"lineNumber": Array [
null,
null,
- 3338,
+ 3339,
null,
null,
null,
null,
- 75674,
- 75624,
- 65,
+ 75675,
+ 75625,
+ 66,
null,
- 70,
- 73232,
- 73084,
- 72908,
- 74574,
- 74061,
- 74281,
+ 71,
+ 73233,
+ 73085,
+ 72909,
+ 74575,
+ 74062,
+ 74282,
null,
null,
null,
null,
- 27197,
- 27498,
+ 27198,
+ 27499,
null,
- 26821,
- 27773,
- 28117,
+ 26822,
+ 27774,
+ 28118,
null,
null,
null,
- 137,
+ 138,
null,
null,
- 32,
- 74613,
- 13073,
- 79762,
- 74085,
- 73822,
- 13382,
+ 33,
+ 74614,
+ 13074,
+ 79763,
+ 74086,
+ 73823,
+ 13383,
],
"name": Array [
0,
diff --git a/src/test/unit/merge-compare.test.js b/src/test/unit/merge-compare.test.js
index 57fd303484..a35983e0d3 100644
--- a/src/test/unit/merge-compare.test.js
+++ b/src/test/unit/merge-compare.test.js
@@ -481,7 +481,7 @@ describe('mergeThreads function', function () {
// Check if we properly merged the string tables and have the correct url fields.
const markerUrlsAfterMerge = mergedMarkers.data.map((markerData) =>
- markerData && 'url' in markerData && markerData.url
+ markerData && 'url' in markerData && typeof markerData.url === 'number'
? markerData.url
: null
);
diff --git a/src/test/unit/process-profile.test.js b/src/test/unit/process-profile.test.js
index 1ffe854ded..d95b7169cc 100644
--- a/src/test/unit/process-profile.test.js
+++ b/src/test/unit/process-profile.test.js
@@ -664,14 +664,15 @@ describe('profile meta processing', function () {
});
describe('visualMetrics processing', function () {
- function checkVisualMetricsForThread(thread: Thread) {
- const metrics = [
- { name: 'Visual', changeMarkerLength: 7 },
- { name: 'ContentfulSpeedIndex', changeMarkerLength: 6 },
- { name: 'PerceptualSpeedIndex', changeMarkerLength: 6 },
- ];
-
- for (const { name, changeMarkerLength } of metrics) {
+ function checkVisualMetricsForThread(
+ thread: Thread,
+ metrics: Array<{|
+ name: string,
+ hasProgressMarker: boolean,
+ changeMarkerLength: number,
+ |}>
+ ) {
+ for (const { name, hasProgressMarker, changeMarkerLength } of metrics) {
// Check the visual metric progress markers.
const metricProgressMarkerIndex = thread.stringTable.indexForString(
`${name} Progress`
@@ -679,7 +680,12 @@ describe('visualMetrics processing', function () {
const metricProgressMarker = thread.markers.name.find(
(name) => name === metricProgressMarkerIndex
);
- expect(metricProgressMarker).toBeTruthy();
+
+ if (hasProgressMarker) {
+ expect(metricProgressMarker).toBeTruthy();
+ } else {
+ expect(metricProgressMarker).toBeFalsy();
+ }
// Check the visual metric change markers.
const metricChangeMarkerIndex = thread.stringTable.indexForString(
@@ -712,7 +718,19 @@ describe('visualMetrics processing', function () {
throw new Error('Could not find the parent process main thread.');
}
- checkVisualMetricsForThread(parentProcessMainThread);
+ checkVisualMetricsForThread(parentProcessMainThread, [
+ { name: 'Visual', hasProgressMarker: true, changeMarkerLength: 7 },
+ {
+ name: 'ContentfulSpeedIndex',
+ hasProgressMarker: true,
+ changeMarkerLength: 6,
+ },
+ {
+ name: 'PerceptualSpeedIndex',
+ hasProgressMarker: true,
+ changeMarkerLength: 6,
+ },
+ ]);
});
it('adds markers to the tab process', function () {
@@ -734,6 +752,67 @@ describe('visualMetrics processing', function () {
throw new Error('Could not find the tab process main thread.');
}
- checkVisualMetricsForThread(tabProcessMainThread);
+ checkVisualMetricsForThread(tabProcessMainThread, [
+ { name: 'Visual', hasProgressMarker: true, changeMarkerLength: 7 },
+ {
+ name: 'ContentfulSpeedIndex',
+ hasProgressMarker: true,
+ changeMarkerLength: 6,
+ },
+ {
+ name: 'PerceptualSpeedIndex',
+ hasProgressMarker: true,
+ changeMarkerLength: 6,
+ },
+ ]);
+ });
+
+ it('does not add markers to the parent process if metric timestamps are null', function () {
+ const geckoProfile = createGeckoProfile();
+ const visualMetrics = getVisualMetrics();
+
+ // Make all the VisualProgress timestamps null on purpose.
+ visualMetrics.VisualProgress = visualMetrics.VisualProgress.map(
+ (progress) => ({ ...progress, timestamp: null })
+ );
+ // Make only one ContentfulSpeedIndexProgress timestamp null on purpose.
+ ensureExists(visualMetrics.ContentfulSpeedIndexProgress)[0].timestamp =
+ null;
+
+ // Add the visual metrics to the profile.
+ geckoProfile.meta.visualMetrics = visualMetrics;
+ // Make sure that the visual metrics are not changed.
+ expect(visualMetrics.VisualProgress).toHaveLength(7);
+ expect(visualMetrics.ContentfulSpeedIndexProgress).toHaveLength(6);
+ expect(visualMetrics.PerceptualSpeedIndexProgress).toHaveLength(6);
+
+ // Processing the profile.
+ const processedProfile = processGeckoProfile(geckoProfile);
+ const parentProcessMainThread = processedProfile.threads.find(
+ (thread) =>
+ thread.name === 'GeckoMain' && thread.processType === 'default'
+ );
+
+ if (!parentProcessMainThread) {
+ throw new Error('Could not find the parent process main thread.');
+ }
+
+ checkVisualMetricsForThread(parentProcessMainThread, [
+ // Instead of 7, we should have 0 markers for Visual because we made all
+ // the timestamps null.
+ { name: 'Visual', hasProgressMarker: false, changeMarkerLength: 0 },
+ // Instead of 6, we should have 5 markers for ContentfulSpeedIndex.
+ {
+ name: 'ContentfulSpeedIndex',
+ hasProgressMarker: true,
+ changeMarkerLength: 5,
+ },
+ // We didn't change the PerceptualSpeedIndexProgress, so we should have 6.
+ {
+ name: 'PerceptualSpeedIndex',
+ hasProgressMarker: true,
+ changeMarkerLength: 6,
+ },
+ ]);
});
});
diff --git a/src/test/unit/profile-tree.test.js b/src/test/unit/profile-tree.test.js
index 12a242ff21..284e4a4f6e 100644
--- a/src/test/unit/profile-tree.test.js
+++ b/src/test/unit/profile-tree.test.js
@@ -562,18 +562,18 @@ describe('inverted call tree', function () {
describe('diffing trees', function () {
function getProfile() {
- const { profile } = getMergedProfileFromTextSamples(
+ const { profile } = getMergedProfileFromTextSamples([
`
- A A A
- B B C
- D E F
- `,
+ A A A
+ B B C
+ D E F
+ `,
`
- A A A
- B B B
- G I E
- `
- );
+ A A A
+ B B B
+ G I E
+ `,
+ ]);
return profile;
}
diff --git a/src/test/unit/sanitize.test.js b/src/test/unit/sanitize.test.js
index 87e6337769..8265d53d18 100644
--- a/src/test/unit/sanitize.test.js
+++ b/src/test/unit/sanitize.test.js
@@ -65,10 +65,55 @@ describe('sanitizePII', function () {
}
);
+ const markerSchemaByName = {
+ FileIO: {
+ name: 'FileIO',
+ display: ['marker-chart', 'marker-table', 'timeline-fileio'],
+ data: [
+ {
+ key: 'operation',
+ label: 'Operation',
+ format: 'string',
+ searchable: true,
+ },
+ {
+ key: 'source',
+ label: 'Source',
+ format: 'string',
+ searchable: true,
+ },
+ {
+ key: 'filename',
+ label: 'Filename',
+ format: 'file-path',
+ searchable: true,
+ },
+ {
+ key: 'threadId',
+ label: 'Thread ID',
+ format: 'string',
+ searchable: true,
+ },
+ ],
+ },
+ Url: {
+ name: 'Url',
+ tableLabel: '{marker.name} - {marker.data.url}',
+ display: ['marker-chart', 'marker-table'],
+ data: [
+ {
+ key: 'url',
+ format: 'url',
+ },
+ ],
+ },
+ };
+
const sanitizedProfile = sanitizePII(
originalProfile,
derivedMarkerInfoForAllThreads,
- PIIToRemove
+ PIIToRemove,
+ markerSchemaByName
).profile;
return {
@@ -548,6 +593,38 @@ describe('sanitizePII', function () {
expect(marker2.filename).toBe('\\' + marker2File);
});
+ it('should sanitize the URL properties in markers', function () {
+ const { sanitizedProfile } = setup(
+ {
+ shouldRemoveUrls: true,
+ },
+ getProfileWithMarkers([
+ [
+ 'SpeculativeConnect',
+ 1,
+ 2,
+ {
+ type: 'Url',
+ url: 'https://img-getpocket.cdn.mozilla.net',
+ },
+ ],
+ ])
+ );
+ expect(sanitizedProfile.threads.length).toEqual(1);
+ const thread = sanitizedProfile.threads[0];
+ expect(thread.markers.length).toEqual(1);
+
+ const marker = thread.markers.data[0];
+
+ // The url fields should still be there
+ if (!marker || !marker.url) {
+ throw new Error('Failed to find url property in the payload');
+ }
+
+ // Now check the url fields and make sure they are sanitized.
+ expect(marker.url).toBe('https://');
+ });
+
it('should sanitize the eTLD+1 field if urls are supposed to be sanitized', function () {
// Create a simple profile with eTLD+1 field in its thread.
const { profile } = getProfileFromTextSamples('A');
diff --git a/src/types/actions.js b/src/types/actions.js
index fbdc6ca10a..17435ba2c8 100644
--- a/src/types/actions.js
+++ b/src/types/actions.js
@@ -37,6 +37,7 @@ import type {
State,
UploadedProfileInformation,
SourceLoadingError,
+ TableViewOptions,
} from './state';
import type { CssPixels, StartEndRange, Milliseconds } from './units';
import type { BrowserConnectionStatus } from '../app-logic/browser-connection';
@@ -170,6 +171,15 @@ export type Localization = ReactLocalization;
// stored in the same property to accommodate all OSes.
export type KeyboardModifiers = {| ctrlOrMeta: boolean, shift: boolean |};
+/**
+ * This type gives some context about the action leading to a selection.
+ */
+export type SelectionContext = {|
+ // This is the source for this selection: is it a keyboard or a pointer event,
+ // or is it the result of some automatic selection.
+ +source: 'keyboard' | 'pointer' | 'auto',
+|};
+
type ProfileAction =
| {|
+type: 'ROUTE_NOT_FOUND',
@@ -185,6 +195,7 @@ type ProfileAction =
+threadsKey: ThreadsKey,
+selectedCallNodePath: CallNodePath,
+optionalExpandedToCallNodePath: ?CallNodePath,
+ +context: SelectionContext,
|}
| {|
+type: 'UPDATE_TRACK_THREAD_HEIGHT',
@@ -208,11 +219,13 @@ type ProfileAction =
+type: 'CHANGE_SELECTED_MARKER',
+threadsKey: ThreadsKey,
+selectedMarker: MarkerIndex | null,
+ +context: SelectionContext,
|}
| {|
+type: 'CHANGE_SELECTED_NETWORK_MARKER',
+threadsKey: ThreadsKey,
+selectedNetworkMarker: MarkerIndex | null,
+ +context: SelectionContext,
|}
| {|
+type: 'CHANGE_RIGHT_CLICKED_MARKER',
@@ -503,6 +516,11 @@ type UrlStateAction =
+type: 'CHANGE_MOUSE_TIME_POSITION',
+mouseTimePosition: Milliseconds | null,
|}
+ | {|
+ +type: 'CHANGE_TABLE_VIEW_OPTIONS',
+ +tab: TabSlug,
+ +tableViewOptions: TableViewOptions,
+ |}
| {|
+type: 'TOGGLE_RESOURCES_PANEL',
+selectedThreadIndexes: Set,
diff --git a/src/types/gecko-profile.js b/src/types/gecko-profile.js
index 54337729d5..dd5b05ef2d 100644
--- a/src/types/gecko-profile.js
+++ b/src/types/gecko-profile.js
@@ -44,7 +44,7 @@ export type GeckoMarkerTuple = [
Milliseconds | null,
MarkerPhase,
IndexIntoCategoryList,
- MarkerPayload_Gecko
+ MarkerPayload_Gecko | null
];
export type GeckoMarkers = {
@@ -70,7 +70,7 @@ export type GeckoMarkerStruct = {|
startTime: Milliseconds[],
endTime: Milliseconds[],
phase: MarkerPhase[],
- data: MarkerPayload_Gecko[],
+ data: Array,
category: IndexIntoCategoryList[],
length: number,
|};
diff --git a/src/types/libdef/npm/@tgwf/co2_vx.x.x.js b/src/types/libdef/npm/@tgwf/co2_vx.x.x.js
new file mode 100644
index 0000000000..ceedac16bc
--- /dev/null
+++ b/src/types/libdef/npm/@tgwf/co2_vx.x.x.js
@@ -0,0 +1,18 @@
+// flow-typed signature: b2f76cdf45a9f020ccc81f4258e36209
+// flow-typed version: <>/@tgwf/co2_v0.11.4/flow_v0.96.0
+
+/**
+ * This is an autogenerated libdef stub for:
+ *
+ * '@tgwf/co2'
+ *
+ * Fill this stub out by replacing all the `any` types.
+ *
+ * Once filled out, we encourage you to share your work with the
+ * community by sending a pull request to:
+ * https://github.com/flowtype/flow-typed
+ */
+
+declare module '@tgwf/co2' {
+ declare module.exports: any;
+}
\ No newline at end of file
diff --git a/src/types/markers.js b/src/types/markers.js
index a996bd64c6..bfe9c1b383 100644
--- a/src/types/markers.js
+++ b/src/types/markers.js
@@ -20,9 +20,7 @@ export type MarkerFormatType =
// String types.
// Show the URL, and handle PII sanitization
- // TODO Handle PII sanitization. Issue #2757
| 'url'
- // TODO Handle PII sanitization. Issue #2757
// Show the file path, and handle PII sanitization.
| 'file-path'
// Important, do not put URL or file path information here, as it will not be
@@ -136,7 +134,7 @@ export type CauseBacktrace = {|
// `tid` is optional because older processed profiles may not have it.
// No upgrader was written for this change.
tid?: Tid,
- time: Milliseconds,
+ time?: Milliseconds,
stack: IndexIntoStackTable,
|};
@@ -734,6 +732,11 @@ export type NoPayloadUserData = {|
innerWindowID?: number,
|};
+export type UrlMarkerPayload = {|
+ type: 'Url',
+ url: string,
+|};
+
/**
* The union of all the different marker payloads that profiler.firefox.com knows about,
* this is not guaranteed to be all the payloads that we actually get from the Gecko
@@ -767,7 +770,7 @@ export type MarkerPayload =
| JankPayload
| BrowsertimeMarkerPayload
| NoPayloadUserData
- | null;
+ | UrlMarkerPayload;
export type MarkerPayload_Gecko =
| GPUMarkerPayload
@@ -789,12 +792,11 @@ export type MarkerPayload_Gecko =
| IPCMarkerPayload_Gecko
| MediaSampleMarkerPayload
| NoPayloadUserData
+ | UrlMarkerPayload
// The following payloads come in with a stack property. During the profile processing
// the "stack" property is are converted into a "cause". See the CauseBacktrace type
// for more information.
| $ReplaceCauseWithStack
| $ReplaceCauseWithStack
| $ReplaceCauseWithStack
- | $ReplaceCauseWithStack
- // Payloads can be null.
- | null;
+ | $ReplaceCauseWithStack;
diff --git a/src/types/profile-derived.js b/src/types/profile-derived.js
index 2b86b325a6..d8f413437c 100644
--- a/src/types/profile-derived.js
+++ b/src/types/profile-derived.js
@@ -197,7 +197,7 @@ export type Marker = {|
name: string,
category: IndexIntoCategoryList,
threadId: Tid | null,
- data: MarkerPayload,
+ data: MarkerPayload | null,
incomplete?: boolean,
|};
diff --git a/src/types/profile.js b/src/types/profile.js
index ff995f28fa..e57a2d92be 100644
--- a/src/types/profile.js
+++ b/src/types/profile.js
@@ -253,7 +253,7 @@ export type ProfilerMarkerPayload = {
* it into a structured marker.
*/
export type RawMarkerTable = {|
- data: MarkerPayload[],
+ data: Array,
name: IndexIntoStringTable[],
startTime: Array,
endTime: Array,
@@ -681,7 +681,8 @@ export type ProgressGraphData = {|
// A percentage that describes the visual completeness of the webpage, ranging from 0% - 100%
percent: number,
// The time in milliseconds which the sample was taken.
- timestamp: Milliseconds,
+ // This can be null due to https://github.com/sitespeedio/browsertime/issues/1746.
+ timestamp: Milliseconds | null,
|};
/**
diff --git a/src/types/state.js b/src/types/state.js
index 9cd8fb2a23..6c423b4984 100644
--- a/src/types/state.js
+++ b/src/types/state.js
@@ -57,6 +57,12 @@ export type ThreadViewOptions = {|
export type ThreadViewOptionsPerThreads = { [ThreadsKey]: ThreadViewOptions };
+export type TableViewOptions = {|
+ +fixedColumnWidths: Array | null,
+|};
+
+export type TableViewOptionsPerTab = { [TabSlug]: TableViewOptions };
+
export type RightClickedCallNode = {|
+threadsKey: ThreadsKey,
+callNodePath: CallNodePath,
@@ -108,6 +114,7 @@ export type ProfileViewState = {
rightClickedMarker: MarkerReference | null,
hoveredMarker: MarkerReference | null,
mouseTimePosition: Milliseconds | null,
+ perTab: TableViewOptionsPerTab,
|},
+profile: Profile | null,
+full: FullProfileViewState,
diff --git a/yarn.lock b/yarn.lock
index b7950daf4b..be90746f4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,10 +31,10 @@
jsonpointer "^5.0.0"
leven "^3.1.0"
-"@babel/cli@^7.19.3":
- version "7.19.3"
- resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.19.3.tgz#55914ed388e658e0b924b3a95da1296267e278e2"
- integrity sha512-643/TybmaCAe101m2tSVHi9UKpETXP9c/Ff4mD2tAwkdP6esKIfaauZFc67vGEM6r9fekbEGid+sZhbEnSe3dg==
+"@babel/cli@^7.20.7":
+ version "7.20.7"
+ resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.20.7.tgz#8fc12e85c744a1a617680eacb488fab1fcd35b7c"
+ integrity sha512-WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ==
dependencies:
"@jridgewell/trace-mapping" "^0.3.8"
commander "^4.0.1"
@@ -54,26 +54,26 @@
dependencies:
"@babel/highlight" "^7.18.6"
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1":
- version "7.20.1"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
- integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5":
+ version "7.20.10"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec"
+ integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==
-"@babel/core@^7.0.0", "@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.20.5":
- version "7.20.5"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
- integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
+"@babel/core@^7.0.0", "@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.20.7":
+ version "7.20.7"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f"
+ integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==
dependencies:
"@ampproject/remapping" "^2.1.0"
"@babel/code-frame" "^7.18.6"
- "@babel/generator" "^7.20.5"
- "@babel/helper-compilation-targets" "^7.20.0"
- "@babel/helper-module-transforms" "^7.20.2"
- "@babel/helpers" "^7.20.5"
- "@babel/parser" "^7.20.5"
- "@babel/template" "^7.18.10"
- "@babel/traverse" "^7.20.5"
- "@babel/types" "^7.20.5"
+ "@babel/generator" "^7.20.7"
+ "@babel/helper-compilation-targets" "^7.20.7"
+ "@babel/helper-module-transforms" "^7.20.7"
+ "@babel/helpers" "^7.20.7"
+ "@babel/parser" "^7.20.7"
+ "@babel/template" "^7.20.7"
+ "@babel/traverse" "^7.20.7"
+ "@babel/types" "^7.20.7"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -96,12 +96,12 @@
dependencies:
eslint-rule-composer "^0.3.0"
-"@babel/generator@^7.20.5", "@babel/generator@^7.7.2":
- version "7.20.5"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
- integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
+"@babel/generator@^7.20.7", "@babel/generator@^7.7.2":
+ version "7.20.7"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
+ integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==
dependencies:
- "@babel/types" "^7.20.5"
+ "@babel/types" "^7.20.7"
"@jridgewell/gen-mapping" "^0.3.2"
jsesc "^2.5.1"
@@ -120,14 +120,15 @@
"@babel/helper-explode-assignable-expression" "^7.18.6"
"@babel/types" "^7.18.6"
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0":
- version "7.20.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
- integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7":
+ version "7.20.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
+ integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==
dependencies:
- "@babel/compat-data" "^7.20.0"
+ "@babel/compat-data" "^7.20.5"
"@babel/helper-validator-option" "^7.18.6"
browserslist "^4.21.3"
+ lru-cache "^5.1.1"
semver "^6.3.0"
"@babel/helper-create-class-features-plugin@^7.18.6":
@@ -204,19 +205,19 @@
dependencies:
"@babel/types" "^7.18.6"
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
- version "7.20.2"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
- integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.7":
+ version "7.20.11"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
+ integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==
dependencies:
"@babel/helper-environment-visitor" "^7.18.9"
"@babel/helper-module-imports" "^7.18.6"
"@babel/helper-simple-access" "^7.20.2"
"@babel/helper-split-export-declaration" "^7.18.6"
"@babel/helper-validator-identifier" "^7.19.1"
- "@babel/template" "^7.18.10"
- "@babel/traverse" "^7.20.1"
- "@babel/types" "^7.20.2"
+ "@babel/template" "^7.20.7"
+ "@babel/traverse" "^7.20.10"
+ "@babel/types" "^7.20.7"
"@babel/helper-optimise-call-expression@^7.18.6":
version "7.18.6"
@@ -297,14 +298,14 @@
"@babel/traverse" "^7.18.11"
"@babel/types" "^7.18.10"
-"@babel/helpers@^7.20.5":
- version "7.20.6"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
- integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
+"@babel/helpers@^7.20.7":
+ version "7.20.7"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce"
+ integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==
dependencies:
- "@babel/template" "^7.18.10"
- "@babel/traverse" "^7.20.5"
- "@babel/types" "^7.20.5"
+ "@babel/template" "^7.20.7"
+ "@babel/traverse" "^7.20.7"
+ "@babel/types" "^7.20.7"
"@babel/highlight@^7.18.6", "@babel/highlight@^7.9.0":
version "7.18.6"
@@ -315,10 +316,10 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.20.5", "@babel/parser@^7.7.0":
- version "7.20.5"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
- integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0":
+ version "7.20.7"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
+ integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
version "7.18.6"
@@ -1016,35 +1017,35 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.18.10", "@babel/template@^7.3.3":
- version "7.18.10"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
- integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
+ version "7.20.7"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+ integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
dependencies:
"@babel/code-frame" "^7.18.6"
- "@babel/parser" "^7.18.10"
- "@babel/types" "^7.18.10"
+ "@babel/parser" "^7.20.7"
+ "@babel/types" "^7.20.7"
-"@babel/traverse@^7.18.11", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
- version "7.20.5"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
- integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
+"@babel/traverse@^7.18.11", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.7", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+ version "7.20.10"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.10.tgz#2bf98239597fcec12f842756f186a9dde6d09230"
+ integrity sha512-oSf1juCgymrSez8NI4A2sr4+uB/mFd9MXplYGPEBnfAuWmmyeVcHa6xLPiaRBcXkcb/28bgxmQLTVwFKE1yfsg==
dependencies:
"@babel/code-frame" "^7.18.6"
- "@babel/generator" "^7.20.5"
+ "@babel/generator" "^7.20.7"
"@babel/helper-environment-visitor" "^7.18.9"
"@babel/helper-function-name" "^7.19.0"
"@babel/helper-hoist-variables" "^7.18.6"
"@babel/helper-split-export-declaration" "^7.18.6"
- "@babel/parser" "^7.20.5"
- "@babel/types" "^7.20.5"
+ "@babel/parser" "^7.20.7"
+ "@babel/types" "^7.20.7"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
- version "7.20.5"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
- integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
+"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+ version "7.20.7"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
+ integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
dependencies:
"@babel/helper-string-parser" "^7.19.4"
"@babel/helper-validator-identifier" "^7.19.1"
@@ -1073,10 +1074,10 @@
"@codemirror/language" "^6.0.0"
"@lezer/cpp" "^1.0.0"
-"@codemirror/lang-javascript@^6.1.1":
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/@codemirror/lang-javascript/-/lang-javascript-6.1.1.tgz#f920192db30531927a02b8a1af9cf3c3d895101c"
- integrity sha512-F4+kiuC5d5dUSJmff96tJQwpEXs/tX/4bapMRnZWW6bHKK1Fx6MunTzopkCUWRa9bF87GPmb9m7Qtg7Yv8f3uQ==
+"@codemirror/lang-javascript@^6.1.2":
+ version "6.1.2"
+ resolved "https://registry.yarnpkg.com/@codemirror/lang-javascript/-/lang-javascript-6.1.2.tgz#a11812ca1d21301cdeb80e51b4c007edcf55f813"
+ integrity sha512-OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ==
dependencies:
"@codemirror/autocomplete" "^6.0.0"
"@codemirror/language" "^6.0.0"
@@ -1094,10 +1095,10 @@
"@codemirror/language" "^6.0.0"
"@lezer/rust" "^1.0.0"
-"@codemirror/language@^6.0.0", "@codemirror/language@^6.3.1":
- version "6.3.1"
- resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.3.1.tgz#1d61f33aa5de9aa74a713ee1f5ce600adc74df6b"
- integrity sha512-MK+G1QKaGfSEUg9YEFaBkMBI6j1ge4VMBPZv9fDYotw7w695c42x5Ba1mmwBkesYnzYFBfte6Hh9TDcKa6xORQ==
+"@codemirror/language@^6.0.0", "@codemirror/language@^6.3.2":
+ version "6.3.2"
+ resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.3.2.tgz#a3d5796d17a2cd3110bac0f5126db67c7e90a0f3"
+ integrity sha512-g42uHhOcEMAXjmozGG+rdom5UsbyfMxQFh7AbkeoaNImddL6Xt4cQDL0+JxmG7+as18rUAvZaqzP/TjsciVIrA==
dependencies:
"@codemirror/state" "^6.0.0"
"@codemirror/view" "^6.0.0"
@@ -1115,15 +1116,15 @@
"@codemirror/view" "^6.0.0"
crelt "^1.0.5"
-"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.4":
- version "6.1.4"
- resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.1.4.tgz#2b654ae233ac4f41ee89ce095509ea35ecdf1031"
- integrity sha512-g+3OJuRylV5qsXuuhrc6Cvs1NQluNioepYMM2fhnpYkNk7NgX+j0AFuevKSVKzTDmDyt9+Puju+zPdHNECzCNQ==
+"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.4", "@codemirror/state@^6.2.0":
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.2.0.tgz#a0fb08403ced8c2a68d1d0acee926bd20be922f2"
+ integrity sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==
-"@codemirror/view@^6.0.0", "@codemirror/view@^6.5.1":
- version "6.5.1"
- resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.5.1.tgz#f4533cd796f0569508822d0012bee9a15dc4b3f9"
- integrity sha512-xBKP8N3AXOs06VcKvIuvIQoUlGs7Hb78ftJWahLaRX909jKPMgGxR5XjvrawzTTZMSTU3DzdjDNPwG6fPM/ypQ==
+"@codemirror/view@^6.0.0", "@codemirror/view@^6.7.1":
+ version "6.7.1"
+ resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.7.1.tgz#370e95d6f001e7f5cadc459807974b4f0a6eb225"
+ integrity sha512-kYtS+uqYw/q/0ytYxpkqE1JVuK5NsbmBklWYhwLFTKO9gVuTdh/kDEeZPKorbqHcJ+P+ucrhcsS1czVweOpT2g==
dependencies:
"@codemirror/state" "^6.1.4"
style-mod "^4.0.0"
@@ -1139,15 +1140,15 @@
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
-"@eslint/eslintrc@^1.3.3":
- version "1.3.3"
- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
- integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
+"@eslint/eslintrc@^1.4.0":
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
+ integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
dependencies:
ajv "^6.12.4"
debug "^4.3.2"
espree "^9.4.0"
- globals "^13.15.0"
+ globals "^13.19.0"
ignore "^5.2.0"
import-fresh "^3.2.1"
js-yaml "^4.1.0"
@@ -1185,10 +1186,10 @@
resolved "https://registry.yarnpkg.com/@fluent/sequence/-/sequence-0.7.0.tgz#2fbfa872e87293cca209ba4a586d1a8fbaa2e5c4"
integrity sha512-aH1xMwX8DFvKOQSKUKpB3zMsnJ2rRKt7MajLNnx/r3V3DWDo2nzEfm21d7UyOgwEckPIjPmhxdW1MEmsGUxYIw==
-"@humanwhocodes/config-array@^0.11.6":
- version "0.11.7"
- resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz#38aec044c6c828f6ed51d5d7ae3d9b9faf6dbb0f"
- integrity sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==
+"@humanwhocodes/config-array@^0.11.8":
+ version "0.11.8"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
+ integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
dependencies:
"@humanwhocodes/object-schema" "^1.2.1"
debug "^4.1.1"
@@ -1794,14 +1795,14 @@
dependencies:
defer-to-connect "^2.0.1"
-"@testing-library/dom@^8.11.1", "@testing-library/dom@^8.19.0", "@testing-library/dom@^8.5.0":
- version "8.19.0"
- resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.19.0.tgz#bd3f83c217ebac16694329e413d9ad5fdcfd785f"
- integrity sha512-6YWYPPpxG3e/xOo6HIWwB/58HukkwIVTOaZ0VwdMVjhRUX/01E4FtQbck9GazOOj7MXHc5RBzMrU86iBJHbI+A==
+"@testing-library/dom@^8.11.1", "@testing-library/dom@^8.19.1", "@testing-library/dom@^8.5.0":
+ version "8.19.1"
+ resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.19.1.tgz#0e2dafd281dedb930bb235eac1045470b4129d0e"
+ integrity sha512-P6iIPyYQ+qH8CvGauAqanhVnjrnRe0IZFSYCeGkSRW9q3u8bdVn2NPI+lasFyVsEQn1J/IFmp5Aax41+dAP9wg==
dependencies:
"@babel/code-frame" "^7.10.4"
"@babel/runtime" "^7.12.5"
- "@types/aria-query" "^4.2.0"
+ "@types/aria-query" "^5.0.1"
aria-query "^5.0.0"
chalk "^4.1.0"
dom-accessibility-api "^0.5.9"
@@ -1832,6 +1833,13 @@
"@testing-library/dom" "^8.5.0"
"@types/react-dom" "^18.0.0"
+"@tgwf/co2@^0.11.4":
+ version "0.11.4"
+ resolved "https://registry.yarnpkg.com/@tgwf/co2/-/co2-0.11.4.tgz#1e919364a3b1ce5ed835fb6449f78a7c7277e3f4"
+ integrity sha512-I6e+WzdDpVbKLkTDJXAA0kJvOJQg1TNfTOu7PA5+FfxLEix9EqdigVK0Qd4flC82fLgTKSw4upuh+nCm4fFCaQ==
+ dependencies:
+ debug "^4.3.4"
+
"@tootallnate/once@1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
@@ -1854,10 +1862,10 @@
dependencies:
"@types/estree" "*"
-"@types/aria-query@^4.2.0":
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
- integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
+"@types/aria-query@^5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
+ integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==
"@types/babel__core@^7.1.14":
version "7.1.14"
@@ -2473,20 +2481,20 @@
"@webassemblyjs/ast" "1.11.1"
"@xtuc/long" "4.2.2"
-"@webpack-cli/configtest@^2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.0.tgz#5e1bc37064c7d00e1330641fa523f8ff85a39513"
- integrity sha512-war4OU8NGjBqU3DP3bx6ciODXIh7dSXcpQq+P4K2Tqyd8L5OjZ7COx9QXx/QdCIwL2qoX09Wr4Cwf7uS4qdEng==
+"@webpack-cli/configtest@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
+ integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
-"@webpack-cli/info@^2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.0.tgz#5a58476b129ee9b462117b23393596e726bf3b80"
- integrity sha512-NNxDgbo4VOkNhOlTgY0Elhz3vKpOJq4/PKeKg7r8cmYM+GQA9vDofLYyup8jS6EpUvhNmR30cHTCEIyvXpskwA==
+"@webpack-cli/info@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
+ integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
-"@webpack-cli/serve@^2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.0.tgz#f08ea194e01ed45379383a8886e8c85a65a5f26a"
- integrity sha512-Rumq5mHvGXamnOh3O8yLk1sjx8dB30qF1OeR6VC00DIR6SLJ4bwwUGKC4pE7qBFoQyyh0H9sAg3fikYgAqVR0w==
+"@webpack-cli/serve@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
+ integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
@@ -2498,13 +2506,13 @@
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-"@yarnpkg/parsers@^3.0.0-rc.6":
- version "3.0.0-rc.9"
- resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.9.tgz#2d284e4e0c79b1c4e410465e217fa303d98b7be3"
- integrity sha512-JMBE+6OJoNN9AXBzZ72u22/t9M25K8KgUWZIjvk8CU/NsE/m946l8D7SqMhbi3ZaUfYa5QitqCqVWTTFtysGJQ==
+"@yarnpkg/parsers@^3.0.0-rc.32":
+ version "3.0.0-rc.34"
+ resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.34.tgz#db1d16e082e167db6dbc67f1c264639e0b4c5e1a"
+ integrity sha512-NhEA0BusInyk7EiJ7i7qF1Mkrb6gGjZcQQ/W1xxGazxapubEmGO7v5WSll6hWxFXE2ngtLj8lflq1Ff5VtqEww==
dependencies:
js-yaml "^3.10.0"
- tslib "^1.13.0"
+ tslib "^2.4.0"
JSONStream@^1.3.5:
version "1.3.5"
@@ -3317,10 +3325,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001431:
- version "1.0.30001431"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz#e7c59bd1bc518fae03a4656be442ce6c4887a795"
- integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001439:
+ version "1.0.30001439"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz#ab7371faeb4adff4b74dad1718a6fd122e45d9cb"
+ integrity sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==
ccount@^2.0.0:
version "2.0.1"
@@ -3809,10 +3817,10 @@ core-js-compat@^3.25.1:
dependencies:
browserslist "^4.21.4"
-core-js@^3.0.0, core-js@^3.26.1:
- version "3.26.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.1.tgz#7a9816dabd9ee846c1c0fe0e8fcad68f3709134e"
- integrity sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==
+core-js@^3.0.0, core-js@^3.27.1:
+ version "3.27.1"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.27.1.tgz#23cc909b315a6bb4e418bf40a52758af2103ba46"
+ integrity sha512-GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww==
core-util-is@~1.0.0:
version "1.0.3"
@@ -3899,13 +3907,13 @@ css-functions-list@^3.1.0:
resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b"
integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==
-css-loader@^6.7.2:
- version "6.7.2"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
- integrity sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==
+css-loader@^6.7.3:
+ version "6.7.3"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd"
+ integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==
dependencies:
icss-utils "^5.1.0"
- postcss "^8.4.18"
+ postcss "^8.4.19"
postcss-modules-extract-imports "^3.0.0"
postcss-modules-local-by-default "^4.0.0"
postcss-modules-scope "^3.0.0"
@@ -4128,10 +4136,10 @@ decode-named-character-reference@^1.0.0:
dependencies:
character-entities "^2.0.0"
-decode-uri-component@^0.2.2:
- version "0.2.2"
- resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
- integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+decode-uri-component@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.4.1.tgz#2ac4859663c704be22bf7db760a1494a49ab2cc5"
+ integrity sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ==
decompress-response@^6.0.0:
version "6.0.0"
@@ -4677,10 +4685,10 @@ eslint-plugin-jest-formatting@^3.1.0:
resolved "https://registry.yarnpkg.com/eslint-plugin-jest-formatting/-/eslint-plugin-jest-formatting-3.1.0.tgz#b26dd5a40f432b642dcc880021a771bb1c93dcd2"
integrity sha512-XyysraZ1JSgGbLSDxjj5HzKKh0glgWf+7CkqxbTqb7zEhW7X2WHo5SBQ8cGhnszKN+2Lj3/oevBlHNbHezoc/A==
-eslint-plugin-jest@^27.1.5:
- version "27.1.5"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.1.5.tgz#16fad619cfee6cdf73d56098fbed0761e1f653ce"
- integrity sha512-CK2dekZ5VBdzsOSOH5Fc1rwC+cWXjkcyrmf1RV714nDUDKu+o73TTJiDxpbILG8PtPPpAAl3ywzh5QA7Ft0mjA==
+eslint-plugin-jest@^27.1.7:
+ version "27.1.7"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.1.7.tgz#0351e904afb8d66b7f70452929556dfdc8daba0d"
+ integrity sha512-0QVzf+og4YI1Qr3UoprkqqhezAZjFffdi62b0IurkCXMqPtRW84/UT4CKsYT80h/D82LA9avjO/80Ou1LdgbaQ==
dependencies:
"@typescript-eslint/utils" "^5.10.0"
@@ -4812,13 +4820,13 @@ eslint@^6.0.1:
text-table "^0.2.0"
v8-compile-cache "^2.0.3"
-eslint@^8.27.0:
- version "8.27.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.27.0.tgz#d547e2f7239994ad1faa4bb5d84e5d809db7cf64"
- integrity sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==
+eslint@^8.30.0:
+ version "8.30.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.30.0.tgz#83a506125d089eef7c5b5910eeea824273a33f50"
+ integrity sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==
dependencies:
- "@eslint/eslintrc" "^1.3.3"
- "@humanwhocodes/config-array" "^0.11.6"
+ "@eslint/eslintrc" "^1.4.0"
+ "@humanwhocodes/config-array" "^0.11.8"
"@humanwhocodes/module-importer" "^1.0.1"
"@nodelib/fs.walk" "^1.2.8"
ajv "^6.10.0"
@@ -4837,7 +4845,7 @@ eslint@^8.27.0:
file-entry-cache "^6.0.1"
find-up "^5.0.0"
glob-parent "^6.0.2"
- globals "^13.15.0"
+ globals "^13.19.0"
grapheme-splitter "^1.0.4"
ignore "^5.2.0"
import-fresh "^3.0.0"
@@ -5044,10 +5052,10 @@ external-editor@^3.0.3:
iconv-lite "^0.4.24"
tmp "^0.0.33"
-fake-indexeddb@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-4.0.0.tgz#1dfb2023a3be175e35a6d84975218b432041934d"
- integrity sha512-oCfWSJ/qvQn1XPZ8SHX6kY3zr1t+bN7faZ/lltGY0SBGhFOPXnWf0+pbO/MOAgfMx6khC2gK3S/bvAgQpuQHDQ==
+fake-indexeddb@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-4.0.1.tgz#09bb2468e21d0832b2177e894765fb109edac8fb"
+ integrity sha512-hFRyPmvEZILYgdcLBxVdHLik4Tj3gDTu/g7s9ZDOiU3sTNiGx+vEu1ri/AMsFJUZ/1sdRbAVrEcKndh3sViBcA==
dependencies:
realistic-structured-clone "^3.0.0"
@@ -5188,10 +5196,10 @@ fill-range@^7.0.1:
dependencies:
to-regex-range "^5.0.1"
-filter-obj@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
- integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs=
+filter-obj@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-5.1.0.tgz#5bd89676000a713d7db2e197f660274428e524ed"
+ integrity sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==
finalhandler@1.2.0:
version "1.2.0"
@@ -5671,10 +5679,10 @@ globals@^12.1.0:
dependencies:
type-fest "^0.8.1"
-globals@^13.15.0:
- version "13.15.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac"
- integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==
+globals@^13.19.0:
+ version "13.19.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8"
+ integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==
dependencies:
type-fest "^0.20.2"
@@ -6217,10 +6225,10 @@ ignore@^4.0.6:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-ignore@^5.0.0, ignore@^5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
- integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+ignore@^5.0.0, ignore@^5.2.0, ignore@^5.2.1:
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.1.tgz#c2b1f76cb999ede1502f3a226a9310fdfe88d46c"
+ integrity sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==
immediate@~3.0.5:
version "3.0.6"
@@ -7644,22 +7652,22 @@ locate-path@^7.1.0:
dependencies:
p-locate "^6.0.0"
-lockfile-lint-api@^5.4.6:
- version "5.4.6"
- resolved "https://registry.yarnpkg.com/lockfile-lint-api/-/lockfile-lint-api-5.4.6.tgz#9ab5252df1e1383061dbaa58f06c94bdb19710c6"
- integrity sha512-3Sp01oBI0LWZNvKfGQ04G03+dXkjAvEvRiAQNZsvdVmCGP6vOXPCuPEimStf+RSo8PnjApdb65RAUh6aSZXsVQ==
+lockfile-lint-api@^5.5.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/lockfile-lint-api/-/lockfile-lint-api-5.5.0.tgz#9eab162f597121d8fdae13debe553abe1279c7c6"
+ integrity sha512-L/Jk109tOSmTCPHjUEQSH/bYDRt7rgT1E2NN8/p3tmAwJuKwuWplJliVzZ+bBiIRWKmtXBDcfHnXJ9yT1shevQ==
dependencies:
- "@yarnpkg/parsers" "^3.0.0-rc.6"
+ "@yarnpkg/parsers" "^3.0.0-rc.32"
object-hash "^3.0.0"
-lockfile-lint@^4.9.6:
- version "4.9.6"
- resolved "https://registry.yarnpkg.com/lockfile-lint/-/lockfile-lint-4.9.6.tgz#e0204b7eb9767c96fe59672c3fbb53fe9a12ca49"
- integrity sha512-qPI3QcEflvGylCtXyxTh0anhi1oYxD12L3ZwQYaxLjxpWUI73+EbFMsl9esqcbgSKAh4wes5y6fbG8hbQTgjyg==
+lockfile-lint@^4.10.0:
+ version "4.10.0"
+ resolved "https://registry.yarnpkg.com/lockfile-lint/-/lockfile-lint-4.10.0.tgz#388224241426dbfa6e632e96a539e4dfca088a6d"
+ integrity sha512-OM11m0txImBLFzC8DVoNx+Oca11K8jXndwQV9WLwXgMeLDJtlXGbLwRBFINjyo1YQr/STrdsx3OBth3cee+41A==
dependencies:
cosmiconfig "^7.0.1"
debug "^4.1.1"
- lockfile-lint-api "^5.4.6"
+ lockfile-lint-api "^5.5.0"
yargs "^16.0.0"
lodash.assignwith@^4.2.0:
@@ -7746,6 +7754,13 @@ lowercase-keys@^3.0.0:
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2"
integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==
+lru-cache@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+ integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+ dependencies:
+ yallist "^3.0.2"
+
lru-cache@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -9565,14 +9580,14 @@ postcss-discard-overridden@^5.1.0:
resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
-postcss-loader@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.1.tgz#4c883cc0a1b2bfe2074377b7a74c1cd805684395"
- integrity sha512-VRviFEyYlLjctSM93gAZtcJJ/iSkPZ79zWbN/1fSH+NisBByEiVLqpdVDrPLVSi8DX0oJo12kL/GppTBdKVXiQ==
+postcss-loader@^7.0.2:
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.2.tgz#b53ff44a26fba3688eee92a048c7f2d4802e23bb"
+ integrity sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==
dependencies:
cosmiconfig "^7.0.0"
klona "^2.0.5"
- semver "^7.3.7"
+ semver "^7.3.8"
postcss-media-query-parser@^0.2.3:
version "0.2.3"
@@ -9753,10 +9768,10 @@ postcss-safe-parser@^6.0.0:
resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
- version "6.0.10"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
- integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
+postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
+ version "6.0.11"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
+ integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
@@ -9786,10 +9801,10 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-postcss@^8.3.11, postcss@^8.4.16, postcss@^8.4.18, postcss@^8.4.19:
- version "8.4.19"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
- integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
+postcss@^8.3.11, postcss@^8.4.19, postcss@^8.4.20:
+ version "8.4.20"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56"
+ integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
dependencies:
nanoid "^3.3.4"
picocolors "^1.0.0"
@@ -9817,10 +9832,10 @@ prettier@^1.19.1:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
-prettier@^2.0.5, prettier@^2.8.0:
- version "2.8.0"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9"
- integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==
+prettier@^2.0.5, prettier@^2.8.1:
+ version "2.8.1"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc"
+ integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==
pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
version "5.6.0"
@@ -9987,15 +10002,14 @@ qs@6.10.3, qs@^6.5.2:
dependencies:
side-channel "^1.0.4"
-query-string@^7.1.3:
- version "7.1.3"
- resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328"
- integrity sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==
+query-string@^8.1.0:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/query-string/-/query-string-8.1.0.tgz#e7f95367737219544cd360a11a4f4ca03836e115"
+ integrity sha512-BFQeWxJOZxZGix7y+SByG3F36dA0AbTy9o6pSmKFcFz7DAj0re9Frkty3saBn3nHo3D0oZJ/+rx3r8H8r8Jbpw==
dependencies:
- decode-uri-component "^0.2.2"
- filter-obj "^1.1.0"
- split-on-first "^1.0.0"
- strict-uri-encode "^2.0.0"
+ decode-uri-component "^0.4.1"
+ filter-obj "^5.1.0"
+ split-on-first "^3.0.0"
querystring@0.2.0:
version "0.2.0"
@@ -11188,10 +11202,10 @@ spdy@^4.0.2:
select-hose "^2.0.0"
spdy-transport "^3.0.0"
-split-on-first@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
- integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
+split-on-first@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-3.0.0.tgz#f04959c9ea8101b9b0bbf35a61b9ebea784a23e7"
+ integrity sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==
split-transform-stream@0.1.1:
version "0.1.1"
@@ -11281,11 +11295,6 @@ streaming-json-stringify@3:
json-stringify-safe "5"
readable-stream "2"
-strict-uri-encode@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
- integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
-
string-length@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
@@ -11541,10 +11550,10 @@ stylelint-prettier@^2.0.0:
dependencies:
prettier-linter-helpers "^1.0.0"
-stylelint@^14.15.0:
- version "14.15.0"
- resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.15.0.tgz#4df55078e734869f81f6b85bbec2d56a4b478ece"
- integrity sha512-JOgDAo5QRsqiOZPZO+B9rKJvBm64S0xasbuRPAbPs6/vQDgDCnZLIiw6XcAS6GQKk9k1sBWR6rmH3Mfj8OknKg==
+stylelint@^14.16.1:
+ version "14.16.1"
+ resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.1.tgz#b911063530619a1bbe44c2b875fd8181ebdc742d"
+ integrity sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==
dependencies:
"@csstools/selector-specificity" "^2.0.2"
balanced-match "^2.0.0"
@@ -11559,7 +11568,7 @@ stylelint@^14.15.0:
globby "^11.1.0"
globjoin "^0.1.4"
html-tags "^3.2.0"
- ignore "^5.2.0"
+ ignore "^5.2.1"
import-lazy "^4.0.0"
imurmurhash "^0.1.4"
is-plain-object "^5.0.0"
@@ -11573,7 +11582,7 @@ stylelint@^14.15.0:
postcss-media-query-parser "^0.2.3"
postcss-resolve-nested-selector "^0.1.1"
postcss-safe-parser "^6.0.0"
- postcss-selector-parser "^6.0.10"
+ postcss-selector-parser "^6.0.11"
postcss-value-parser "^4.2.0"
resolve-from "^5.0.0"
string-width "^4.2.3"
@@ -11935,15 +11944,15 @@ tsconfig-paths@^3.14.1:
minimist "^1.2.6"
strip-bom "^3.0.0"
-tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.1, tslib@^1.9.0:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-tslib@^2.0.3:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
- integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+tslib@^2.0.3, tslib@^2.4.0:
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+ integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
tsscmp@1.0.6:
version "1.0.6"
@@ -12582,15 +12591,15 @@ webidl-conversions@^7.0.0:
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
-webpack-cli@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.0.tgz#bd380a9653e0cd1a08916c4ff1adea17201ef68f"
- integrity sha512-AACDTo20yG+xn6HPW5xjbn2Be4KUzQPebWXsDMHwPPyKh9OnTOJgZN2Nc+g/FZKV3ObRTYsGvibAvc+5jAUrVA==
+webpack-cli@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a"
+ integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==
dependencies:
"@discoveryjs/json-ext" "^0.5.0"
- "@webpack-cli/configtest" "^2.0.0"
- "@webpack-cli/info" "^2.0.0"
- "@webpack-cli/serve" "^2.0.0"
+ "@webpack-cli/configtest" "^2.0.1"
+ "@webpack-cli/info" "^2.0.1"
+ "@webpack-cli/serve" "^2.0.1"
colorette "^2.0.14"
commander "^9.4.1"
cross-spawn "^7.0.3"
@@ -13086,6 +13095,11 @@ y18n@^5.0.5:
resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
+yallist@^3.0.2:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+ integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
yallist@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"