Skip to content

Commit

Permalink
chore(): update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@chyzwar
chyzwar committed May 17, 2022
1 parent f876752 commit 59a1c00
Show file tree
Hide file tree
Showing 17 changed files with 1,755 additions and 1,828 deletions.
26 changes: 13 additions & 13 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
"prepare": "husky install"
},
"dependencies": {
"@commitlint/cli": "^16.2.1",
"@commitlint/config-conventional": "^16.2.1",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"eslint": "^8.9.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^26.1.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"husky": "^7.0.4",
"jest": "^27.5.1",
"lint-staged": "^12.3.4",
"typescript": "^4.5.5"
"@commitlint/cli": "^17.0.0",
"@commitlint/config-conventional": "^17.0.0",
"@typescript-eslint/eslint-plugin": "^5.24.0",
"@typescript-eslint/parser": "^5.24.0",
"eslint": "^8.15.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.2.2",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.5.0",
"husky": "^8.0.1",
"jest": "^28.1.0",
"lint-staged": "^12.4.1",
"typescript": "^4.6.4"
},
"lint-staged": {
"*.{js,ts,tsx}": "yarn lint:fix"
Expand Down
69 changes: 35 additions & 34 deletions packages/admin-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,51 +7,52 @@
"yarn": "3.x"
},
"dependencies": {
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"axios": "^0.26.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-refresh": "^0.11.0",
"react-router-dom": "^6.2.1"
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"axios": "^0.27.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-refresh": "^0.13.0",
"react-router-dom": "^6.3.0"
},
"devDependencies": {
"@babel/core": "^7.17.5",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
"@testing-library/dom": "^8.11.3",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.4.0",
"@types/node": "^17.0.19",
"@types/react": "^17.0.39",
"@types/react-dom": "^17.0.11",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"babel-loader": "^8.2.3",
"@babel/core": "^7.17.12",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.6",
"@testing-library/dom": "^8.13.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.2.0",
"@testing-library/user-event": "^14.2.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.34",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.4",
"@typescript-eslint/eslint-plugin": "^5.24.0",
"@typescript-eslint/parser": "^5.24.0",
"babel-loader": "^8.2.5",
"clean-webpack-plugin": "^4.0.0",
"eslint": "^8.9.0",
"eslint": "^8.15.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^16.1.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-css-modules": "^2.11.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^26.1.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.2.2",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"favicons": "^7.0.0-beta.3",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.5.0",
"favicons": "^7.0.0-beta.4",
"favicons-webpack-plugin": "^5.0.2",
"html-webpack-plugin": "^5.5.0",
"jest": "^27.5.1",
"jest": "^28.1.0",
"jest-environment-jsdom": "^28.1.0",
"source-map-loader": "^3.0.1",
"ts-jest": "^27.1.3",
"ts-loader": "^9.2.6",
"ts-node": "^10.5.0",
"typescript": "^4.5.5",
"webpack": "^5.69.1",
"ts-jest": "^28.0.2",
"ts-loader": "^9.3.0",
"ts-node": "^10.7.0",
"typescript": "^4.6.4",
"webpack": "^5.72.1",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.7.4"
"webpack-dev-server": "^4.9.0"
},
"scripts": {
"start": "webpack serve --config webpack.dev.ts",
Expand Down
8 changes: 5 additions & 3 deletions packages/admin-ui/src/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import App from './App';

ReactDOM.render(<App />, document.getElementById('root'));
const container = document.getElementById('root');
const root = createRoot(container!);

root.render(<App />);
7 changes: 1 addition & 6 deletions packages/admin-ui/webpack.dev.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import HtmlWebpackPlugin from "html-webpack-plugin";
import FaviconsWebpackPlugin from 'favicons-webpack-plugin';
import ReactRefreshWebpackPlugin from "@pmmmwh/react-refresh-webpack-plugin";
import type {Configuration} from "webpack";
import {ProvidePlugin, HotModuleReplacementPlugin} from "webpack";
import {ProvidePlugin} from "webpack";
import {resolve} from "path";


Expand Down Expand Up @@ -131,11 +131,6 @@ const config: Configuration & DevServerConfiguration= {
logo: './src/logo.svg',
mode: 'light',
}),
/**
* Enable HMR plugin
* @see https://webpack.js.org/plugins/hot-module-replacement-plugin/
*/
new HotModuleReplacementPlugin(),
/**
* Refresh plugin
* @see https://github.com/pmmmwh/react-refresh-webpack-plugin
Expand Down
46 changes: 23 additions & 23 deletions packages/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,38 @@
},
"license": "UNLICENSED",
"dependencies": {
"@fastify/cookie": "^6.0.0",
"@fastify/jwt": "^5.0.1",
"@fastify/oauth2": "^5.0.0",
"@project/common": "workspace:packages/common",
"axios": "^0.26.0",
"fastify": "^3.27.2",
"fastify-cookie": "^5.6.0",
"fastify-jwt": "^4.1.3",
"fastify-oauth2": "^4.5.0",
"axios": "^0.27.2",
"fastify": "^3.29.0",
"fastify-plugin": "^3.0.1",
"pg": "^8.7.3",
"pg-hstore": "^2.3.4",
"pino": "^7.8.0",
"pino-pretty": "^7.5.1",
"pino": "^7.11.0",
"pino-pretty": "^7.6.1",
"pino-syslog": "^2.0.0",
"sequelize": "^6.19.0"
"sequelize": "^6.19.1"
},
"devDependencies": {
"@types/jest": "^27.4.0",
"@types/node": "^17.0.19",
"@types/validator": "^13.7.1",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"dotenv": "^16.0.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.34",
"@types/validator": "^13.7.2",
"@typescript-eslint/eslint-plugin": "^5.24.0",
"@typescript-eslint/parser": "^5.24.0",
"dotenv": "^16.0.1",
"env-cmd": "^10.1.0",
"eslint": "^8.9.0",
"eslint": "^8.15.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^16.1.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^26.1.1",
"jest": "^27.5.1",
"nodemon": "^2.0.15",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.2.2",
"jest": "^28.1.0",
"nodemon": "^2.0.16",
"sequelize-cli": "^6.4.1",
"ts-jest": "^27.1.3",
"ts-node": "^10.5.0",
"typescript": "^4.5.5"
"ts-jest": "^28.0.2",
"ts-node": "^10.7.0",
"typescript": "^4.6.4"
}
}
2 changes: 1 addition & 1 deletion packages/api/src/declarations.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { OAuth2Namespace } from 'fastify-oauth2';
import { OAuth2Namespace } from '@fastify/oauth2';
import { preValidationHookHandler } from 'fastify';

declare module 'fastify' {
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/plugins/authenticate.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fp from 'fastify-plugin';
import fastifyJwt from 'fastify-jwt';
import fastifyJwt from '@fastify/jwt';

import {
FastifyReply,
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/plugins/cookie.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fp from 'fastify-plugin';
import fastifyCookie from 'fastify-cookie';
import fastifyCookie from '@fastify/cookie';

const cookie = fp(async (fastify) => {
fastify.register(fastifyCookie, {
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/plugins/facebookOauth.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axios from 'axios';
import fp from 'fastify-plugin';
import oauthPlugin from 'fastify-oauth2';
import oauthPlugin from '@fastify/oauth2';
import { randomBytes } from 'crypto';
import { FastifyRequest } from 'fastify';

Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/plugins/googleOauth.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axios from 'axios';
import fp from 'fastify-plugin';
import oauthPlugin from 'fastify-oauth2';
import oauthPlugin from '@fastify/oauth2';
import { FastifyRequest } from 'fastify';
import { randomBytes } from 'crypto';

Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/types/Oauth.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ export enum Provider {
Custom = 'Custom',
}

export interface Profile{
export interface Profile {
provider: Provider;
providerId: string;
name: string;
email: string;
role: Role
}

export interface GoogleProfile{
export interface GoogleProfile {
name: string,
email: string;
sub: string
Expand Down
18 changes: 9 additions & 9 deletions packages/common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
},
"license": "UNLICENSED",
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"eslint": "^8.9.0",
"@typescript-eslint/eslint-plugin": "^5.24.0",
"@typescript-eslint/parser": "^5.24.0",
"eslint": "^8.15.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^16.1.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^26.1.1",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.2.2",
"eslint-plugin-jsx-a11y": "^6.5.1",
"jest": "^27.5.1",
"ts-jest": "^27.1.3",
"typescript": "^4.5.5"
"jest": "^28.1.0",
"ts-jest": "^28.0.2",
"typescript": "^4.6.4"
}
}
71 changes: 36 additions & 35 deletions packages/ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,53 +7,54 @@
"yarn": "3.x"
},
"dependencies": {
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@project/common": "workspace:packages/common",
"axios": "^0.26.0",
"axios-hooks": "^3.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-refresh": "^0.11.0",
"react-router-dom": "^6.2.1"
"axios": "^0.27.2",
"axios-hooks": "^3.0.3",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-refresh": "^0.13.0",
"react-router-dom": "^6.3.0"
},
"devDependencies": {
"@babel/core": "^7.17.5",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
"@testing-library/dom": "^8.11.3",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.4.0",
"@types/node": "^17.0.19",
"@types/react": "^17.0.39",
"@types/react-dom": "^17.0.11",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"babel-loader": "^8.2.3",
"@babel/core": "^7.17.12",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.6",
"@testing-library/dom": "^8.13.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.2.0",
"@testing-library/user-event": "^14.2.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.34",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.4",
"@typescript-eslint/eslint-plugin": "^5.24.0",
"@typescript-eslint/parser": "^5.24.0",
"babel-loader": "^8.2.5",
"clean-webpack-plugin": "^4.0.0",
"eslint": "^8.9.0",
"eslint": "^8.15.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^16.1.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-css-modules": "^2.11.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^26.1.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.2.2",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"favicons": "^7.0.0-beta.3",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.5.0",
"favicons": "^7.0.0-beta.4",
"favicons-webpack-plugin": "^5.0.2",
"html-webpack-plugin": "^5.5.0",
"jest": "^27.5.1",
"jest": "^28.1.0",
"jest-environment-jsdom": "^28.1.0",
"source-map-loader": "^3.0.1",
"ts-jest": "^27.1.3",
"ts-loader": "^9.2.6",
"ts-node": "^10.5.0",
"typescript": "^4.5.5",
"webpack": "^5.69.1",
"ts-jest": "^28.0.2",
"ts-loader": "^9.3.0",
"ts-node": "^10.7.0",
"typescript": "^4.6.4",
"webpack": "^5.72.1",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.7.4"
"webpack-dev-server": "^4.9.0"
},
"scripts": {
"start": "webpack serve --config webpack.dev.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/ProtectedRoute.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {

import useIsAuthenticated from '../hooks/useIsAuthenticated';

interface ProtectedRouteProps{
interface ProtectedRouteProps {
children: ReactElement;
}

Expand Down
Loading

0 comments on commit 59a1c00

Please sign in to comment.