Skip to content
This repository was archived by the owner on Jul 12, 2021. It is now read-only.

Commit a280fe9

Browse files
committed
Update dependencies
1 parent 4fd5111 commit a280fe9

5 files changed

+693
-650
lines changed

package.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -39,32 +39,32 @@
3939
"format": "prettier --ignore-path ./.gitignore --write '**/*.{css,html,js,json,jsx,less,md,scss,ts,tsx,vue,yaml,yml}'"
4040
},
4141
"dependencies": {
42-
"@svgr/webpack": "^5.3.0",
42+
"@svgr/webpack": "^5.3.1",
4343
"@types/draft-js": "^0.10.36",
4444
"@types/electron-settings": "^3.1.1",
4545
"@types/lodash.debounce": "^4.0.6",
46-
"@types/node": "^12.12.31",
47-
"@types/react": "^16.9.25",
48-
"@types/react-dom": "^16.9.1",
46+
"@types/node": "^13.11.0",
47+
"@types/react": "^16.9.32",
48+
"@types/react-dom": "^16.9.6",
4949
"@types/react-redux": "^7.1.7",
5050
"@types/redux-logger": "^3.0.7",
5151
"@types/semver": "^7.1.0",
52-
"draft-js": "^0.11.3",
52+
"draft-js": "^0.11.5",
5353
"draft-js-list-plugin": "^1.0.2",
5454
"draft-js-plugins-editor": "^3.0.0",
5555
"electron-context-menu": "^0.16.0",
5656
"electron-debug": "^3.0.0",
57-
"electron-log": "^4.1.0",
57+
"electron-log": "^4.1.1",
5858
"electron-md-to-pdf": "^2.2.0",
5959
"electron-settings": "^3.2.0",
6060
"electron-unhandled": "^3.0.1",
6161
"electron-updater": "^4.2.5",
6262
"electron-util": "^0.14.0",
63-
"feather-icons": "^4.26.0",
63+
"feather-icons": "^4.28.0",
6464
"lodash.debounce": "^4.0.8",
6565
"markdown-draft-js": "^2.2.0",
6666
"minireset.css": "^0.0.6",
67-
"minisearch": "^2.1.4",
67+
"minisearch": "^2.2.1",
6868
"moment": "^2.22.2",
6969
"move-file": "^1.2.0",
7070
"react": "^16.13.1",
@@ -91,12 +91,12 @@
9191
"@samuelmeuli/stylelint-config": "^3.0.0",
9292
"@samuelmeuli/tsconfig": "^1.0.0",
9393
"@types/html-webpack-plugin": "^3.2.2",
94-
"@types/jest": "^25.1.4",
94+
"@types/jest": "^25.2.1",
9595
"@types/license-checker-webpack-plugin": "^0.0.2",
96-
"@types/webpack": "^4.41.5",
96+
"@types/webpack": "^4.41.10",
9797
"@types/webpack-merge": "^4.1.5",
98-
"@typescript-eslint/eslint-plugin": "^2.25.0",
99-
"@typescript-eslint/parser": "^2.25.0",
98+
"@typescript-eslint/eslint-plugin": "^2.26.0",
99+
"@typescript-eslint/parser": "^2.26.0",
100100
"babel-loader": "^8.1.0",
101101
"cross-env": "^7.0.2",
102102
"css-loader": "^3.4.0",
@@ -106,13 +106,13 @@
106106
"eslint": "6.8.0",
107107
"eslint-config-airbnb": "18.1.0",
108108
"eslint-config-prettier": "^6.10.1",
109-
"eslint-plugin-import": "^2.20.1",
109+
"eslint-plugin-import": "^2.20.2",
110110
"eslint-plugin-jsx-a11y": "^6.2.3",
111111
"eslint-plugin-react": "^7.19.0",
112112
"eslint-plugin-react-hooks": "^2.5.1",
113113
"file-loader": "^6.0.0",
114-
"html-webpack-plugin": "^4.0.1",
115-
"jest": "^25.1.0",
114+
"html-webpack-plugin": "^4.0.4",
115+
"jest": "^25.2.7",
116116
"license-checker-webpack-plugin": "^0.1.4",
117117
"mockdate": "^2.0.3",
118118
"npm-run-all": "^4.1.3",
@@ -122,9 +122,9 @@
122122
"serve": "^11.3.0",
123123
"style-loader": "^1.1.2",
124124
"stylelint": "^12.0.1",
125-
"ts-node": "^8.8.1",
125+
"ts-node": "^8.8.2",
126126
"typescript": "^3.8.3",
127-
"webpack": "^4.41.6",
127+
"webpack": "^4.42.1",
128128
"webpack-cli": "^3.3.11",
129129
"webpack-merge": "^4.2.2"
130130
},

webpack.base.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
import path from "path";
22

33
import LicenseCheckerWebpackPlugin from "license-checker-webpack-plugin";
4-
import { Configuration } from "webpack";
4+
import { CliConfigOptions, Configuration } from "webpack";
55

6-
export default (_: any, argv: Record<string, string>): Configuration => {
7-
const configName = argv.config.split(".")[2];
6+
export default (
7+
_: string | Record<string, boolean | number | string>,
8+
args: CliConfigOptions,
9+
): Configuration => {
10+
const configName = args.config?.split(".")[2];
811
return {
912
output: {
1013
path: path.resolve(__dirname, "bundle"),
1114
},
12-
devtool: argv.mode === "production" ? false : "source-map",
15+
devtool: args.mode === "production" ? false : "source-map",
1316
resolve: {
1417
extensions: [".js", ".jsx", ".json", ".ts", ".tsx"],
1518
},
@@ -22,8 +25,9 @@ export default (_: any, argv: Record<string, string>): Configuration => {
2225
},
2326
],
2427
},
28+
// @ts-ignore
2529
plugins: [
26-
...(argv.mode === "production"
30+
...(args.mode === "production"
2731
? [
2832
new LicenseCheckerWebpackPlugin({
2933
allow: "(Apache-2.0 OR BSD-2-Clause OR BSD-3-Clause OR ISC OR MIT OR Zlib)",

webpack.main.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
import { Configuration } from "webpack";
1+
import { CliConfigOptions, Configuration } from "webpack";
22
import merge from "webpack-merge";
33

44
import base from "./webpack.base";
55

6-
export default (_: any, argv: Record<string, string>): Configuration =>
7-
merge(base(_, argv), {
6+
export default (
7+
env: string | Record<string, boolean | number | string>,
8+
args: CliConfigOptions,
9+
): Configuration =>
10+
// @ts-ignore
11+
merge(base(env, args), {
812
entry: "./src/main/main.ts",
913
output: {
1014
filename: "main.js",

webpack.renderer.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import HtmlWebpackPlugin from "html-webpack-plugin";
2-
import { Configuration } from "webpack";
2+
import { CliConfigOptions, Configuration } from "webpack";
33
import merge from "webpack-merge";
44

55
import pkg from "./package.json";
66
import base from "./webpack.base";
77

8-
export default (_: any, argv: Record<string, string>): Configuration =>
9-
merge(base(_, argv), {
8+
export default (
9+
env: string | Record<string, boolean | number | string>,
10+
args: CliConfigOptions,
11+
): Configuration =>
12+
// @ts-ignore
13+
merge(base(env, args), {
1014
entry: "./src/renderer/renderer.tsx",
1115
output: {
1216
filename: "renderer.js",

0 commit comments

Comments
 (0)