Skip to content

Commit 847b7eb

Browse files
devongovettdevongovett
authored
Merge branch 'main' into datefield-enter-bug
2 parents e4d7161 + 8f684df commit 847b7eb

File tree

214 files changed

+1884
-500
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+1884
-500
lines changed

‎.circleci/comment.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ async function run() {
7979
body: `Build successful! 🎉
8080
8181
* [View the storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook/index.html)
82-
* [View the storybook-19](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-19/index.html)
83-
* [View the storybook-17](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-17/index.html)
84-
* [View the storybook-16](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-16/index.html)
8582
* [View the S2 storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-s2/index.html)
8683
* [View the documentation](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/docs/index.html)`
8784
});

‎.circleci/config.yml

Lines changed: 80 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- ~/react-spectrum
105105
key: react-spectrum17-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
106106

107-
install-19:
107+
install-18:
108108
executor: rsp-large
109109
steps:
110110
- checkout
@@ -119,12 +119,34 @@ jobs:
119119
- run:
120120
name: build
121121
command: |
122-
yarn install --immutable && yarn install-19
122+
yarn install --immutable && yarn install-18
123123
124124
- save_cache:
125125
paths:
126126
- ~/react-spectrum
127-
key: react-spectrum-19-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
127+
key: react-spectrum-18-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
128+
129+
install-canary:
130+
executor: rsp-large
131+
steps:
132+
- checkout
133+
134+
- run:
135+
name: Write npmrc
136+
command: |
137+
if [ $NPM_PASSWORD ]; then
138+
cp .circleci/.npmrc .npmrc
139+
fi
140+
141+
- run:
142+
name: build
143+
command: |
144+
yarn install --immutable && yarn install-canary
145+
146+
- save_cache:
147+
paths:
148+
- ~/react-spectrum
149+
key: react-spectrum-canary-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
128150

129151
test-ssr:
130152
executor: rsp-xlarge
@@ -184,11 +206,22 @@ jobs:
184206
command: |
185207
yarn test:ssr
186208
187-
test-ssr-19:
209+
test-ssr-18:
210+
executor: rsp-xlarge
211+
steps:
212+
- restore_cache:
213+
key: react-spectrum-18-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
214+
215+
- run:
216+
name: test ssr
217+
command: |
218+
yarn test:ssr
219+
220+
test-ssr-canary:
188221
executor: rsp-xlarge
189222
steps:
190223
- restore_cache:
191-
key: react-spectrum-19-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
224+
key: react-spectrum-canary-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
192225

193226
- run:
194227
name: test ssr
@@ -243,12 +276,12 @@ jobs:
243276
- store_artifacts:
244277
path: ~/junit
245278

246-
test-19:
279+
test-18:
247280
parallelism: 3
248281
executor: rsp-xlarge
249282
steps:
250283
- restore_cache:
251-
key: react-spectrum-19-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
284+
key: react-spectrum-18-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
252285

253286
- run: mkdir ~/junit
254287

@@ -257,10 +290,34 @@ jobs:
257290
command: |
258291
shopt -s globstar
259292
TESTFILES=$(circleci tests glob "packages/**/*.test.[tj]{s,sx}" | circleci tests split --split-by=timings)
260-
JEST_JUNIT_OUTPUT_NAME="junit-19.xml" yarn test ${TESTFILES}
293+
JEST_JUNIT_OUTPUT_NAME="junit-18.xml" yarn test ${TESTFILES}
261294
262295
- run:
263-
command: cp junit-19.xml ~/junit/
296+
command: cp junit-18.xml ~/junit/
297+
when: always
298+
- store_test_results:
299+
path: ~/junit
300+
- store_artifacts:
301+
path: ~/junit
302+
303+
test-canary:
304+
parallelism: 3
305+
executor: rsp-xlarge
306+
steps:
307+
- restore_cache:
308+
key: react-spectrum-canary-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
309+
310+
- run: mkdir ~/junit
311+
312+
- run:
313+
name: test
314+
command: |
315+
shopt -s globstar
316+
TESTFILES=$(circleci tests glob "packages/**/*.test.[tj]{s,sx}" | circleci tests split --split-by=timings)
317+
JEST_JUNIT_OUTPUT_NAME="junit-canary.xml" yarn test ${TESTFILES}
318+
319+
- run:
320+
command: cp junit-canary.xml ~/junit/
264321
when: always
265322
- store_test_results:
266323
path: ~/junit
@@ -368,51 +425,6 @@ jobs:
368425
paths:
369426
- '*/storybook/'
370427

