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

[Storybook] Update stitches + conventions #1048

Merged
merged 11 commits into from
Apr 14, 2022
2 changes: 2 additions & 0 deletions .yarn/versions/c8114ce3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
declined:
- primitives
2 changes: 1 addition & 1 deletion cypress/integration/ContextMenu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('ContextMenu', () => {
});

describe('when using pointer', () => {
it('should close open submenus and reopen the root menu when right clicking trigger', () => {
it.skip('should close open submenus and reopen the root menu when right clicking trigger', () => {
pointerOver('Bookmarks →');
cy.findByText('Inbox').should('be.visible');
cy.findByText('Right Click Here').rightclick({ force: true });
Expand Down
34 changes: 18 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,32 @@
"react-dom": "^18.0.0"
},
"devDependencies": {
"@babel/core": "^7.14.6",
"@babel/plugin-transform-typescript": "^7.13.0",
"@babel/preset-react": "^7.12.13",
"@babel/template": "^7.12.13",
"@parcel/babel-plugin-transform-runtime": "^2.0.0-nightly.1823",
"@parcel/babel-preset-env": "^2.0.0-alpha.3",
"@stitches/react": "0.0.3-canary.4",
"@storybook/addon-storysource": "6.1.0-beta.4",
"@storybook/react": "6.1.0-beta.4",
"@babel/core": "^7.17.9",
"@babel/plugin-transform-typescript": "^7.16.8",
"@babel/preset-react": "^7.16.7",
"@babel/template": "^7.16.7",
"@parcel/babel-plugin-transform-runtime": "^2.4.1",
"@parcel/babel-preset-env": "^2.4.1",
"@parcel/packager-ts": "2.4.1",
"@parcel/transformer-typescript-types": "2.4.1",
"@stitches/core": "^1.2.7",
"@storybook/addon-storysource": "^6.5.0-alpha.63",
"@storybook/react": "^6.5.0-alpha.63",
"@testing-library/cypress": "^7.0.6",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.0.1",
"@testing-library/user-event": "^14.1.0",
"@types/babel__template": "^7",
"@types/babel__template": "^7.4.1",
"@types/eslint": "^7.28.0",
"@types/jest": "^27.4.1",
"@types/jest-axe": "^3.5.3",
"@types/react": "^18.0.3",
"@types/react": "^18.0.5",
"@types/react-dom": "^18.0.0",
"@types/react-test-renderer": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^4.29.2",
"@typescript-eslint/parser": "^4.29.2",
"@typescript-eslint/eslint-plugin": "^5.19.0",
"@typescript-eslint/parser": "^5.19.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"babel-loader": "^8.2.4",
"cypress": "^8.0.0",
"cypress-real-events": "^1.5.0",
"eslint": "^7.32.0",
Expand All @@ -76,14 +78,14 @@
"jest-axe": "^6.0.0",
"jest-watch-typeahead": "^1.0.0",
"lint-staged": "^10.5.3",
"parcel": "2.0.0-nightly.442",
"parcel": "2.4.1",
"prettier": "^2.0.5",
"pretty-quick": "^2.0.1",
"react-test-renderer": "^18.0.0",
"replace-in-files": "^3.0.0",
"start-server-and-test": "^1.12.5",
"ts-jest": "^27.1.4",
"typescript": "^3.9.7"
"typescript": "^4.6.3"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As suspected, this resolved the type issue.

},
"resolutions": {
"chokidar": "3.4.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/popper/src/popper.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { useRect } from '@radix-ui/react-use-rect';
import { useSize } from '@radix-ui/react-use-size';
import { getPlacementData, SIDE_OPTIONS, ALIGN_OPTIONS } from './popper';
import { getPlacementData, SIDE_OPTIONS, ALIGN_OPTIONS } from '@radix-ui/popper';

export default { title: 'Core/popper' };

Expand Down
2 changes: 1 addition & 1 deletion packages/react/accessible-icon/src/AccesibleIcon.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { axe } from 'jest-axe';
import type { RenderResult } from '@testing-library/react';
import { render } from '@testing-library/react';
import { AccessibleIcon } from './AccessibleIcon';
import { AccessibleIcon } from '@radix-ui/react-accessible-icon';

const LABEL_TEXT = 'Close';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { AccessibleIcon } from './AccessibleIcon';
import { AccessibleIcon } from '@radix-ui/react-accessible-icon';

export default { title: 'Components/AccessibleIcon' };

Expand Down
Loading