Skip to content

Commit 320061b

Browse files
devongovettdevongovett
committed
Spectrum 2
1 parent 0d77626 commit 320061b

File tree

566 files changed

+4061
-5429
lines changed

Some content is hidden

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

566 files changed

+4061
-5429
lines changed

‎.circleci/comment.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ async function run() {
5757
[Publish stats](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/publish.json)
5858
[Size diff since last release](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/size-diff.txt)
5959
[Docs](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/docs/index.html)
60-
[Storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook/index.html)`
60+
[Storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook/index.html)
61+
[S2 Storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-s2/index.html)`
6162
});
6263
}
6364
} catch (error) {
@@ -79,6 +80,7 @@ async function run() {
7980
* [View the storybook-19](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-19/index.html)
8081
* [View the storybook-17](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-17/index.html)
8182
* [View the storybook-16](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-16/index.html)
83+
* [View the S2 storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-s2/index.html)
8284
* [View the documentation](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/docs/index.html)`
8385
});
8486
} catch (err) {

‎.circleci/config.yml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ jobs:
288288
name: test
289289
command: |
290290
make build
291-
yarn workspaces foreach --all -pt run prepublishOnly
292291
node --loader ./scripts/esm-support/loader.mjs ./scripts/esm-support/testESM.mjs
293292
294293
lint:
@@ -423,6 +422,21 @@ jobs:
423422
paths:
424423
- '*/storybook-19/'
425424

425+
storybook-s2:
426+
executor: rsp-large
427+
steps:
428+
- restore_cache:
429+
key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
430+
431+
- run:
432+
name: build s2 storybook
433+
command: yarn build:storybook-s2
434+
435+
- persist_to_workspace:
436+
root: dist
437+
paths:
438+
- '*/storybook-s2/'
439+
426440
docs:
427441
executor: rsp-xlarge
428442
steps:
@@ -609,6 +623,9 @@ workflows:
609623
- storybook-19:
610624
requires:
611625
- install-19
626+
- storybook-s2:
627+
requires:
628+
- install
612629
- docs:
613630
requires:
614631
- install
@@ -632,6 +649,7 @@ workflows:
632649
- storybook-16
633650
- storybook-17
634651
- storybook-19
652+
- storybook-s2
635653
- docs
636654
- deploy-verdaccio:
637655
requires:

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ packages/dev/storybook-builder-parcel/preview.js
1616
packages/dev/optimize-locales-plugin/LocalesPlugin.d.ts
1717
examples/**
1818
starters/**
19+
packages/@react-spectrum/s2/icon.d.ts

‎.eslintrc.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ module.exports = {
9797
}
9898
]
9999
}
100+
},
101+
{
102+
files: ['packages/@react-spectrum/s2/**'],
103+
rules: {
104+
'react/react-in-jsx-scope': OFF
105+
}
100106
}],
101107
env: {
102108
'browser': true,

‎.parcelrc-build‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
"resolvers": ["@parcel/resolver-glob", "parcel-resolver-build", "..."],
44
"bundler": "@parcel/bundler-library",
55
"transformers": {
6+
"style-types:*.ts": ["@parcel/transformer-typescript-types"],
67
"packages/**/intl/*.json": ["parcel-transformer-intl"],
78
"bundle-text:*.svg": ["@parcel/transformer-svg", "@parcel/transformer-inline-string"],
9+
"packages/@react-spectrum/s2/s2wf-icons/*.svg": ["parcel-transformer-icon"],
10+
// Disable PostCSS from running over style macro output
11+
"packages/@react-spectrum/s2/**/*.css": ["@parcel/transformer-css"],
812
"*.svg": ["@parcel/transformer-svg-react"],
913
"*.{js,mjs,jsm,jsx,es6,cjs,ts,tsx}": [
1014
"@parcel/transformer-js",
1115
"@parcel/transformer-react-refresh-wrap"
1216
]
1317
},
14-
"namers": ["parcel-namer-intl", "..."]
18+
"namers": ["parcel-namer-icon", "parcel-namer-intl", "..."]
1519
}

‎.storybook-s2/.parcelrc‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
{
22
"extends": "@parcel/config-default",
3-
"resolvers": ["parcel-resolver-storybook", "..."],
3+
"resolvers": ["@parcel/resolver-glob", "parcel-resolver-storybook", "..."],
44
"transformers": {
5-
"{src,stories}/*.{js,mjs,jsm,jsx,es6,cjs,ts,tsx}": ["../parcel-transformer-react-docgen-typescript/ReactDocgenTSTransformer.ts", "..."],
6-
"s2wf-icons/assets/svg/*.svg": ["../plugins/IconTransformer.js"],
5+
"packages/@react-spectrum/s2/{src,stories}/*.{js,mjs,jsm,jsx,es6,cjs,ts,tsx}": ["parcel-transformer-react-docgen-typescript", "..."],
6+
"packages/@react-spectrum/s2/s2wf-icons/*.svg": ["parcel-transformer-icon"],
7+
"packages/*/*/intl/*.json": ["parcel-transformer-intl"],
8+
// Disable PostCSS from running over style macro output
9+
"packages/@react-spectrum/s2/**/*.css": ["@parcel/transformer-css"],
10+
"*.{js,mjs,jsm,jsx,es6,cjs,ts,tsx}": [
11+
"@parcel/transformer-js",
12+
"@parcel/transformer-react-refresh-wrap"
13+
],
714
"*.svg": ["@parcel/transformer-svg-react"],
8-
"*.{md,mdx}": ["parcel-transformer-mdx"],
915
"raw:*": ["@parcel/transformer-raw"]
1016
}
1117
}

‎.storybook-s2/main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import type { StorybookConfig } from "@storybook/types";
1616

1717
const config: StorybookConfig = {
1818
stories: [
19-
'./Intro.mdx',
20-
"../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)",
19+
// './Intro.mdx',
20+
"../packages/@react-spectrum/s2/stories/*.stories.@(js|jsx|mjs|ts|tsx)",
2121
],
2222
addons: [
2323
"@storybook/addon-links",

‎.storybook-s2/preview.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '../src/page';
1+
import '@react-spectrum/s2/src/page';
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';

‎.storybook/main.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11

22
module.exports = {
3-
stories: ['../packages/**/stories/*.stories.{js,jsx,ts,tsx}'],
3+
stories: [
4+
'../packages/@{react-aria,react-stately,spectrum-icons}/*/stories/*.stories.{js,jsx,ts,tsx}',
5+
'../packages/@react-spectrum/!(s2)/stories/*.stories.{js,jsx,ts,tsx}',
6+
'../packages/react-aria-components/stories/*.stories.{js,jsx,ts,tsx}'
7+
],
48

59
addons: [
610
"@storybook/addon-actions",

‎Makefile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ clean_dist:
3535
rm -rf packages/{react-aria,react-aria-components,react-stately}/i18n
3636
rm -rf packages/@adobe/react-spectrum/i18n
3737
rm -rf packages/@react-aria/i18n/server
38+
rm -rf packages/@react-spectrum/s2/style/dist packages/@react-spectrum/s2/page.css packages/@react-spectrum/s2/icons
3839

3940
clean_parcel:
4041
rm -rf .parcel-cache
@@ -116,6 +117,7 @@ website-production:
116117
cp packages/dev/docs/pages/robots.txt dist/production/docs/robots.txt
117118
$(MAKE) starter-zip
118119
$(MAKE) tailwind-starter
120+
$(MAKE) s2-docs
119121

120122
check-examples:
121123
node scripts/extractExamples.mjs
@@ -139,3 +141,10 @@ tailwind-starter:
139141
mv starters/tailwind/react-aria-tailwind-starter.zip dist/production/docs/react-aria-tailwind-starter.$$(git rev-parse --short HEAD).zip
140142
cd starters/tailwind && yarn build-storybook
141143
mv starters/tailwind/storybook-static dist/production/docs/react-aria-tailwind-starter
144+
145+
s2-docs:
146+
yarn build:s2-docs -o dist/production/docs/s2
147+
148+
s2-api-diff:
149+
node scripts/buildBranchAPI.js
150+
node scripts/api-diff.js --skip-same --skip-style-props

0 commit comments

Comments
 (0)