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.

Sign up for GitHub

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

Jump to bottom

feat: upgrade chakra from RC to stable release #131

Merged
merged 3 commits into from
Mar 30, 2021
Merged

feat: upgrade chakra from RC to stable release #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca9c546
feat:upgrade chakra from RC to stable release
Mar 24, 2021
737577f
lock cross-fetch version
Mar 24, 2021
2daff8d
lock version of chakra
Mar 24, 2021
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
6 changes: 3 additions & 3 deletions packages/create-bison-app/template/README.md.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ You should now have a fully working form that creates a new database entry on su
```jsx
import React from 'react';
import gql from 'graphql-tag';
import { Spinner, Text } from '@chakra-ui/core';
import { Spinner, Text } from '@chakra-ui/react';

export const QUERY = gql`
query organization {
Expand Down Expand Up @@ -413,7 +413,7 @@ export const QUERY = gql`
```tsx
import React from 'react';
import gql from 'graphql-tag';
import { Spinner, Text } from '@chakra-ui/core';
import { Spinner, Text } from '@chakra-ui/react';

import { OrganizationQuery, useOrganizationQuery } from '../types';

Expand Down Expand Up @@ -453,7 +453,7 @@ export const OrganizationCell = ({ organizationId }) => {
```tsx
import React from 'react';
import Head from 'next/head';
import { Flex } from '@chakra-ui/core';
import { Flex } from '@chakra-ui/react';
import { useRouter } from 'next/router';

import { OrganizationCell } from '../../cells/OrganizationCell';
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/_templates/cell/new/new.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ to: cells/<%= [h.inflection.camelize(h.dirName(name)), h.camelizedBaseName(name)
<% component = h.camelizedBaseName(name) -%>
import React from 'react';
import gql from 'graphql-tag';
import { Spinner, Text } from '@chakra-ui/core';
import { Spinner, Text } from '@chakra-ui/react';

import { useMyProfileQuery, MyProfileQuery } from '../types';

Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/_templates/component/new/new.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ to: components/<%= [h.inflection.camelize(h.dirName(name)), h.camelizedBaseName(
<% formattedPath = h.camelizedPathName(name) -%>
<% component = h.camelizedBaseName(name) -%>
import React from 'react';
import { Heading, Center } from '@chakra-ui/core';
import { Heading, Center } from '@chakra-ui/react';

/** Description of component */
export function <%= component %>() {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/_templates/page/new/new.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ to: pages/<%= name %>.tsx
<% base = h.camelizedBaseName(name) -%>
import React from 'react';
import Head from 'next/head';
import { Heading, Center, Flex } from '@chakra-ui/core';
import { Heading, Center, Flex } from '@chakra-ui/react';

function <%= pageName %>() {
return (
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/components/AllProviders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { ChakraProvider, CSSReset } from '@chakra-ui/core';
import { ChakraProvider, CSSReset } from '@chakra-ui/react';
import { ApolloProvider } from '@apollo/client';

import { AuthProvider } from '../context/auth';
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/components/CenteredBoxForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Box } from '@chakra-ui/core';
import { Box } from '@chakra-ui/react';

/** A form with a centered box. Ex: Login, Signup */
export function CenteredBoxForm({ children }) {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/components/ErrorText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Text, TextProps } from '@chakra-ui/core';
import { Text, TextProps } from '@chakra-ui/react';

/** Renders error text under form inputs */
export function ErrorText({ children, ...textProps }: TextProps) {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/components/FullPageSpinner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Spinner, Center } from '@chakra-ui/core';
import { Spinner, Center } from '@chakra-ui/react';

/** Renders a full page loading spinner */
export function FullPageSpinner() {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/components/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
Stack,
Button,
Circle,
} from '@chakra-ui/core';
} from '@chakra-ui/react';
import { useForm } from 'react-hook-form';
import { gql } from '@apollo/client';

Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/components/Logo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Heading } from '@chakra-ui/core';
import { Heading } from '@chakra-ui/react';
import NextLink from 'next/link';

export function Logo() {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/components/Nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Menu,
MenuList,
MenuItem,
} from '@chakra-ui/core';
} from '@chakra-ui/react';
import NextLink from 'next/link';

export function Nav() {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/components/SignupForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
Stack,
Button,
Circle,
} from '@chakra-ui/core';
} from '@chakra-ui/react';
import { gql } from '@apollo/client';
import { useForm } from 'react-hook-form';
import { useRouter } from 'next/router';
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/layouts/LoggedIn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { useRouter } from 'next/router';
import { Box, Center, Flex, Text, Button } from '@chakra-ui/core';
import { Box, Center, Flex, Text, Button } from '@chakra-ui/react';

import { Logo } from '../components/Logo';
import { Nav } from '../components/Nav';
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/layouts/LoggedOut.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Box, Center, Flex, Text, Button } from '@chakra-ui/core';
import { Box, Center, Flex, Text, Button } from '@chakra-ui/react';
import NextLink from 'next/link';

import { Logo } from '../components/Logo';
Expand Down
8 changes: 5 additions & 3 deletions packages/create-bison-app/template/package.json.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
},
"dependencies": {
"@apollo/client": "^3.0.2",
"@chakra-ui/core": "^1.0.0-rc.5",
"@chakra-ui/theme": "^1.0.0-rc.5",
"@chakra-ui/react": "1.3.4",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Latest version has build error on @chakra/popper dependency that this version does not have

"@chakra-ui/theme": "1.7.1",
"@nexus/schema": "^0.16.0",
"@prisma/client": "2.8.1",
<% if (host.name === 'vercel') { -%>
Expand All @@ -53,7 +53,9 @@
"apollo-server-express": "^2.18.1",
<% } -%>
"bcryptjs": "^2.4.3",
"cross-fetch": "^3.0.5",
"cross-fetch": "3.0.5",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Latest version of cross-fetch creates an issue in the apollo client configuration with the headers.

"@emotion/react": "^11.0.0",
"@emotion/styled": "^11.0.0",
"framer-motion": "^2.9.4",
"graphql": "^15.3.0",
"graphql-scalars": "^1.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-bison-app/template/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Head from 'next/head';
import { Heading, Center } from '@chakra-ui/core';
import { Heading, Center } from '@chakra-ui/react';

function Home() {
return (
Expand Down