Skip to content

Commit d166c3a

Browse files
committed
Bump dependencies.
Updated eslintrc
1 parent 4812e82 commit d166c3a

File tree

8 files changed

+96
-73
lines changed

8 files changed

+96
-73
lines changed

.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ module.exports = {
88
},
99
extends: [
1010
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
11-
'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
12-
'prettier/react', // disables react-specific linting rules that conflict with prettier
11+
'prettier',
1312
],
1413
parserOptions: {
1514
project: path.resolve(__dirname, './tsconfig.json'),

package.json

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webpack-typescript-react",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"description": "Webpack 5 boilerplate with support of most common loaders and modules",
55
"keywords": [
66
"react",
@@ -29,82 +29,82 @@
2929
}
3030
},
3131
"dependencies": {
32-
"@types/classnames": "^2.2.10",
33-
"@types/react": "^16.9.53",
34-
"@types/react-dom": "^16.9.8",
35-
"classnames": "^2.2.6",
32+
"@types/classnames": "^2.3.0",
33+
"@types/react": "^17.0.37",
34+
"@types/react-dom": "^17.0.11",
35+
"classnames": "^2.3.1",
3636
"normalize.css": "^8.0.1",
37-
"react": "^17.0.1",
38-
"react-dom": "^17.0.1"
37+
"react": "^17.0.2",
38+
"react-dom": "^17.0.2"
3939
},
4040
"devDependencies": {
41-
"@babel/core": "~7.12.3",
42-
"@babel/plugin-proposal-class-properties": "~7.12.1",
43-
"@babel/plugin-proposal-export-default-from": "^7.12.1",
44-
"@babel/plugin-proposal-export-namespace-from": "~7.12.1",
45-
"@babel/plugin-proposal-object-rest-spread": "~7.12.1",
46-
"@babel/plugin-proposal-throw-expressions": "~7.12.1",
41+
"@babel/core": "~7.16.0",
42+
"@babel/plugin-proposal-class-properties": "~7.16.0",
43+
"@babel/plugin-proposal-export-default-from": "^7.16.0",
44+
"@babel/plugin-proposal-export-namespace-from": "~7.16.0",
45+
"@babel/plugin-proposal-object-rest-spread": "~7.16.0",
46+
"@babel/plugin-proposal-throw-expressions": "~7.16.0",
4747
"@babel/plugin-syntax-dynamic-import": "~7.8.3",
48-
"@babel/plugin-transform-runtime": "~7.12.1",
49-
"@babel/preset-env": "~7.12.1",
50-
"@babel/preset-react": "~7.12.1",
51-
"@babel/register": "~7.12.1",
52-
"@pmmmwh/react-refresh-webpack-plugin": "~0.5.1",
53-
"@svgr/webpack": "~5.4.0",
54-
"@teamsupercell/typings-for-css-modules-loader": "~2.4.0",
55-
"@typescript-eslint/eslint-plugin": "~4.7.0",
56-
"@typescript-eslint/parser": "~4.7.0",
57-
"autoprefixer": "~10.0.1",
48+
"@babel/plugin-transform-runtime": "~7.16.4",
49+
"@babel/preset-env": "~7.16.4",
50+
"@babel/preset-react": "~7.16.0",
51+
"@babel/register": "~7.16.0",
52+
"@pmmmwh/react-refresh-webpack-plugin": "~0.5.3",
53+
"@svgr/webpack": "~6.1.2",
54+
"@teamsupercell/typings-for-css-modules-loader": "~2.5.1",
55+
"@typescript-eslint/eslint-plugin": "~5.6.0",
56+
"@typescript-eslint/parser": "~5.6.0",
57+
"autoprefixer": "~10.4.0",
5858
"babel-eslint": "~10.1.0",
59-
"babel-loader": "~8.2.1",
60-
"clean-webpack-plugin": "~3.0.0",
61-
"copy-webpack-plugin": "~6.3.0",
62-
"core-js": "~3.7.0",
59+
"babel-loader": "~8.2.3",
60+
"clean-webpack-plugin": "~4.0.0",
61+
"copy-webpack-plugin": "~10.1.0",
62+
"core-js": "~3.19.3",
6363
"cross-env": "^7.0.3",
64-
"css-loader": "~5.0.0",
65-
"cssnano": "~4.1.10",
66-
"eslint": "~7.13.0",
67-
"eslint-config-airbnb-base": "~14.2.0",
68-
"eslint-config-airbnb-typescript": "~12.0.0",
69-
"eslint-config-prettier": "~6.15.0",
64+
"css-loader": "~6.5.1",
65+
"cssnano": "~5.0.12",
66+
"eslint": "~8.4.1",
67+
"eslint-config-airbnb-base": "~15.0.0",
68+
"eslint-config-airbnb-typescript": "~16.1.0",
69+
"eslint-config-prettier": "~8.3.0",
7070
"eslint-import-resolver-alias": "~1.1.2",
71-
"eslint-plugin-import": "~2.22.1",
72-
"eslint-plugin-jsx-a11y": "~6.4.1",
73-
"eslint-plugin-react": "~7.21.5",
74-
"eslint-plugin-react-hooks": "~4.2.0",
75-
"eslint-webpack-plugin": "~2.2.1",
76-
"fork-ts-checker-webpack-plugin": "~6.0.1",
77-
"html-loader": "~1.3.2",
78-
"html-webpack-plugin": "~5.0.0-alpha.6",
79-
"husky": "~4.3.0",
71+
"eslint-plugin-import": "~2.25.3",
72+
"eslint-plugin-jsx-a11y": "~6.5.1",
73+
"eslint-plugin-react": "~7.27.1",
74+
"eslint-plugin-react-hooks": "~4.3.0",
75+
"eslint-webpack-plugin": "~3.1.1",
76+
"fork-ts-checker-webpack-plugin": "~6.5.0",
77+
"html-loader": "~3.0.1",
78+
"html-webpack-plugin": "~5.5.0",
79+
"husky": "~7.0.4",
8080
"import-sort-style-module-and-prefix": "~0.1.3",
8181
"is-windows": "~1.0.2",
82-
"less": "~3.12.2",
83-
"less-loader": "~7.0.2",
84-
"lint-staged": "~10.5.0",
85-
"mini-css-extract-plugin": "~1.3.0",
82+
"less": "~4.1.2",
83+
"less-loader": "~10.2.0",
84+
"lint-staged": "~12.1.2",
85+
"mini-css-extract-plugin": "~2.4.5",
8686
"path": "~0.12.7",
87-
"postcss": "~8.2.5",
88-
"postcss-loader": "~4.0.4",
89-
"prettier": "~2.1.2",
90-
"prettier-plugin-import-sort": "~0.0.6",
91-
"pretty-quick": "~3.1.0",
92-
"react-refresh": "~0.10.0",
93-
"regenerator-runtime": "~0.13.7",
94-
"resolve-url-loader": "~3.1.2",
95-
"sass": "~1.29.0",
96-
"sass-loader": "~10.0.4",
97-
"sass-resources-loader": "~2.1.1",
98-
"style-loader": "~2.0.0",
99-
"svg-url-loader": "~6.0.0",
100-
"terser-webpack-plugin": "~5.0.1",
101-
"ts-loader": "~8.0.7",
102-
"typescript": "~4.0.3",
87+
"postcss": "~8.4.5",
88+
"postcss-loader": "~6.2.1",
89+
"prettier": "~2.5.1",
90+
"prettier-plugin-import-sort": "~0.0.7",
91+
"pretty-quick": "~3.1.2",
92+
"react-refresh": "~0.11.0",
93+
"regenerator-runtime": "~0.13.9",
94+
"resolve-url-loader": "~4.0.0",
95+
"sass": "~1.45.0",
96+
"sass-loader": "~12.4.0",
97+
"sass-resources-loader": "~2.2.4",
98+
"style-loader": "~3.3.1",
99+
"svg-url-loader": "~7.1.1",
100+
"terser-webpack-plugin": "~5.2.5",
101+
"ts-loader": "~9.2.6",
102+
"typescript": "~4.5.3",
103103
"url-loader": "~4.1.1",
104-
"webpack": "~5.64.0",
104+
"webpack": "~5.65.0",
105105
"webpack-bundle-analyzer": "~4.5.0",
106106
"webpack-cli": "~4.9.1",
107-
"webpack-dev-server": "~4.5.0",
107+
"webpack-dev-server": "~4.6.0",
108108
"webpack-merge": "~5.8.0"
109109
},
110110
"importSort": {

src/components/app/app.module.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,16 @@
1212
height: $size;
1313
margin: 25px 0 0 0;
1414
}
15+
16+
&-link {
17+
display: block;
18+
margin: 20px 0 0 0;
19+
font-family: 'Open Sans', sans-serif;
20+
font-weight: 400;
21+
color: #fff;
22+
text-decoration: none;
23+
&:hover {
24+
color: #e8e8e8;
25+
}
26+
}
1527
}