371-
storybook-16:
372-
executor: rsp-large
373-
steps:
374-
- restore_cache:
375-
key: react-spectrum16-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
376-
377-
- run:
378-
name: build storybook-16
379-
command: make storybook-16
380-
381-
- persist_to_workspace:
382-
root: dist
383-
paths:
384-
- '*/storybook-16/'
385-
386-
storybook-17:
387-
executor: rsp-large
388-
steps:
389-
- restore_cache:
390-
key: react-spectrum17-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
391-
392-
- run:
393-
name: build storybook-17
394-
command: make storybook-17
395-
396-
- persist_to_workspace:
397-
root: dist
398-
paths:
399-
- '*/storybook-17/'
400-
401-
storybook-19:
402-
executor: rsp-large
403-
steps:
404-
- restore_cache:
405-
key: react-spectrum-19-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
406-
407-
- run:
408-
name: build storybook-19
409-
command: make storybook-19
410-
411-
- persist_to_workspace:
412-
root: dist
413-
paths:
414-
- '*/storybook-19/'
415-
416428
storybook-s2:
417429
executor: rsp-large
418430
steps:
@@ -788,7 +800,8 @@ workflows:
788800
- install
789801
- install-16
790802
- install-17
791-
- install-19
803+
- install-18
804+
- install-canary
792805
- test-ssr:
793806
requires:
794807
- install
@@ -807,12 +820,18 @@ workflows:
807820
- test-17:
808821
requires:
809822
- install-17
810-
- test-19:
823+
- test-18:
824+
requires:
825+
- install-18
826+
- test-ssr-18:
827+
requires:
828+
- install-18
829+
- test-canary:
811830
requires:
812-
- install-19
813-
- test-ssr-19:
831+
- install-canary
832+
- test-ssr-canary:
814833
requires:
815-
- install-19
834+
- install-canary
816835
- test-esm:
817836
requires:
818837
- install
@@ -844,15 +863,6 @@ workflows:
844863
- storybook:
845864
requires:
846865
- install
847-
- storybook-16:
848-
requires:
849-
- install-16
850-
- storybook-17:
851-
requires:
852-
- install-17
853-
- storybook-19:
854-
requires:
855-
- install-19
856866
- storybook-s2:
857867
requires:
858868
- install
@@ -907,11 +917,10 @@ workflows:
907917
- test-16
908918
- test-ssr-17
909919
- test-17
920+
- test-ssr-18
921+
- test-18
910922
- test-esm
911923
- storybook
912-
- storybook-16
913-
- storybook-17
914-
- storybook-19
915924
- storybook-s2
916925
- docs
917926
- deploy-verdaccio:

‎.storybook-s2/custom-addons/provider/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {getQueryParams} from '@storybook/preview-api';
55
// Importing from src so that HMR works.
66
// Without this, all HMR updates will bubble through the index.ts and up
77
// to the root instead of stopping at the story files.
8-
import {Provider} from '@react-spectrum/s2/src/Provider';
8+
import {Provider} from '../../../packages/@react-spectrum/s2/src/Provider';
99

1010
document.body.style.margin = '0';
1111

‎.storybook-s2/docs/Icons.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {ActionButton, Text} from '@react-spectrum/s2';
44
import {H2, H3, P, Code, Pre, Link} from './typography';
55
import {highlight} from './highlight' with {type: 'macro'};
66
import {IconColors} from './Colors';
7-
import CheckmarkCircle from '../../packages/@react-spectrum/s2/s2wf-icons/S2_Icon_CheckmarkCircle_20_N.svg';
7+
import CheckmarkCircle from '@react-spectrum/s2/icons/CheckmarkCircle';
88
import {iconStyle} from '../../packages/@react-spectrum/s2/style' with {type: 'macro'};
99

