Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V4.0.0 #644

Merged
merged 459 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
459 commits
Select commit Hold shift + click to select a range
1cfb61b
Merge branch 'v4.0.0' of https://github.com/pixiv/charcoal into toshu…
toshusai Jun 7, 2024
8b1988a
fix: unnecessary aria-selected
toshusai Jun 12, 2024
601f1bd
Merge pull request #559 from pixiv/toshusai/feat-update-v4-radio-group
toshusai Jun 12, 2024
c1be208
Merge pull request #549 from pixiv/toshusai/dropdown-selector-change-…
toshusai Jun 12, 2024
4b5d1ba
chore: publish [skip ci]
actions-user Jun 12, 2024
f531016
refactor: replace data url
toshusai Jun 14, 2024
8491bbb
feat(theme): add CSS and json for v4
mimokmt Jun 17, 2024
41db85c
chore(theme): add sideEffects
mimokmt Jun 20, 2024
d8e1857
chore: update prettierignore
mimokmt Jun 20, 2024
2307cc0
add jest-config.mjs
mimokmt Jun 21, 2024
d023766
feat: remove styled from react
toshusai Jun 26, 2024
a5a68d8
fix: add css var type
toshusai Jun 26, 2024
9700227
chore(token-cli): remove build artifacts
mimokmt Jun 26, 2024
df208a7
chore(styled): update snapshot
naporin0624 Jun 26, 2024
02beddd
chore: fix css import test
naporin0624 Jun 26, 2024
873a5be
Merge pull request #563 from pixiv/mimo/add-theme-css
mimokmt Jun 26, 2024
98d116c
chore: a11y testing test-runner
naporin0624 Jun 26, 2024
692eb3a
chore: add --passWithNoTests
naporin0624 Jun 26, 2024
c4ec44e
chore: build storybook
naporin0624 Jun 26, 2024
cc16974
chore: add jest and babel
naporin0624 Jun 26, 2024
9ff7e25
chore: update snapshots
naporin0624 Jun 26, 2024
5ebd8e9
chore: ci
naporin0624 Jun 26, 2024
fb64853
Merge pull request #569 from pixiv/naporitan/packages-install-jest-babel
naporin0624 Jun 26, 2024
7176db2
Merge branch 'v4.0.0' of ssh://github.com/pixiv/charcoal into toshusa…
naporin0624 Jun 26, 2024
0711cfb
chore: format
naporin0624 Jun 26, 2024
e659ef5
chore: add a11y test ci disabled
naporin0624 Jun 26, 2024
97a0e46
chore: remove props from charcoal provider
naporin0624 Jun 27, 2024
21b5dd0
chore: changed back to using identity-obj-proxy
naporin0624 Jun 27, 2024
7750fe9
chore(react): also revert the jest config settings
naporin0624 Jun 27, 2024
922881d
chore: so that build will pass
naporin0624 Jun 27, 2024
a45644f
chore: update yarn.lock
naporin0624 Jun 27, 2024
a16aaac
chore: format code
naporin0624 Jun 27, 2024
94c6cd6
chore: remove unused module
naporin0624 Jun 27, 2024
fd4e32f
Merge pull request #565 from pixiv/toshusai/remove-styled-from-react
toshusai Jun 28, 2024
b2b2175
Merge branch 'v4.0.0' of https://github.com/pixiv/charcoal into toshu…
toshusai Jun 28, 2024
86c385f
chore: debug
naporin0624 Jun 28, 2024
54dfbc2
chore: debug
naporin0624 Jun 28, 2024
54fb641
chore: test:image-snapshot
naporin0624 Jun 28, 2024
8ff76b5
chore: use scripts command
naporin0624 Jun 28, 2024
f3dc249
Merge pull request #572 from pixiv/naporitan/fix-test-storybook-ci
naporin0624 Jun 28, 2024
f2e28a9
feat: use component instead of as
toshusai Jul 1, 2024
58ee186
Merge pull request #571 from pixiv/toshusai/clip-path-instead-of-data…
toshusai Jul 1, 2024
8e7919e
Merge branch 'v4.0.0' of https://github.com/pixiv/charcoal into toshu…
toshusai Jul 1, 2024
1751465
docs: add v4.0.0 docs
toshusai Jul 1, 2024
295d1c7
fix: typo
toshusai Jul 1, 2024
37b8142
docs: update docs
toshusai Jul 1, 2024
c4f71f1
Merge pull request #573 from pixiv/toshusai/feat-use-component-instea…
toshusai Jul 1, 2024
48409c7
Merge pull request #575 from pixiv/toshusai/fix-typo
toshusai Jul 1, 2024
c1bcef7
fix: modal size
toshusai Jul 2, 2024
88deabb
test: update snapshots
toshusai Jul 2, 2024
fddf8c8
Merge pull request #576 from pixiv/toshusai/fix-modal-size
toshusai Jul 3, 2024
f6a18bc
feat: delete ComponentAbstraction
toshusai Jul 3, 2024
894f3c8
style: format
toshusai Jul 3, 2024
797dcbb
fix: tsconfig
toshusai Jul 4, 2024
af6f194
Merge pull request #577 from pixiv/toshusai/remove-component-abstraction
toshusai Jul 4, 2024
ab971aa
Merge branch 'main' of https://github.com/pixiv/charcoal into v4.0.0
naporin0624 Jul 4, 2024
a243781
chore(react): remove test checkbox
naporin0624 Jul 4, 2024
5cd7c44
chore: remove docs
naporin0624 Jul 4, 2024
5aec25c
chore(react): update snapshot
naporin0624 Jul 4, 2024
562930c
Merge pull request #578 from pixiv/naporitan/merge-v4-main
toshusai Jul 4, 2024
61d9078
feat: pullrequest-cli is not public package
toshusai Jul 5, 2024
2488d47
Merge pull request #580 from pixiv/toshusai/add-private-to-pullreques…
toshusai Jul 5, 2024
ab993c8
chore(token-cli): change package.json
naporin0624 Jul 5, 2024
5a66829
Merge pull request #581 from pixiv/chore/token-cli-pacakge
naporin0624 Jul 5, 2024
5082067
chore: publish [skip ci]
actions-user Jul 5, 2024
dde2674
chore(pullrequest-cli): remove publishConfig
naporin0624 Jul 5, 2024
43fa46f
Merge pull request #582 from pixiv/chore/remove-publish-config-from-p…
toshusai Jul 5, 2024
7a57245
chore: publish [skip ci]
actions-user Jul 5, 2024
aed3297
chore(token-cli): private true
naporin0624 Jul 5, 2024
98fdec9
chore: publish [skip ci]
actions-user Jul 5, 2024
15ae9f9
feat: replace as to component
toshusai Jul 5, 2024
fc0e2d0
fix: dark theme config
mimokmt Jul 3, 2024
c3d04a0
fix(token-cli): camel case to cebab case
mimokmt Jul 8, 2024
113ac22
chore(token-cli): add test
mimokmt Jul 8, 2024
5f91c2a
Merge pull request #586 from pixiv/mimo/fix-token-cli-v4
mimokmt Jul 8, 2024
786c063
fix: remove unused props.
toshusai Jul 9, 2024
5ee3df4
Merge pull request #584 from pixiv/toshusai/replace-as-to-component
toshusai Jul 9, 2024
d5bb134
fix(token-cli): primitive token named negative value case
mimokmt Jul 9, 2024
55fa63c
feat: update docs
toshusai Jul 10, 2024
58dceef
Merge pull request #590 from pixiv/mimo/fix-token-cli-v4
mimokmt Jul 10, 2024
c2306c0
Merge branch 'naporitan/replace-vitest' into naporitan/merge-test
naporin0624 Jul 10, 2024
4f36a00
chore: replace jest -> vitest
naporin0624 Jul 11, 2024
1f30736
chore: refactor
naporin0624 Jul 11, 2024
050f6da
Merge branch 'naporitan/replace-vitest' into naporitan/merge-test
naporin0624 Jul 11, 2024
848e099
Merge branch 'naporitan/replace-vitest' into naporitan/merge-test
naporin0624 Jul 11, 2024
4abcf9d
Merge branch 'naporitan/replace-vitest' into naporitan/merge-test
naporin0624 Jul 11, 2024
b83b55d
fix(token-cli): prefix, selector, actions
mimokmt Jul 11, 2024
9a40b76
Merge pull request #597 from pixiv/mimo/fix-token-cli-v4
mimokmt Jul 11, 2024
ff7bd9c
Update theme
charcoal-bot[bot] Jul 11, 2024
8e779a5
Merge pull request #599 from pixiv/theme/update/1720688813536
naporin0624 Jul 11, 2024
0d03089
chore(token-cli): change selector
naporin0624 Jul 11, 2024
5587a0f
Merge pull request #601 from pixiv/naporitan/token-selectors-v4
naporin0624 Jul 11, 2024
1e33504
Update theme
charcoal-bot[bot] Jul 11, 2024
10a0639
Merge pull request #603 from pixiv/theme/update/1720692237769
naporin0624 Jul 11, 2024
9a993d6
Merge pull request #592 from pixiv/naporitan/merge-test
naporin0624 Jul 12, 2024
a13c826
chore: publish [skip ci]
actions-user Jul 12, 2024
9ead49f
Merge branch 'v4.0.0' of https://github.com/pixiv/charcoal into toshu…
toshusai Jul 16, 2024
29bc1e3
chore: replace variables css
naporin0624 Jul 17, 2024
e512930
chore: remove comment
naporin0624 Jul 17, 2024
aa6f66e
chore: replace `--charcoal` `--charcoal-color`
naporin0624 Jul 17, 2024
2438b75
feat(react): create css variables test
naporin0624 Jul 17, 2024
3a1cc80
feat(react): replace new tokens
naporin0624 Jul 17, 2024
93cad83
chore(react): update snapshot
naporin0624 Jul 17, 2024
9813228
chore(react): fix styling
naporin0624 Jul 17, 2024
8c9fa77
chore(react): fix styling
naporin0624 Jul 17, 2024
f3bc600
chore(react): update snapshot
naporin0624 Jul 17, 2024
f6abbab
chore(react): transparent -> rgba(0,0,0,0)
naporin0624 Jul 19, 2024
0b1afd3
Update theme
charcoal-bot[bot] Jul 19, 2024
f346420
Merge pull request #605 from pixiv/theme/update/1721382816089
naporin0624 Jul 19, 2024
d35fc24
Merge branch 'v4.0.0' of ssh://github.com/pixiv/charcoal into naporit…
naporin0624 Jul 19, 2024
11a3059
chore: use on-img
naporin0624 Jul 19, 2024
7629333
chore(react): text4 -> container-neutral
naporin0624 Jul 19, 2024
6376434
chore(react): use container press, hover
naporin0624 Jul 19, 2024
8f641ba
Update theme
charcoal-bot[bot] Jul 19, 2024
963d84d
Merge pull request #606 from pixiv/theme/update/1721388992545
naporin0624 Jul 19, 2024
342b51f
Merge branch 'v4.0.0' of ssh://github.com/pixiv/charcoal into naporit…
naporin0624 Jul 19, 2024
70acd17
feat(react): replace focus effect
naporin0624 Jul 24, 2024
26afbc6
chore(react): add component custom variables
naporin0624 Jul 24, 2024
7fa1ab6
fix(react): fix OverlayButtoncolor
naporin0624 Jul 24, 2024
fc3053d
feat(token-cli-workflow): update variable collection name
mimokmt Jul 24, 2024
03a4da1
chore(react): add HUD token commented
naporin0624 Jul 25, 2024
81f5fee
feat(react): change disabled styling
naporin0624 Jul 25, 2024
5131dad
fix: modalがサーバーサイドで利用できない問題を修正
toshusai Jul 26, 2024
3a9ec1e
Update theme
charcoal-bot[bot] Jul 26, 2024
1433fba
Merge pull request #613 from pixiv/theme/update/1721970925381
mimokmt Jul 26, 2024
43f410b
Merge pull request #610 from pixiv/toshusai/fix-modal-does-not-work-i…
toshusai Jul 26, 2024
4b1818f
Merge pull request #608 from pixiv/mimo/update-variable-collection-na…
mimokmt Jul 26, 2024
0b37817
chore: publish [skip ci]
actions-user Jul 30, 2024
a7e1701
chore(react): update snapshot
naporin0624 Jul 31, 2024
8045e82
chore: change focus ring variable
naporin0624 Aug 14, 2024
f9c88f1
Merge branch 'v4.0.0' of ssh://github.com/pixiv/charcoal into naporit…
naporin0624 Aug 14, 2024
958a4e1
chore(react): fix variables name
naporin0624 Aug 15, 2024
848655e
Merge branch 'v4.0.0' of https://github.com/pixiv/charcoal into toshu…
toshusai Aug 16, 2024
a77f802
docs: update docs
toshusai Aug 16, 2024
9902f04
feat: add @layer charcoal output
yue4u Aug 18, 2024
4104028
fix: ensure dir exist before write
yue4u Aug 18, 2024
0de6091
Merge pull request #574 from pixiv/toshusai/docs-add-v4.0.0
toshusai Aug 26, 2024
409ba57
Merge pull request #619 from yue4u/feat/add-at-layer-output
mimokmt Aug 27, 2024
e071f61
chore: publish [skip ci]
actions-user Aug 27, 2024
9f19b8b
chore: remove React namespace
naporin0624 Sep 18, 2024
7ef7236
chore(react): use matchAll
naporin0624 Oct 2, 2024
53bbd05
chore(react): remove empty variables
naporin0624 Oct 2, 2024
94e9117
Merge branch 'v4.0.0' of ssh://github.com/pixiv/charcoal into naporit…
naporin0624 Oct 2, 2024
2fadfd0
chore(react): empty variables
naporin0624 Oct 2, 2024
d41b3b7
chore(theme): remove alias
naporin0624 Oct 2, 2024
c7a236a
feat(token-cli): add new category token
mimokmt Oct 4, 2024
9afefb7
Merge pull request #629 from pixiv/mimo/add-text-token
mimokmt Oct 9, 2024
958ceea
Update theme
charcoal-bot[bot] Oct 9, 2024
df5d820
Merge pull request #632 from pixiv/theme/update/1728458893313
mimokmt Oct 10, 2024
bda2772
feat(icon-workflow): Enable creation of PRs to the base branch
mimokmt Oct 16, 2024
8ac92a3
feat(theme): create token json merger
naporin0624 Oct 16, 2024
b28a6a3
chore(theme): add resolvejsonmodule
naporin0624 Oct 16, 2024
417573f
feat(theme): change camelcase
naporin0624 Oct 16, 2024
6ba7864
chore(theme): remove directory
naporin0624 Oct 16, 2024
356f180
chore(theme): refactor token-object
naporin0624 Oct 16, 2024
630bece
Merge pull request #637 from pixiv/mimo/fix-icons-cli
mimokmt Oct 17, 2024
dfa88c4
[icons-cli] Update icons Mon Oct 21 2024
charcoal-bot[bot] Oct 21, 2024
499f61f
Merge pull request #640 from pixiv/icons/update/1729473936842
mimokmt Oct 21, 2024
db17dd4
chore: publish [skip ci]
actions-user Oct 21, 2024
dd30623
Merge branch 'v4.0.0' into feta/create-styled-tokens
naporin0624 Oct 23, 2024
51a5c46
chore(theme): add token object
naporin0624 Oct 23, 2024
02bb4dc
chore(theme): commonjs support
naporin0624 Oct 23, 2024
ee288be
chore(react): add comment
naporin0624 Oct 23, 2024
ebe0342
chore(react): remove background color
naporin0624 Oct 23, 2024
42cca0b
Merge pull request #393 from yue4u/feat/skip-dom-purify-for-trusted-c…
yue4u Oct 24, 2024
7516462
fix!(@charcoal-ui/icons): remove dompurify from v4. Users should sani…
yue4u Oct 24, 2024
3305284
chore(theme): add benchmark test
naporin0624 Oct 24, 2024
a3f0d19
chore(theme): remove token-object export
naporin0624 Oct 24, 2024
5af6f0b
chore(theme): add token-object path
naporin0624 Oct 24, 2024
0216ce6
feat(theme): add css variables json
naporin0624 Oct 24, 2024
9d8abfe
chore(theme): change output dir
naporin0624 Oct 24, 2024
66e33c6
chore(theme): 一括で生成する
naporin0624 Oct 25, 2024
16eadc3
chore(theme): subpath import 対応
naporin0624 Oct 25, 2024
001e909
chore(theme): fix build
naporin0624 Oct 25, 2024
d14e048
chore(react): update snapshot
naporin0624 Oct 30, 2024
ab9560f
Merge pull request #639 from pixiv/feta/create-styled-tokens
naporin0624 Oct 30, 2024
724c519
chore(@charcoal-ui/tailwind-config): add test for defaultConfig
yue4u Oct 30, 2024
6d452e1
Merge pull request #643 from pixiv/fix/remove-dompurify
yue4u Oct 31, 2024
df265b0
Merge pull request #648 from pixiv/test/add-test-for-defaultConfig-ta…
yue4u Oct 31, 2024
bd04ecb
fix(@charcoal-ui/theme)!: unify css variables json
yue4u Oct 31, 2024
5115ed4
Merge pull request #649 from pixiv/fix/unify-css-variables-json
yue4u Oct 31, 2024
178fe0d
Merge branch 'v4.0.0' of ssh://github.com/pixiv/charcoal into naporit…
naporin0624 Nov 6, 2024
f9b54b6
fix: pass down className prop
AN-Sippo Nov 8, 2024
316561b
Merge pull request #651 from AN-Sippo/sippo/fix-pass-down-className
yue4u Nov 12, 2024
01b1b37
chore: publish [skip ci]
actions-user Nov 12, 2024
371efbc
fix: update design token usage
yue4u Nov 13, 2024
d7a11c3
fix: remove pr target limits
yue4u Nov 13, 2024
8f7371b
fix: check bundle-size for owned packages only
yue4u Nov 13, 2024
bf9fb76
Merge pull request #653 from pixiv/fix/ci-config
yue4u Nov 13, 2024
ed9db94
fix: remove pr target limits
yue4u Nov 13, 2024
e26d751
fix: check bundle-size for owned packages only
yue4u Nov 13, 2024
5aff40b
fix: revert disabled and readonly ui to opacity
yue4u Nov 13, 2024
df4f644
fix: use input[readonly]
yue4u Nov 20, 2024
ce5294c
Merge pull request #652 from pixiv/yue/replace-token1-modify
yue4u Nov 20, 2024
cd29d33
Merge pull request #604 from pixiv/naporitan/replace-token1
naporin0624 Nov 20, 2024
c0ae5d6
エイリアスの解決ができない時、token名をエラーに出す
mimokmt Dec 4, 2024
6613787
feat(token-cli): 参照できないtokenがあるとき、warnを出すがそのまま処理を続ける
mimokmt Dec 4, 2024
4454005
Merge pull request #662 from pixiv/mimo/fix-token-cli-v4
mimokmt Dec 4, 2024
f7276b6
Revert "Update Design Tokens, Add CSS Variables Tests, and Introduce …
yue4u Dec 13, 2024
441fd35
Merge pull request #663 from pixiv/revert-604-naporitan/replace-token1
yue4u Dec 13, 2024
f08e2a9
Merge branch 'main' into v4.0.0
yue4u Dec 13, 2024
233902f
Merge branch 'main' into v4.0.0
yue4u Dec 13, 2024
a001742
fix: revert theme merge
yue4u Dec 13, 2024
6c15554
docs: add charcoal provider guide
yue4u Dec 13, 2024
1ce2e0d
Merge pull request #665 from pixiv/docs/add-charcoal-provider-guide
yue4u Dec 13, 2024
03a4f49
fix: token cli dts
yue4u Dec 13, 2024
b9cb005
fix: workflow cp target dir
yue4u Dec 13, 2024
6fbcf61
fix: add find log
yue4u Dec 13, 2024
7c048c0
fix: fix cp dir suffix again
yue4u Dec 13, 2024
5bbc18e
fix: fix cp dir suffix take 3
yue4u Dec 13, 2024
1dc0fdb
fix: fix cp dir suffix take 4
yue4u Dec 13, 2024
1ce83c5
Merge pull request #667 from pixiv/fix/token-cli-dts
yue4u Dec 13, 2024
275c634
feat: update theme 1734084615129
yue4u Dec 13, 2024
a96bcf7
Merge pull request #669 from pixiv/theme/update/1734084615129
yue4u Dec 13, 2024
075162d
chore(token-cli): figma から得られる float に suffix px を付ける
naporin0624 Nov 27, 2024
36f1e36
Update theme
charcoal-bot[bot] Dec 13, 2024
d38a666
Merge pull request #670 from pixiv/theme/update/1734085114224
yue4u Dec 13, 2024
68a3f2c
fix: update test snapshot
yue4u Dec 13, 2024
044795e
Merge pull request #657 from pixiv/chore/css-variables-add-px-suffix
yue4u Dec 13, 2024
84b6777
feat: token v2 demo styled
yue4u Nov 22, 2024
2a9cd99
feat: update toke usage and story name
yue4u Dec 13, 2024
d04b70d
fix: remove extra css import
yue4u Dec 13, 2024
3d405ed
Merge pull request #655 from pixiv/feat/token-v2-demo-styled
yue4u Dec 13, 2024
dcbf96a
fix: resolve float font weight
yue4u Dec 13, 2024
74b9bdc
Merge pull request #671 from pixiv/fix/resolve-float-font-weight
yue4u Dec 13, 2024
5123c54
Update theme
charcoal-bot[bot] Dec 13, 2024
e84c589
Merge pull request #672 from pixiv/theme/update/1734094059530
yue4u Dec 13, 2024
67bcf69
fix: update test snapshot
yue4u Dec 13, 2024
ecdb471
feat(@charcoal-ui/tailwind-config): allow design token v2 in tailwind…
yue4u Oct 31, 2024
d106c78
feat: allow design token v2 in tailwind config
yue4u Dec 13, 2024
96666f2
fix: fmt
yue4u Dec 13, 2024
83f4d6d
fix: fmt
yue4u Dec 13, 2024
0b064d4
fix: lint
yue4u Dec 13, 2024
bbd7313
fix: minor refactor and add comments
yue4u Dec 13, 2024
0280b5c
fix: allow merging v1 and v2 config
yue4u Dec 14, 2024
a322e4b
fix: space token and darkMode config
yue4u Dec 14, 2024
227b72c
fix: avoid undefined in tailwind config and rename v2 styled demo
yue4u Dec 16, 2024
8ba0447
fix: build before lint
yue4u Dec 16, 2024
17aed82
feat: add token v2 demo bench
yue4u Dec 16, 2024
5a62c71
feat: mark tokens unstable
yue4u Dec 14, 2024
dde4f95
Merge pull request #650 from pixiv/feat/allow-design-token-v2-in-tail…
yue4u Dec 16, 2024
5fa6444
Merge pull request #673 from pixiv/feat/add-token-v2-demo-bench
yue4u Dec 16, 2024
7534b89
Merge pull request #674 from pixiv/feat/mark-tokens-unstable
yue4u Dec 16, 2024
b7ce60c
chore: publish [skip ci]
actions-user Dec 16, 2024
5852f79
fix: tailwind demo space classnames
yue4u Dec 16, 2024
171d0bb
Merge pull request #676 from pixiv/fix/space-new-classnames
yue4u Dec 16, 2024
3c491f7
feat(docs): add v4 release note
mimokmt Dec 18, 2024
95acccb
chore: publish [skip ci]
actions-user Dec 18, 2024
0447d84
chore: prettierignore
mimokmt Dec 18, 2024
543248e
Merge pull request #677 from pixiv/mimo/v4-release-note
yue4u Dec 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/bundle-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Bundle Size

