-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:pixiv/charcoal into toshusai/fix-cl…
…ickable-style
- Loading branch information
Showing
54 changed files
with
23,468 additions
and
290 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| const file = 'test-file-stub' | ||
|
|
||
| export default file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export default '' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export default {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,30 @@ | ||
| import type { ReactNode } from 'react' | ||
|
|
||
| export {} | ||
|
|
||
| globalThis.ResizeObserver = jest.fn().mockImplementation(() => ({ | ||
| observe: jest.fn(), | ||
| unobserve: jest.fn(), | ||
| disconnect: jest.fn(), | ||
| })) | ||
|
|
||
| window.matchMedia = jest.fn().mockImplementation((query: string) => ({ | ||
| matches: false, | ||
| media: query, | ||
| onchange: null, | ||
| addListener: jest.fn(), | ||
| removeListener: jest.fn(), | ||
| addEventListener: jest.fn(), | ||
| removeEventListener: jest.fn(), | ||
| dispatchEvent: jest.fn(), | ||
| })) | ||
|
|
||
| jest.mock('@react-aria/utils', () => ({ | ||
| ...jest.requireActual('@react-aria/utils'), | ||
| useId: () => 'test-id', | ||
| })) | ||
|
|
||
| jest.mock('@react-aria/overlays', () => ({ | ||
| ...jest.requireActual('@react-aria/overlays'), | ||
| Overlay: jest.fn(({ children }: { children: ReactNode }) => children), | ||
| })) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ | |
| "build": "yarn workspaces foreach -vpt -j unlimited run build", | ||
| "clean": "yarn workspaces foreach -vp run clean", | ||
| "test": "jest", | ||
| "storyshots": "jest -c storyshots.config.mjs", | ||
| "test:strict": "USE_STRICT=1 jest", | ||
| "typecheck": "yarn workspaces foreach -vp run typecheck", | ||
| "typecheck:config": "tsc", | ||
|
|
@@ -41,10 +42,12 @@ | |
| "@commitlint/config-lerna-scopes": "^16.0.0", | ||
| "@originjs/vite-plugin-commonjs": "^1.0.3", | ||
| "@storybook/addon-a11y": "^7.4.1", | ||
| "@storybook/addon-docs": "^7.5.1", | ||
| "@storybook/addon-essentials": "^7.4.1", | ||
| "@storybook/addon-interactions": "^7.4.1", | ||
| "@storybook/addon-links": "^7.4.1", | ||
| "@storybook/addon-onboarding": "^1.0.8", | ||
| "@storybook/addon-storyshots": "7.4.1", | ||
| "@storybook/addon-storysource": "^7.4.1", | ||
| "@storybook/addon-styling": "^1.3.7", | ||
| "@storybook/addon-styling-webpack": "^0.0.5", | ||
|
|
@@ -84,6 +87,7 @@ | |
| "prettier": "^2.8.4", | ||
| "react": "^17.0.2", | ||
| "react-dom": "^17.0.2", | ||
| "react-test-renderer": "17.0.2", | ||
| "storybook": "^7.4.1", | ||
| "storybook-dark-mode": "^3.0.1", | ||
| "styled-components": "^5.3.3", | ||
|
|
@@ -102,5 +106,8 @@ | |
| "commit-msg": "commitlint -e $HUSKY_GIT_PARAMS" | ||
| } | ||
| }, | ||
| "packageManager": "[email protected]" | ||
| "packageManager": "[email protected]", | ||
| "resolutions": { | ||
| "react-test-renderer": "17.0.2" | ||
| } | ||
| } | ||
Oops, something went wrong.