1010
export function Icons() {

‎.storybook-s2/docs/Illustrations.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import linearIllustrations from '@react-spectrum/s2/spectrum-illustrations/linear/*.tsx';
22
import gradientIllustrations from '@react-spectrum/s2/spectrum-illustrations/gradient/*/*.tsx';
3-
import Paste from '@react-spectrum/s2/s2wf-icons/S2_Icon_Paste_20_N.svg';
3+
import Paste from '@react-spectrum/s2/icons/Paste';
44
import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'};
5-
import {ActionButton, Text} from '@react-spectrum/s2';
5+
import {ActionButton, Radio, RadioGroup} from '@react-spectrum/s2';
66
import {H2, H3, P, Code, Pre, Link} from './typography';
77
import {highlight} from './highlight' with {type: 'macro'};
8-
import { Radio, RadioGroup } from '../../packages/@react-spectrum/s2/src';
98
import { useState } from 'react';
109

1110
export function Illustrations() {

‎.storybook-s2/docs/Intro.jsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'};
2-
import {Button, LinkButton, ButtonGroup, Checkbox, Content, Dialog, DialogTrigger, Footer, Header, Heading, Image, InlineAlert, Menu, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger, Switch, Text} from '@react-spectrum/s2';
3-
import NewIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_New_20_N.svg';
4-
import ImgIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_Image_20_N.svg';
5-
import CopyIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_Copy_20_N.svg';
6-
import CommentTextIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_CommentText_20_N.svg';
7-
import ClockPendingIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_ClockPending_20_N.svg';
8-
import CommunityIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_Community_20_N.svg';
9-
import DeviceTabletIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_DeviceTablet_20_N.svg';
10-
import DeviceDesktopIcon from '@react-spectrum/s2/s2wf-icons/S2_Icon_DeviceDesktop_20_N.svg';
2+
import {Button, ButtonGroup, Checkbox, Content, Dialog, DialogTrigger, Footer, Header, Heading, Image, InlineAlert, Menu, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger, Switch, Text} from '@react-spectrum/s2';
3+
import NewIcon from '@react-spectrum/s2/icons/New';
4+
import ImgIcon from '@react-spectrum/s2/icons/Image';
5+
import CopyIcon from '@react-spectrum/s2/icons/Copy';
6+
import CommentTextIcon from '@react-spectrum/s2/icons/CommentText';
7+
import ClockPendingIcon from '@react-spectrum/s2/icons/ClockPending';
8+
import CommunityIcon from '@react-spectrum/s2/icons/Community';
9+
import DeviceTabletIcon from '@react-spectrum/s2/icons/DeviceTablet';
10+
import DeviceDesktopIcon from '@react-spectrum/s2/icons/DeviceDesktop';
1111
import {highlight} from './highlight' with {type: 'macro'};
1212
import {H2, H3, H4, P, Pre, Code, Strong, Link} from './typography';
1313

‎.storybook-s2/preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '@react-spectrum/s2/src/page';
1+
import '@react-spectrum/s2/page.css';
22
import { themes } from '@storybook/theming';
33
import { DARK_MODE_EVENT_NAME } from 'storybook-dark-mode';
44
import { store } from 'storybook-dark-mode/dist/esm/Tool';

‎.yarn/patches/micromark-extension-mdxjs-npm-1.0.0-d2b6b69e4a.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/index.d.ts b/index.d.ts
2+
index ba9855b0a36d5fbd70f92da611f3e1e96f203ee3..167de6defae46d391a45cc63dd11403722fb1619 100644
3+
--- a/index.d.ts
4+
+++ b/index.d.ts
5+
@@ -4,7 +4,7 @@
6+
*/
7+
export function mdxjs(
8+
options?:
9+
- | import('micromark-extension-mdx-expression/dev/lib/syntax').Options
10+
+ | Options
11+
| undefined
12+
): Extension
13+
export type Extension = import('micromark-util-types').Extension

‎.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/index.d.ts b/index.d.ts
2+
index c5da87629f94c457947bc712439c94b028cd5d81..3bec2ed83b30a40f84f51665eebf7a67d1a628c1 100644
3+
--- a/index.d.ts
4+
+++ b/index.d.ts
5+
@@ -4,7 +4,7 @@
6+
*
7+
* @type {import('unified').Plugin<[Options?]|Array<void>, Root>}
8+
*/
9+
-export default function remarkMdx(options?: void | import("micromark-extension-mdx-expression/dev/lib/syntax").Options | undefined): void | import("unified").Transformer<import("mdast").Root, import("mdast").Root>;
10+
+export default function remarkMdx(options?: void | import("micromark-extension-mdx-expression").Options | undefined): void | import("unified").Transformer<import("mdast").Root, import("mdast").Root>;
11+
export type Root = import('mdast').Root;
12+
export type Options = import('micromark-extension-mdxjs').Options;
13+
export type DoNotTouchAsThisImportItIncludesMdxInTree = typeof import("mdast-util-mdx");

‎.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/lib/index.d.ts b/lib/index.d.ts
2+
index 0e8563eb2fe2aad42400d3aad666f36df0dbc16a..d20f18817ab64c586de59eb411fd739ece028a95 100644
3+
--- a/lib/index.d.ts
4+
+++ b/lib/index.d.ts
5+
@@ -1,6 +1,6 @@
6+
/** @type {import('unified').Plugin<[Options?] | void[], string, Root>} */
7+
export default function remarkParse(
8+
- options: void | import('mdast-util-from-markdown/lib').Options | undefined
9+
+ options: void | import('mdast-util-from-markdown').Options | undefined
10+
): void
11+
export type Root = import('mdast').Root
12+
export type Options = import('mdast-util-from-markdown').Options

‎Makefile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,6 @@ icons: packages/@spectrum-icons/workflow/src packages/@spectrum-icons/color/src
8181
storybook:
8282
NODE_ENV=production yarn build:storybook
8383

84-
storybook-16:
85-
yarn build:storybook-16
86-
87-
storybook-17:
88-
yarn build:storybook-17
89-
90-
storybook-19:
91-
yarn build:storybook-19
92-
9384
# for now doesn't have deploy since v3 doesn't have a place for docs and stuff yet
9485
ci:
9586
$(MAKE) publish

‎eslint.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ export default [{
312312
"@spectrum-icons/ui",
313313
"@spectrum-icons/workflow",
314314
"@spectrum-icons/illustrations",
315+
"@react-spectrum/s2/icons"
315316
],
316317
}],
317318

0 commit comments

Comments
 (0)