src/components/app/app.module.scss.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ declare namespace AppModuleScssNamespace {
44
export interface IAppModuleScss {
55
stylesHeader: string;
66
stylesImage: string;
7+
stylesLink: string;
78
}
89
}
910

src/components/app/app.tsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/**
22
* Created by: Andrey Polyakov ([email protected])
33
*/
4+
5+
import cn from 'classnames';
46
import React, {Suspense, lazy} from 'react';
57

68
import {stylesContainer} from './app.module.less';
7-
import {stylesHeader, stylesImage} from './app.module.scss';
9+
import {stylesHeader, stylesImage, stylesLink} from './app.module.scss';
810

911
const LazyStrawberryIcon = lazy(() => import('./strawberry'));
1012
export const App = (): React.ReactElement => (
@@ -13,5 +15,14 @@ export const App = (): React.ReactElement => (
1315
<Suspense fallback={'loading...'}>
1416
<LazyStrawberryIcon className={stylesImage} />
1517
</Suspense>
18+
<div>
19+
<a
20+
className={cn(stylesLink)}
21+
href="https://github.com/glook/webpack-typescript-react"
22+
target="_blank"
23+
>
24+
@glook/webpack-typescript-react
25+
</a>
26+
</div>
1627
</div>
1728
);

src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8" />
55
<title>Webpack5 typescript react boilerplate</title>
66
<link
7-
href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@600&display=swap"
7+
href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@600;400&display=swap"
88
rel="stylesheet"
99
/>
1010
</head>

webpack/config/devServer.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
* Created by: Andrey Polyakov ([email protected])
33
* @see https://webpack.js.org/configuration/dev-server/
44
*/
5-
import isWindows from 'is-windows';
65

6+
import {defaultPort, devServerHost} from '../utils/env';
77
import {devServerProxyConfig} from './devServierProxy';
88

9-
const defaultPort = 8080;
10-
11-
const devServerHost = isWindows() ? '127.0.0.1' : '0.0.0.0';
12-
139
export const devServerUrl = `http://${devServerHost}:${defaultPort}/`;
1410

1511
export const devServerConfig = {

webpack/utils/env.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
*/
44
import {join} from 'path';
55

6+
import isWindows from 'is-windows';
7+
68
export const mode = process.env.NODE_ENV ?? 'production';
79
export const isDevServer = process.env.WEBPACK_IS_DEV_SERVER === 'true';
810
export const isProd = mode === 'production';
911
export const isDev = !isProd;
1012
export const rootDir = join(__dirname, '../../');
1113
export const webpackDir = join(__dirname, '../');
14+
export const defaultPort = 8080;
15+
export const devServerHost = isWindows() ? '127.0.0.1' : '0.0.0.0';

0 commit comments

Comments
 (0)