on:
pull_request:
branches:
- main

jobs:
build:
Expand All @@ -22,5 +20,5 @@ jobs:

# sourcemap は見ない
# d.ts はたまに異常な数の union 型が展開されるとかは検知したいが見なくて良いかもしれない
pattern: './packages/**/dist/**/*.{ts,js,cjs}'
pattern: './packages/*/dist/**/*.{ts,js,cjs}'
exclude: '{**/node_modules/**}'
3 changes: 0 additions & 3 deletions .github/workflows/docs-hosting-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: Deploy to Preview Channel

on:
pull_request:
branches:
- main
- v3.0.0

env:
WORKLOAD_IDENTITY_PROVIDER: 'projects/643536859873/locations/global/workloadIdentityPools/charcoal/providers/github-actions'
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ on:

env:
OUTPUT_ROOT_DIR: packages/icon-files/
TARGET_BRANCH: ${{ github.event_name == 'workflow_dispatch' && github.ref_name || 'main' }}

jobs:
icons:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.TARGET_BRANCH }}

- uses: actions/setup-node@v3
with:
node-version-file: '.node-version'
Expand Down Expand Up @@ -49,5 +53,5 @@ jobs:
GITHUB_ACCESS_TOKEN: ${{ steps.generate_token.outputs.token }}
GITHUB_REPO_OWNER: pixiv
GITHUB_REPO_NAME: charcoal
GITHUB_DEFAULT_BRANCH: main
GITHUB_DEFAULT_BRANCH: ${{ env.TARGET_BRANCH }}
run: yarn icons-cli github:pr
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
options:
- latest
- beta
- rc

