Parcourir la source

move next starter src files, lint fixes

Jordan Sexton il y a 3 ans
Parent
commit
d62db95030

+ 2 - 2
packages/starter/create-react-app-starter/config-overrides.js

@@ -8,12 +8,12 @@ module.exports = function (config, env) {
             rules: [
                 ...config.module.rules,
                 {
-                    test: /\.(m?js|ts)$/,
+                    test: /\.m?[jt]sx?$/,
                     enforce: 'pre',
                     use: ['source-map-loader'],
                 },
                 {
-                    test: /\.m?js$/,
+                    test: /\.m?[jt]sx?$/,
                     resolve: {
                         fullySpecified: false,
                     },

+ 1 - 1
packages/starter/example/components/AutoConnectProvider.tsx → packages/starter/example/src/components/AutoConnectProvider.tsx

@@ -1,6 +1,6 @@
 import { useLocalStorage } from '@solana/wallet-adapter-react';
 import type { FC, ReactNode } from 'react';
-import { createContext, useContext } from 'react';
+import React, { createContext, useContext } from 'react';
 
 export interface AutoConnectContextState {
     autoConnect: boolean;

+ 1 - 1
packages/starter/example/components/ContextProvider.tsx → packages/starter/example/src/components/ContextProvider.tsx

@@ -10,7 +10,7 @@ import { FakeWalletAdapter } from '@solana/wallet-adapter-wallets';
 import { clusterApiUrl } from '@solana/web3.js';
 import { SnackbarProvider, useSnackbar } from 'notistack';
 import type { FC, ReactNode } from 'react';
-import { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { AutoConnectProvider, useAutoConnect } from './AutoConnectProvider';
 
 const theme = createTheme({

+ 1 - 1
packages/starter/example/components/RequestAirdrop.tsx → packages/starter/example/src/components/RequestAirdrop.tsx

@@ -3,7 +3,7 @@ import { useConnection, useWallet } from '@solana/wallet-adapter-react';
 import type { TransactionSignature } from '@solana/web3.js';
 import { LAMPORTS_PER_SOL } from '@solana/web3.js';
 import type { FC } from 'react';
-import { useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { useNotify } from './notify';
 
 export const RequestAirdrop: FC = () => {

+ 1 - 1
packages/starter/example/components/SendTransaction.tsx → packages/starter/example/src/components/SendTransaction.tsx

@@ -3,7 +3,7 @@ import { useConnection, useWallet } from '@solana/wallet-adapter-react';
 import type { TransactionSignature } from '@solana/web3.js';
 import { PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js';
 import type { FC } from 'react';
-import { useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { useNotify } from './notify';
 
 export const SendTransaction: FC = () => {

+ 1 - 1
packages/starter/example/components/SignMessage.tsx → packages/starter/example/src/components/SignMessage.tsx

@@ -2,7 +2,7 @@ import { Button } from '@mui/material';
 import { useWallet } from '@solana/wallet-adapter-react';
 import bs58 from 'bs58';
 import type { FC } from 'react';
-import { useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { sign } from 'tweetnacl';
 import { useNotify } from './notify';
 

+ 1 - 1
packages/starter/example/components/notify.tsx → packages/starter/example/src/components/notify.tsx

@@ -3,7 +3,7 @@ import { Link } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import type { VariantType } from 'notistack';
 import { useSnackbar } from 'notistack';
-import { useCallback } from 'react';
+import React, { useCallback } from 'react';
 
 const Notification = styled('span')(() => ({
     display: 'flex',

+ 1 - 0
packages/starter/example/pages/_app.tsx → packages/starter/example/src/pages/_app.tsx

@@ -1,6 +1,7 @@
 import type { AppProps } from 'next/app';
 import Head from 'next/head';
 import type { FC } from 'react';
+import React from 'react';
 import { ContextProvider } from '../components/ContextProvider';
 
 // Use require instead of import since order matters

+ 2 - 1
packages/starter/example/pages/index.tsx → packages/starter/example/src/pages/index.tsx

@@ -18,11 +18,12 @@ import {
     WalletMultiButton as ReactUIWalletMultiButton,
 } from '@solana/wallet-adapter-react-ui';
 import type { NextPage } from 'next';
+import React from 'react';
+import pkg from '../../package.json';
 import { useAutoConnect } from '../components/AutoConnectProvider';
 import { RequestAirdrop } from '../components/RequestAirdrop';
 import { SendTransaction } from '../components/SendTransaction';
 import { SignMessage } from '../components/SignMessage';
-import pkg from '../package.json';
 
 const Index: NextPage = () => {
     const { autoConnect, setAutoConnect } = useAutoConnect();

+ 0 - 0
packages/starter/example/styles/globals.css → packages/starter/example/src/styles/globals.css


+ 4 - 2
packages/starter/material-ui-starter/src/App.tsx

@@ -1,10 +1,12 @@
-import { WalletAdapterNetwork, WalletError } from '@solana/wallet-adapter-base';
+import type { WalletError } from '@solana/wallet-adapter-base';
+import { WalletAdapterNetwork } from '@solana/wallet-adapter-base';
 import { WalletDialogProvider, WalletMultiButton } from '@solana/wallet-adapter-material-ui';
 import { ConnectionProvider, WalletProvider } from '@solana/wallet-adapter-react';
 import { FakeWalletAdapter } from '@solana/wallet-adapter-wallets';
 import { clusterApiUrl } from '@solana/web3.js';
 import { useSnackbar } from 'notistack';
-import React, { FC, ReactNode, useCallback, useMemo } from 'react';
+import type { FC, ReactNode } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { Theme } from './Theme';
 
 export const App: FC = () => {

+ 2 - 1
packages/starter/material-ui-starter/src/Theme.tsx

@@ -1,7 +1,8 @@
 import { createTheme, StyledEngineProvider, ThemeProvider } from '@mui/material';
 import { deepPurple } from '@mui/material/colors';
 import { SnackbarProvider } from 'notistack';
-import React, { FC, ReactNode } from 'react';
+import type { FC, ReactNode } from 'react';
+import React from 'react';
 
 const theme = createTheme({
     palette: {

+ 1 - 1
packages/starter/nextjs-starter/pages/_app.tsx → packages/starter/nextjs-starter/src/pages/_app.tsx

@@ -5,7 +5,7 @@ import { FakeWalletAdapter } from '@solana/wallet-adapter-wallets';
 import { clusterApiUrl } from '@solana/web3.js';
 import type { AppProps } from 'next/app';
 import type { FC } from 'react';
-import { useMemo } from 'react';
+import React, { useMemo } from 'react';
 
 // Use require instead of import since order matters
 require('@solana/wallet-adapter-react-ui/styles.css');

+ 0 - 0
packages/starter/nextjs-starter/pages/api/hello.ts → packages/starter/nextjs-starter/src/pages/api/hello.ts


+ 1 - 0
packages/starter/nextjs-starter/pages/index.tsx → packages/starter/nextjs-starter/src/pages/index.tsx

@@ -2,6 +2,7 @@ import { WalletDisconnectButton, WalletMultiButton } from '@solana/wallet-adapte
 import type { NextPage } from 'next';
 import Head from 'next/head';
 import Image from 'next/image';
+import React from 'react';
 import styles from '../styles/Home.module.css';
 
 const Home: NextPage = () => {

+ 0 - 0
packages/starter/nextjs-starter/styles/Home.module.css → packages/starter/nextjs-starter/src/styles/Home.module.css


+ 0 - 0
packages/starter/nextjs-starter/styles/globals.css → packages/starter/nextjs-starter/src/styles/globals.css


+ 2 - 1
packages/starter/react-ui-starter/src/App.tsx

@@ -3,7 +3,8 @@ import { ConnectionProvider, WalletProvider } from '@solana/wallet-adapter-react
 import { WalletModalProvider, WalletMultiButton } from '@solana/wallet-adapter-react-ui';
 import { FakeWalletAdapter } from '@solana/wallet-adapter-wallets';
 import { clusterApiUrl } from '@solana/web3.js';
-import React, { FC, ReactNode, useMemo } from 'react';
+import type { FC, ReactNode } from 'react';
+import React, { useMemo } from 'react';
 
 export const App: FC = () => {
     return (