Skip to content

Commit

Permalink
fix: replace packages
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthewPattell committed Jul 13, 2023
1 parent 8a654d5 commit b3683ca
Show file tree
Hide file tree
Showing 17 changed files with 100 additions and 151 deletions.
33 changes: 32 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
# Vite template

## Links
[Testing SPA amplify]()
[Testing SPA amplify](https://prod.d2fyemmi74bwx3.amplifyapp.com/)
[Testing SSR docker](https://vite-template.lomray.com/)

## Used technologies
- [VITE SSR BOOST](https://github.com/Lomray-Software/vite-ssr-boost)
- [CONSISTENT SUSPENSE](https://github.com/Lomray-Software/consistent-suspense)
- [REACT MOBX MANAGER](https://github.com/Lomray-Software/react-mobx-manager)
- [REACT HEAD MANAGER](https://github.com/Lomray-Software/react-head-manager)
- [SUGAR ROUTE MANAGER](https://github.com/Lomray-Software/react-route-manager)

# Local development

```bash
Expand All @@ -17,3 +24,27 @@ __NOTE: see .github for understand CI/CD__
1. Create feature, bugfix, etc.
2. Create Pull Request & test
3. Squash & merge into `prod`

## Docker build
[See github workflow](.github/workflows/release.yml)

## AWS Amplify build (amplify.yml)
```yaml
version: 1
frontend:
phases:
preBuild:
commands:
- nvm use 18.13.0
- npm ci
build:
commands:
- npm run build -- --only-client
artifacts:
baseDirectory: build/client
files:
- '**/*'
cache:
paths:
- node_modules/**/*
```
129 changes: 22 additions & 107 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"prepare": "husky install"
},
"dependencies": {
"@lomray/client-helpers-react": "^2.0.0",
"@lomray/consistent-suspense": "^1.2.2",
"@lomray/react-head-manager": "^1.1.0",
"@lomray/react-mobx-manager": "^2.0.0-beta.15",
"@lomray/vite-ssr-boost": "^1.0.0-beta.9",
"@lomray/react-mobx-manager": "^2.0.0-beta.19",
"@lomray/react-route-manager": "^1.0.0",
"@lomray/vite-ssr-boost": "^1.0.0-beta.13",
"axios": "^1.4.0",
"mobx": "^6.9.0",
"mobx-react-lite": "^3.4.3",
Expand Down
6 changes: 3 additions & 3 deletions src/app.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { FCC } from '@lomray/client-helpers/interfaces';
import { ConsistentSuspenseProvider, Suspense } from '@lomray/consistent-suspense';
import type { StreamSuspense } from '@lomray/consistent-suspense/server';
import { MetaManagerProvider } from '@lomray/react-head-manager';
import type { Manager as MetaManager } from '@lomray/react-head-manager';
import type { Manager } from '@lomray/react-mobx-manager';
import { StoreManagerProvider } from '@lomray/react-mobx-manager';
import type { FC, PropsWithChildren } from 'react';
import { StrictMode } from 'react';
import Fallback from '@components/fallback';
import '@assets/styles/index.css';
Expand All @@ -19,7 +19,7 @@ interface IApp {
};
}

const App: FCC<IApp> = ({ children, client, server }) => {
const App: FC<PropsWithChildren<IApp>> = ({ children, client, server }) => {
const storeManager = (client?.storeManager ?? server?.storeManager)!;
const metaManager = (client?.metaManager ?? server?.metaManager)!;

Expand All @@ -39,7 +39,7 @@ const App: FCC<IApp> = ({ children, client, server }) => {
* Just wrapper to add strict mode
* @constructor
*/
const AppStrict: FCC<IApp> = (props) => (
const AppStrict: FC<PropsWithChildren<IApp>> = (props) => (
<StrictMode>
<App {...props} />
</StrictMode>
Expand Down
2 changes: 1 addition & 1 deletion src/client.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import getServerState from '@lomray/client-helpers-react/helpers/get-server-state';
import { Manager as MetaManager } from '@lomray/react-head-manager';
import { Manager } from '@lomray/react-mobx-manager';
import MobxLocalStorage from '@lomray/react-mobx-manager/storages/local-storage';
import entryClient from '@lomray/vite-ssr-boost/browser/entry';
import getServerState from '@lomray/vite-ssr-boost/helpers/get-server-state';
import { IS_PROD } from '@constants/index';
import StateKey from '@constants/state-key';
import routes from '@routes/index';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Router from '@lomray/client-helpers-react/services/router';
import { Manager } from '@lomray/react-route-manager';

/**
* Application URL router
* Application URL manager
*/
const router = new Router({
const manager = new Manager({
routes: {
home: {
url: '/',
Expand All @@ -26,4 +26,4 @@ const router = new Router({
},
});

export default router;
export default manager;
4 changes: 2 additions & 2 deletions src/pages/details/index/components/user/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Meta } from '@lomray/react-head-manager';
import { withStores } from '@lomray/react-mobx-manager';
import type { FC } from 'react';
import { Link } from 'react-router-dom';
import Router from '@services/router';
import RouteManager from '@services/route-manager';
import type { StoreProps } from './index.stores';
import stores from './index.stores';

Expand All @@ -29,7 +29,7 @@ const User: FC<Props> = ({ userId, mainStore: { user, suspense, getUser } }) =>
)}
<div>
User from suspense:{' '}
<Link to={Router.makeURL('details.user', { id: user!.id })}>
<Link to={RouteManager.makeURL('details.user', { id: user!.id })}>
{user?.id} ({user?.name})
</Link>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/details/index/components/user/stores/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { IUser } from '@interfaces/user';
/**
* Details user component store
*/
class DetaisUserStore {
class MainStore {
/**
* User
*/
Expand Down Expand Up @@ -98,4 +98,4 @@ class DetaisUserStore {
};
}

export default DetaisUserStore;
export default MainStore;
4 changes: 2 additions & 2 deletions src/pages/details/index/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Meta } from '@lomray/react-head-manager';
import type { FCRoute } from '@lomray/vite-ssr-boost/interfaces/fc-route';
import { Link, useLoaderData } from 'react-router-dom';
import Fallback from '@components/fallback';
import Router from '@services/router';
import RouteManager from '@services/route-manager';
import User from './components/user';
// import Navigate from '@lomray/vite-ssr-boost/components/navigate';

Expand Down Expand Up @@ -46,7 +46,7 @@ const Details: FCRoute = () => {
</Suspense>
</div>
<div className="mr20">
<Link to={Router.makeURL('home')}>Go back</Link>
<Link to={RouteManager.makeURL('home')}>Go back</Link>
</div>
</>
);
Expand Down
Loading

0 comments on commit b3683ca

Please sign in to comment.