Skip to content

Commit bf45c37

Browse files
authored
chore: slim barrel imports for react-aria, react-stately and zod (-799 KB) (RocketChat#40109)
2 parents 18a26c8 + fee3902 commit bf45c37

34 files changed

Lines changed: 884 additions & 75 deletions

.yarn/patches/react-aria-npm-3.37.0-83959bd2fa.patch

Lines changed: 316 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
diff --git a/dist/main.js b/dist/main.js
2+
index 8e3aafa76ccbbc4491666e9593220378c3e79c18..2ed9b74c20b63fb1f9e8552d61343b26540f78d9 100644
3+
--- a/dist/main.js
4+
+++ b/dist/main.js
5+
@@ -1,98 +1,8 @@
6+
"use strict";
7+
-
8+
exports.__esModule = true;
9+
-exports.useTreeState = exports.useTooltipTriggerState = exports.useToggleState = exports.useTabListState = exports.Cell = exports.Row = exports.Column = exports.TableBody = exports.TableHeader = exports.useTableState = exports.useMultipleSelectionState = exports.useSliderState = exports.useSelectState = exports.useSearchFieldState = exports.useRadioGroupState = exports.useOverlayTriggerState = exports.useNumberFieldState = exports.useMenuTriggerState = exports.useSingleSelectListState = exports.useListState = exports.useTreeData = exports.useListData = exports.useAsyncList = exports.useCollection = exports.Section = exports.Item = exports.useTimeFieldState = exports.useDateRangePickerState = exports.useDatePickerState = exports.useDateFieldState = exports.useComboBoxState = exports.useCheckboxGroupState = exports.useRangeCalendarState = exports.useCalendarState = void 0;
10+
-
11+
-var _calendar = require("@react-stately/calendar");
12+
-
13+
-exports.useCalendarState = _calendar.useCalendarState;
14+
-exports.useRangeCalendarState = _calendar.useRangeCalendarState;
15+
-
16+
-var _checkbox = require("@react-stately/checkbox");
17+
-
18+
-exports.useCheckboxGroupState = _checkbox.useCheckboxGroupState;
19+
-
20+
-var _combobox = require("@react-stately/combobox");
21+
-
22+
-exports.useComboBoxState = _combobox.useComboBoxState;
23+
-
24+
-var _datepicker = require("@react-stately/datepicker");
25+
-
26+
-exports.useDateFieldState = _datepicker.useDateFieldState;
27+
-exports.useDatePickerState = _datepicker.useDatePickerState;
28+
-exports.useDateRangePickerState = _datepicker.useDateRangePickerState;
29+
-exports.useTimeFieldState = _datepicker.useTimeFieldState;
30+
-
31+
-var _collections = require("@react-stately/collections");
32+
-
33+
-exports.Item = _collections.Item;
34+
-exports.Section = _collections.Section;
35+
-exports.useCollection = _collections.useCollection;
36+
-
37+
-var _data = require("@react-stately/data");
38+
-
39+
-exports.useAsyncList = _data.useAsyncList;
40+
-exports.useListData = _data.useListData;
41+
-exports.useTreeData = _data.useTreeData;
42+
-
43+
-var _list = require("@react-stately/list");
44+
-
45+
-exports.useListState = _list.useListState;
46+
-exports.useSingleSelectListState = _list.useSingleSelectListState;
47+
-
48+
-var _menu = require("@react-stately/menu");
49+
-
50+
-exports.useMenuTriggerState = _menu.useMenuTriggerState;
51+
-
52+
-var _numberfield = require("@react-stately/numberfield");
53+
-
54+
-exports.useNumberFieldState = _numberfield.useNumberFieldState;
55+
-
56+
-var _overlays = require("@react-stately/overlays");
57+
-
58+
-exports.useOverlayTriggerState = _overlays.useOverlayTriggerState;
59+
-
60+
-var _radio = require("@react-stately/radio");
61+
-
62+
-exports.useRadioGroupState = _radio.useRadioGroupState;
63+
-
64+
-var _searchfield = require("@react-stately/searchfield");
65+
-
66+
-exports.useSearchFieldState = _searchfield.useSearchFieldState;
67+
-
68+
-var _select = require("@react-stately/select");
69+
-
70+
-exports.useSelectState = _select.useSelectState;
71+
-
72+
-var _slider = require("@react-stately/slider");
73+
-
74+
-exports.useSliderState = _slider.useSliderState;
75+
-
76+
-var _selection = require("@react-stately/selection");
77+
-
78+
-exports.useMultipleSelectionState = _selection.useMultipleSelectionState;
79+
-
80+
-var _table = require("@react-stately/table");
81+
-
82+
-exports.useTableState = _table.useTableState;
83+
-exports.TableHeader = _table.TableHeader;
84+
-exports.TableBody = _table.TableBody;
85+
-exports.Column = _table.Column;
86+
-exports.Row = _table.Row;
87+
-exports.Cell = _table.Cell;
88+
-
89+
-var _tabs = require("@react-stately/tabs");
90+
-
91+
-exports.useTabListState = _tabs.useTabListState;
92+
-
93+
-var _toggle = require("@react-stately/toggle");
94+
-
95+
-exports.useToggleState = _toggle.useToggleState;
96+
-
97+
-var _tooltip = require("@react-stately/tooltip");
98+
-
99+
-exports.useTooltipTriggerState = _tooltip.useTooltipTriggerState;
100+
-
101+
-var _tree = require("@react-stately/tree");
102+
-
103+
-exports.useTreeState = _tree.useTreeState;
104+
+var _collections = require("@react-stately/collections"); exports.Item = _collections.Item; exports.Section = _collections.Section;
105+
+var _menu = require("@react-stately/menu"); exports.useMenuTriggerState = _menu.useMenuTriggerState;
106+
+var _overlays = require("@react-stately/overlays"); exports.useOverlayTriggerState = _overlays.useOverlayTriggerState;
107+
+var _select = require("@react-stately/select"); exports.useSelectState = _select.useSelectState;
108+
+var _slider = require("@react-stately/slider"); exports.useSliderState = _slider.useSliderState;
109+
+var _tree = require("@react-stately/tree"); exports.useTreeState = _tree.useTreeState;
110+
diff --git a/dist/module.js b/dist/module.js
111+
index 37bdb24af4a8310cc702b2d9c1effe6aac261424..c098533fc2bbeb6b203d4350c2dcdd6e6663afd3 100644
112+
--- a/dist/module.js
113+
+++ b/dist/module.js
114+
@@ -1,33 +1,7 @@
115+
-/*
116+
- * Copyright 2020 Adobe. All rights reserved.
117+
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
118+
- * you may not use this file except in compliance with the License. You may obtain a copy
119+
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
120+
- *
121+
- * Unless required by applicable law or agreed to in writing, software distributed under
122+
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
123+
- * OF ANY KIND, either express or implied. See the License for the specific language
124+
- * governing permissions and limitations under the License.
125+
- */
126+
-
127+
-
128+
-export {useCalendarState, useRangeCalendarState} from '@react-stately/calendar';
129+
-export {useCheckboxGroupState} from '@react-stately/checkbox';
130+
-export {useComboBoxState} from '@react-stately/combobox';
131+
-export {useDateFieldState, useDatePickerState, useDateRangePickerState, useTimeFieldState} from '@react-stately/datepicker';
132+
-export {Item, Section, useCollection} from '@react-stately/collections';
133+
-export {useAsyncList, useListData, useTreeData} from '@react-stately/data';
134+
-export {useListState, useSingleSelectListState} from '@react-stately/list';
135+
+// Slim barrel: only exports actually used
136+
+export {Item, Section} from '@react-stately/collections';
137+
export {useMenuTriggerState} from '@react-stately/menu';
138+
-export {useNumberFieldState} from '@react-stately/numberfield';
139+
export {useOverlayTriggerState} from '@react-stately/overlays';
140+
-export {useRadioGroupState} from '@react-stately/radio';
141+
-export {useSearchFieldState} from '@react-stately/searchfield';
142+
export {useSelectState} from '@react-stately/select';
143+
export {useSliderState} from '@react-stately/slider';
144+
-export {useMultipleSelectionState} from '@react-stately/selection';
145+
-export {useTableState, TableHeader, TableBody, Column, Row, Cell} from '@react-stately/table';
146+
-export {useTabListState} from '@react-stately/tabs';
147+
-export {useToggleState} from '@react-stately/toggle';
148+
-export {useTooltipTriggerState} from '@react-stately/tooltip';
149+
export {useTreeState} from '@react-stately/tree';
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
diff --git a/v4/classic/external.cjs b/v4/classic/external.cjs
2+
index ee133825d44ab44b86dd8aef6bd985653ebde06c..ea74468d20c2371f9c4d8941467e3b7fe93a00ef 100644
3+
--- a/v4/classic/external.cjs
4+
+++ b/v4/classic/external.cjs
5+
@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
6+
return (mod && mod.__esModule) ? mod : { "default": mod };
7+
};
8+
Object.defineProperty(exports, "__esModule", { value: true });
9+
-exports.coerce = exports.iso = exports.ZodISODuration = exports.ZodISOTime = exports.ZodISODate = exports.ZodISODateTime = exports.locales = exports.fromJSONSchema = exports.toJSONSchema = exports.NEVER = exports.util = exports.TimePrecision = exports.flattenError = exports.formatError = exports.prettifyError = exports.treeifyError = exports.regexes = exports.clone = exports.$brand = exports.$input = exports.$output = exports.config = exports.registry = exports.globalRegistry = exports.core = void 0;
10+
+exports.coerce = exports.iso = exports.ZodISODuration = exports.ZodISOTime = exports.ZodISODate = exports.ZodISODateTime = exports.fromJSONSchema = exports.toJSONSchema = exports.NEVER = exports.util = exports.TimePrecision = exports.flattenError = exports.formatError = exports.prettifyError = exports.treeifyError = exports.regexes = exports.clone = exports.$brand = exports.$input = exports.$output = exports.config = exports.registry = exports.globalRegistry = exports.core = void 0;
11+
exports.core = __importStar(require("../core/index.cjs"));
12+
__exportStar(require("./schemas.cjs"), exports);
13+
__exportStar(require("./checks.cjs"), exports);
14+
@@ -60,7 +60,7 @@ var json_schema_processors_js_1 = require("../core/json-schema-processors.cjs");
15+
Object.defineProperty(exports, "toJSONSchema", { enumerable: true, get: function () { return json_schema_processors_js_1.toJSONSchema; } });
16+
var from_json_schema_js_1 = require("./from-json-schema.cjs");
17+
Object.defineProperty(exports, "fromJSONSchema", { enumerable: true, get: function () { return from_json_schema_js_1.fromJSONSchema; } });
18+
-exports.locales = __importStar(require("../locales/index.cjs"));
19+
+// locales removed from barrel
20+
// iso
21+
// must be exported from top-level
22+
// https://github.com/colinhacks/zod/issues/4491
23+
diff --git a/v4/classic/external.js b/v4/classic/external.js
24+
index 9567900bbb57099481c0ea5864fbf697d62021a5..98ee2af29038deca6c38c46c24d5fb14725e40f0 100644
25+
--- a/v4/classic/external.js
26+
+++ b/v4/classic/external.js
27+
@@ -11,7 +11,7 @@ config(en());
28+
export { globalRegistry, registry, config, $output, $input, $brand, clone, regexes, treeifyError, prettifyError, formatError, flattenError, TimePrecision, util, NEVER, } from "../core/index.js";
29+
export { toJSONSchema } from "../core/json-schema-processors.js";
30+
export { fromJSONSchema } from "./from-json-schema.js";
31+
-export * as locales from "../locales/index.js";
32+
+// locales removed from barrel
33+
// iso
34+
// must be exported from top-level
35+
// https://github.com/colinhacks/zod/issues/4491
36+
diff --git a/v4/core/index.cjs b/v4/core/index.cjs
37+
index c3fa303104a191d142a5212f69e7954cba3606a7..44bdc3437c6a88971c1c85b63024213880fe0fff 100644
38+
--- a/v4/core/index.cjs
39+
+++ b/v4/core/index.cjs
40+
@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
41+
return result;
42+
};
43+
Object.defineProperty(exports, "__esModule", { value: true });
44+
-exports.JSONSchema = exports.JSONSchemaGenerator = exports.toJSONSchema = exports.locales = exports.regexes = exports.util = void 0;
45+
+exports.JSONSchema = exports.JSONSchemaGenerator = exports.toJSONSchema = exports.regexes = exports.util = void 0;
46+
__exportStar(require("./core.cjs"), exports);
47+
__exportStar(require("./parse.cjs"), exports);
48+
__exportStar(require("./errors.cjs"), exports);
49+
@@ -35,7 +35,7 @@ __exportStar(require("./checks.cjs"), exports);
50+
__exportStar(require("./versions.cjs"), exports);
51+
exports.util = __importStar(require("./util.cjs"));
52+
exports.regexes = __importStar(require("./regexes.cjs"));
53+
-exports.locales = __importStar(require("../locales/index.cjs"));
54+
+// locales removed from barrel
55+
__exportStar(require("./registries.cjs"), exports);
56+
__exportStar(require("./doc.cjs"), exports);
57+
__exportStar(require("./api.cjs"), exports);
58+
diff --git a/v4/core/index.js b/v4/core/index.js
59+
index d334515bf004600f2e55ff85e3730f1b2f2ff703..4ff979844ba18d012893064b01889bf70ec245c8 100644
60+
--- a/v4/core/index.js
61+
+++ b/v4/core/index.js
62+
@@ -6,7 +6,7 @@ export * from "./checks.js";
63+
export * from "./versions.js";
64+
export * as util from "./util.js";
65+
export * as regexes from "./regexes.js";
66+
-export * as locales from "../locales/index.js";
67+
+// locales removed from barrel
68+
export * from "./registries.js";
69+
export * from "./doc.js";
70+
export * from "./api.js";
71+
diff --git a/v4/mini/external.cjs b/v4/mini/external.cjs
72+
index 0d0079d94d94010b51abe23042418adbc6077b7f..fd3acb42a12dde65f383eb2c3f46a9108dd8c865 100644
73+
--- a/v4/mini/external.cjs
74+
+++ b/v4/mini/external.cjs
75+
@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
76+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
77+
};
78+
Object.defineProperty(exports, "__esModule", { value: true });
79+
-exports.coerce = exports.ZodMiniISODuration = exports.ZodMiniISOTime = exports.ZodMiniISODate = exports.ZodMiniISODateTime = exports.iso = exports.locales = exports.toJSONSchema = exports.NEVER = exports.util = exports.TimePrecision = exports.flattenError = exports.formatError = exports.prettifyError = exports.treeifyError = exports.regexes = exports.clone = exports.$brand = exports.$input = exports.$output = exports.config = exports.registry = exports.globalRegistry = exports.core = void 0;
80+
+exports.coerce = exports.ZodMiniISODuration = exports.ZodMiniISOTime = exports.ZodMiniISODate = exports.ZodMiniISODateTime = exports.iso = exports.toJSONSchema = exports.NEVER = exports.util = exports.TimePrecision = exports.flattenError = exports.formatError = exports.prettifyError = exports.treeifyError = exports.regexes = exports.clone = exports.$brand = exports.$input = exports.$output = exports.config = exports.registry = exports.globalRegistry = exports.core = void 0;
81+
exports.core = __importStar(require("../core/index.cjs"));
82+
__exportStar(require("./parse.cjs"), exports);
83+
__exportStar(require("./schemas.cjs"), exports);
84+
@@ -49,7 +49,7 @@ Object.defineProperty(exports, "util", { enumerable: true, get: function () { re
85+
Object.defineProperty(exports, "NEVER", { enumerable: true, get: function () { return index_js_1.NEVER; } });
86+
var json_schema_processors_js_1 = require("../core/json-schema-processors.cjs");
87+
Object.defineProperty(exports, "toJSONSchema", { enumerable: true, get: function () { return json_schema_processors_js_1.toJSONSchema; } });
88+
-exports.locales = __importStar(require("../locales/index.cjs"));
89+
+// locales removed from barrel
90+
/** A special constant with type `never` */
91+
// export const NEVER = {} as never;
92+
// iso
93+
diff --git a/v4/mini/external.js b/v4/mini/external.js
94+
index d6523c153e213be110c21b370164b5eca1cdf744..7a1addf9ce6e331e56c943867bf04cf199745145 100644
95+
--- a/v4/mini/external.js
96+
+++ b/v4/mini/external.js
97+
@@ -4,7 +4,7 @@ export * from "./schemas.js";
98+
export * from "./checks.js";
99+
export { globalRegistry, registry, config, $output, $input, $brand, clone, regexes, treeifyError, prettifyError, formatError, flattenError, TimePrecision, util, NEVER, } from "../core/index.js";
100+
export { toJSONSchema } from "../core/json-schema-processors.js";
101+
-export * as locales from "../locales/index.js";
102+
+// locales removed from barrel
103+
/** A special constant with type `never` */
104+
// export const NEVER = {} as never;
105+
// iso

apps/meteor/client/components/ImageGallery/ImageGallery.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { FocusScope } from '@react-aria/focus';
12
import type { IUpload } from '@rocket.chat/core-typings';
23
import { css } from '@rocket.chat/css-in-js';
34
import { Box, ButtonGroup, IconButton, Palette, PaletteStyleTag, Throbber, spacing } from '@rocket.chat/fuselage';
45
import { useRef, useState } from 'react';
5-
import { FocusScope } from 'react-aria';
66
import { createPortal } from 'react-dom';
77
import { useTranslation } from 'react-i18next';
88
import { Navigation, Zoom, Keyboard, A11y } from 'swiper/modules/index.mjs';

apps/meteor/client/components/ResultsLiveRegion.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { VisuallyHidden } from 'react-aria';
1+
import { VisuallyHidden } from '@react-aria/visually-hidden';
22
import { useTranslation } from 'react-i18next';
33

44
const ResultsLiveRegion = ({ shouldAnnounce, itemCount }: { shouldAnnounce: boolean; itemCount: number }) => {

apps/meteor/client/components/UserCard/UserCardDialog.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import type { AriaDialogProps } from '@react-aria/dialog';
2+
import { useDialog } from '@react-aria/dialog';
13
import { Box } from '@rocket.chat/fuselage';
24
import type { ComponentProps } from 'react';
35
import { useRef } from 'react';
4-
import type { AriaDialogProps } from 'react-aria';
5-
import { useDialog } from 'react-aria';
66

77
type UserCardDialogProps = AriaDialogProps & ComponentProps<typeof Box>;
88

apps/meteor/client/navbar/NavBarNavigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { FocusScope } from '@react-aria/focus';
12
import { NavBarGroup, NavBarItem, Box } from '@rocket.chat/fuselage';
23
import { useLayout, useRouter } from '@rocket.chat/ui-contexts';
3-
import { FocusScope } from 'react-aria';
44
import { useTranslation } from 'react-i18next';
55

66
import NavBarSearch from './NavBarSearch';

apps/meteor/client/navbar/NavBarSearch/NavBarSearch.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import { useFocusManager } from '@react-aria/focus';
2+
import { useOverlayTrigger } from '@react-aria/overlays';
3+
import { useOverlayTriggerState } from '@react-stately/overlays';
14
import { Box, Icon, IconButton, TextInput } from '@rocket.chat/fuselage';
25
import { useEffectEvent, useMergedRefs } from '@rocket.chat/fuselage-hooks';
36
import { useCallback, useEffect, useRef } from 'react';
4-
import { useFocusManager, useOverlayTrigger } from 'react-aria';
57
import { FormProvider, useForm } from 'react-hook-form';
68
import { useTranslation } from 'react-i18next';
7-
import { useOverlayTriggerState } from 'react-stately';
89
import tinykeys from 'tinykeys';
910

1011
import NavBarSearchListBox from './NavBarSearchListbox';

apps/meteor/client/navbar/NavBarSearch/NavBarSearchListbox.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import type { OverlayTriggerAria } from '@react-aria/overlays';
2+
import type { OverlayTriggerState } from '@react-stately/overlays';
13
import { Box, Tile } from '@rocket.chat/fuselage';
24
import { useDebouncedValue, useEffectEvent, useOutsideClick } from '@rocket.chat/fuselage-hooks';
35
import { CustomScrollbars } from '@rocket.chat/ui-client';
46
import { useRef } from 'react';
5-
import type { OverlayTriggerAria } from 'react-aria';
67
import { useFormContext } from 'react-hook-form';
78
import { useTranslation } from 'react-i18next';
8-
import type { OverlayTriggerState } from 'react-stately';
99

1010
import NavBarSearchNoResults from './NavBarSearchNoResults';
1111
import NavBarSearchRow from './NavBarSearchRow';

apps/meteor/client/navbar/NavBarSearch/hooks/useSearchClick.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import type { OverlayTriggerState } from '@react-stately/overlays';
12
import { useCallback } from 'react';
2-
import type { OverlayTriggerState } from 'react-stately';
33

44
export const useSearchClick = (state: OverlayTriggerState) => {
55
const handleClick = useCallback(() => {

0 commit comments

Comments
 (0)