Skip to content

Commit 6df4f9a

Browse files
authored
Merge pull request #207 from pagesource/fix/compiliation-and-typescript-issues
Fix/compiliation and typescript issues
2 parents 49ed409 + f736f37 commit 6df4f9a

5 files changed

Lines changed: 12 additions & 6 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'create-universal-react': patch
3+
---
4+
5+
typescript config changes

templates/base/src/pages/_app.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
// node modules
22
import React from 'react';
33
import type { AppProps } from 'next/app';
4+
import { NextUIProvider } from '@nextui-org/react';
45

56
// packages
67
import WithReactQuery from 'services';
7-
8-
import GlobalContextProvider from '../stores/globalContext';
9-
import { NextUIProvider } from '@nextui-org/react';
108
import { theme } from 'themes';
9+
import GlobalContextProvider from '../stores/globalContext';
1110

1211
// Will be called once for every metric that has to be reported.
1312
// export function reportWebVitals(metric: any) {

templates/common/packages/tsconfig/base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"preserveWatchOutput": true,
2020
"skipLibCheck": true,
2121
"strict": true,
22-
"noEmit": false,
22+
"noEmit": true,
2323
"incremental": true,
2424
"resolveJsonModule": true,
2525
"noImplicitAny": false,

templates/common/src/components/atoms/Button/Button.style.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { styled } from '@nextui-org/react';
22

3-
export const CompRoot = styled('button', {
3+
const CompRoot = styled('button', {
44
fontSize: '$3',
55
color: '$fontColor',
66
margin: '1em',
@@ -10,3 +10,5 @@ export const CompRoot = styled('button', {
1010
display: 'block',
1111
length: '1'
1212
});
13+
14+
export default CompRoot;

templates/common/src/components/atoms/Button/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import React from 'react';
1010

1111
// Relative imports
12-
import { CompRoot } from './Button.style';
12+
import CompRoot from './Button.style';
1313
import { ButtonProps } from './types';
1414

1515
const Button: React.FunctionComponent<ButtonProps> = ({ className, children }) => (

0 commit comments

Comments
 (0)