jobs:
build:
Expand Down
50 changes: 21 additions & 29 deletions .github/workflows/test-storybook.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
name: test-storybook
on:
pull_request:
types: [labeled, unlabeled, opened, edited, synchronize]
branches:
- main
types: [labeled, unlabeled, opened, synchronize, reopened]

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
prepare-main-branch:
name: Prepare main branch image snapshots
prepare-base-branch:
name: Prepare base branch image snapshots
timeout-minutes: 20
runs-on: ubuntu-latest
steps:
- name: Checkout main branch
- name: Checkout base branch
uses: actions/checkout@v4
with:
ref: main
ref: ${{ github.event.pull_request.base.ref }}
fetch-depth: 0
- name: Check commit hash
id: commit-hash
Expand All @@ -25,7 +27,7 @@ jobs:
with:
path: __image_snapshots__
key: image-snapshots-${{ steps.commit-hash.outputs.hash }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
if: steps.cache-image-snapshots.outputs.cache-hit != 'true'
with:
node-version-file: '.node-version'
Expand All @@ -40,7 +42,7 @@ jobs:
path: |
/home/runner/.cache/ms-playwright/
key: ${{ runner.os }}-playwright-runner
- name: Install Playwgith
- name: Install Playwright
if: steps.cache-image-snapshots.outputs.cache-hit != 'true'
run: yarn playwright install --with-deps
- name: Build Storybook
Expand All @@ -50,32 +52,22 @@ jobs:
yarn storybook:build --quiet
- name: Serve Storybook and run tests
if: steps.cache-image-snapshots.outputs.cache-hit != 'true'
run: |
npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
"npx http-server storybook-static --port 6006 --silent" \
"npx wait-on tcp:127.0.0.1:6006 && yarn test-storybook --updateSnapshot"
- name: Upload main branch snapshots
run: yarn test:image-snapshot --updateSnapshot
- name: Upload base branch snapshots
uses: actions/upload-artifact@v4
with:
name: main__image-snapshots__
name: base__image-snapshots__
path: __image_snapshots__/

test-storybook:
name: Build Storybook
timeout-minutes: 20
runs-on: ubuntu-latest
needs: prepare-main-branch
needs: prepare-base-branch
steps:
- name: Checkout main branch
uses: actions/checkout@v3
with:
ref: main
fetch-depth: 0
- name: Check commit hash
id: commit-hash
run: echo "hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- name: Checkout branch
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: yarn
Expand All @@ -87,7 +79,7 @@ jobs:
path: |
/home/runner/.cache/ms-playwright/
key: ${{ runner.os }}-playwright-runner
- name: Install Playwgith
- name: Install Playwright
run: yarn playwright install --with-deps
- name: Build Storybook
run: |
Expand Down Expand Up @@ -117,11 +109,11 @@ jobs:

console.log(`Not fount "${process.env.SNAPSHOT_UPDATE_LABEL}" label. Compare with image snapshots of main branch.`)
return 'false'
- name: Load main branch image snapshots
- name: Load base branch image snapshots
uses: actions/download-artifact@v4
if: steps.label-checking.outputs.result != 'true'
with:
name: main__image-snapshots__
name: base__image-snapshots__
path: __image_snapshots__/
- name: Serve Storybook and run tests
if: steps.label-checking.outputs.result != 'true'
Expand Down
42 changes: 34 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
- main

pull_request:
branches:
- main

jobs:
build:
Expand All @@ -32,7 +30,8 @@ jobs:

- run: yarn install --immutable --inline-builds
- run: yarn build
- run: yarn test
- name: Test
run: yarn test
env:
CI: 'true'

Expand All @@ -46,11 +45,8 @@ jobs:
cache: yarn

- run: yarn install --immutable --inline-builds
- run: |
yarn lint:eslint
yarn lint:prettier
# v4.0.0 になったら有効化する
# yarn lint:styleilnt
- run: yarn build
- run: yarn lint

typecheck:
runs-on: ubuntu-latest
Expand All @@ -76,3 +72,33 @@ jobs:

- run: yarn install --immutable --inline-builds
- run: yarn typecheck:config

a11y:
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: yarn

- run: yarn install --immutable --inline-builds

- name: Cache Playwright runners
uses: actions/cache@v4
with:
path: |
/home/runner/.cache/ms-playwright/
key: ${{ runner.os }}-playwright-runner
- name: Install Playwright
run: yarn playwright install --with-deps

- name: Build Storybook
run: |
yarn build
yarn storybook:build --quiet

- name: a11y test by Run TestRunner
run: |
yarn test:a11y
9 changes: 5 additions & 4 deletions .github/workflows/tokens.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ jobs:

- name: Copy to theme package
run: |
rm -rf ../theme/src/json
rm -rf ../theme/src/css
cp -r ./tokens ../theme/src/json
cp -r ./build/css ../theme/src/css
rm -rf ../theme/src/json/*.json
rm -rf ../theme/src/css/*.css
cp -r ./tokens/*.json ../theme/src/json/
cp -r ./build/css/*.css ../theme/src/css/
find ../theme/src

- name: Run prettier
working-directory: ./
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ LICENSE
/packages/token-cli/build/
/packages/token-cli/tokens/
/packages/token-cli/out/
/packages/theme/src/css/
/packages/theme/src/unstable-css/
.storybook/src/v4.0.0.mdx
1 change: 1 addition & 0 deletions .storybook/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('../babel.config.js')
16 changes: 1 addition & 15 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ module.exports = {
rules: [
{
test: /\.css$/,
sideEffects: true,
use: [
'style-loader',
{
Expand Down Expand Up @@ -62,17 +63,13 @@ module.exports = {
if (configType === 'PRODUCTION') {
return config
}
// 事前ビルドが不要になるようにマッピング
config.resolve.alias = { ...config.resolve.alias, ...(await alias()) }
return config
},

async viteFinal(config, { configType }) {
if (configType === 'PRODUCTION') {
return config
}
// 事前ビルドが不要になるようにマッピング
config.resolve.alias = { ...config.resolve.alias, ...(await alias()) }
// proxyが噛んでいる場合にクライアント側のwssポート番号を変更する
if (typeof process.env.CLIENT_PORT !== 'undefined') {
config.server.hmr.port = process.env.CLIENT_PORT
Expand Down Expand Up @@ -134,17 +131,6 @@ module.exports = {
`,
}

const packagesDir = path.resolve(__dirname, '../packages')
const alias = async () =>
Object.fromEntries(
(await glob(path.resolve(packagesDir, '*'))).map((absolute) => {
const relative = path.relative(packagesDir, absolute)
const from = path.join('@charcoal-ui', relative)
const to = path.resolve(absolute, 'src')
return [from, to]
})
)

function getAbsolutePath(value) {
return dirname(require.resolve(join(value, 'package.json')))
}
Loading
Loading