Skip to content

Commit edd8926

Browse files
authored
Merge pull request #201 from pagesource/feature/styled-components-stiches-migration
Feature/styled components stiches migration
2 parents 43ea861 + 3a81861 commit edd8926

File tree

11 files changed

+93
-937
lines changed

11 files changed

+93
-937
lines changed

templates/base/babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module.exports = {
22
presets: ['next/babel'],
3-
plugins: [['styled-components', { ssr: true }]]
3+
plugins: []
44
};

templates/base/src/pages/_app.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// node modules
22
import React from 'react';
33
import type { AppProps } from 'next/app';
4-
import { ThemeProvider } from 'styled-components';
54

65
// packages
7-
import { theme } from 'themes';
86
import WithReactQuery from 'services';
97

108
import GlobalContextProvider from '../stores/globalContext';
9+
import { NextUIProvider } from '@nextui-org/react';
10+
import { theme } from 'themes';
1111

1212
// Will be called once for every metric that has to be reported.
1313
// export function reportWebVitals(metric: any) {
@@ -17,11 +17,11 @@ import GlobalContextProvider from '../stores/globalContext';
1717

1818
function MyApp({ Component, pageProps }: AppProps) {
1919
return (
20-
<ThemeProvider theme={theme}>
20+
<NextUIProvider theme={theme}>
2121
<GlobalContextProvider>
2222
<Component {...pageProps} />
2323
</GlobalContextProvider>
24-
</ThemeProvider>
24+
</NextUIProvider>
2525
);
2626
}
2727

templates/common/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@
1313
"markdown-to-jsx": "^7.1.3",
1414
"react": "{reactVersion}",
1515
"react-dom": "{reactVersion}",
16-
"styled-components": "^5.3.1",
1716
"themes": "{workspacePrefix}",
1817
"services": "{workspacePrefix}",
1918
"ui": "{workspacePrefix}",
20-
"smart-context": "^2.1.2"
19+
"smart-context": "^2.1.2",
20+
"@nextui-org/react": "^1.0.5-beta.5"
2121
},
2222
"devDependencies": {
2323
"@types/react": "^17.0.39",
2424
"@types/react-dom": "^17.0.11",
25-
"@types/styled-components": "^5.1.22",
2625
"@testing-library/react": "12.1.1",
2726
"@testing-library/react-hooks": "7.0.2",
2827
"bundlesize": "0.18.1",

templates/common/packages/themes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"private": true,
55
"main": "./theme.ts",
66
"license": "MIT"
7-
}
7+
}

0 commit comments

Comments
 (0)