Skip to content

Commit ebb84c1

Browse files
authored
resolve loader-utils (#173)
1 parent 86ffc5a commit ebb84c1

File tree

3 files changed

+945
-914
lines changed

3 files changed

+945
-914
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18.12.1
1+
v18.14.2

package.json

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,10 @@
1515
},
1616
"homepage": "./",
1717
"dependencies": {
18-
"@hookform/devtools": "^4.0.0",
1918
"@mui/icons-material": "^5.0.4",
2019
"@mui/material": "^5.0.4",
2120
"@mui/styles": "^5.0.1",
2221
"@reduxjs/toolkit": "^1.5.1",
23-
"@testing-library/jest-dom": "^5.11.4",
24-
"@testing-library/react": "^12.1.1",
25-
"@testing-library/user-event": "^13.2.1",
2622
"archiver": "^5.3.0",
2723
"draft-js": "^0.11.7",
2824
"draftjs-to-html": "^0.9.1",
@@ -36,11 +32,9 @@
3632
"is-electron": "^2.2.0",
3733
"lint-staged": "^11.0.0",
3834
"lodash": "^4.17.21",
39-
"mini-css-extract-plugin": "^2.7.1",
4035
"mustache": "^4.2.0",
4136
"node-polyfill-webpack-plugin": "^2.0.1",
4237
"node-static": "^0.7.11",
43-
"prettier": "^2.3.2",
4438
"react": "^17.0.2",
4539
"react-color": "^2.19.3",
4640
"react-dom": "^17.0.2",
@@ -58,14 +52,19 @@
5852
"unzipper": "^0.10.11",
5953
"web-vitals": "^2.1.0"
6054
},
55+
"resolutions": {
56+
"react-scripts/**/loader-utils": "^2.0.4"
57+
},
6158
"scripts": {
59+
"react-start": "react-scripts start",
60+
"react-build": "react-scripts build",
6261
"preclean-start": "rm -rf frontend-assets-build 'userFolder/preview/**/*.(js|css|html)'",
6362
"clean-start": "yarn build-frontend && yarn start",
6463
"start": "concurrently \"yarn cra-start\" \"yarn electron-start\"",
65-
"cra-start": "BROWSER=none react-scripts --openssl-legacy-provider start",
64+
"cra-start": "cross-env BROWSER=none yarn react-start",
6665
"serve-preview": "http-server userFolder/preview",
6766
"electron-start": "tsc -p electron && yarn copy-files && electron .",
68-
"electron-dev": "yarn clean && concurrently \"BROWSER=none yarn start\" \"wait-on http://localhost:3000 && tsc -p electron -w\" \"wait-on http://localhost:3000 && yarn electron-start \"",
67+
"electron-dev": "yarn clean && concurrently \"yarn cra-start\" \"wait-on http://localhost:3000 && yarn electron-start \"",
6968
"postinstall": "electron-builder install-app-deps",
7069
"prebuild": "react-scripts build && tsc -p electron && yarn build-frontend && yarn copy-files",
7170
"build": "electron-builder",
@@ -76,7 +75,7 @@
7675
"build": {
7776
"appId": "com.mural",
7877
"productName": "Mural",
79-
"copyright": "Copyright © 2022 ${author}",
78+
"copyright": "Copyright © 2023 ${author}",
8079
"linux": {
8180
"target": [
8281
"deb",
@@ -142,6 +141,10 @@
142141
]
143142
},
144143
"devDependencies": {
144+
"@hookform/devtools": "^4.3.0",
145+
"@testing-library/jest-dom": "^5.16.5",
146+
"@testing-library/react": "^14.0.0",
147+
"@testing-library/user-event": "^14.4.3",
145148
"@types/archiver": "^5.1.1",
146149
"@types/draft-js": "^0.11.4",
147150
"@types/draftjs-to-html": "^0.8.1",
@@ -155,22 +158,22 @@
155158
"@types/redux-logger": "^3.0.8",
156159
"@types/unzipper": "^0.10.4",
157160
"blueimp-gallery": "^3.3.0",
158-
"concurrently": "^6.4.0",
161+
"concurrently": "^7.6.0",
159162
"copyfiles": "^2.4.1",
160-
"css-loader": "^3",
161-
"electron": "^15.3.1",
162-
"electron-builder": "^22.11.7",
163+
"cross-env": "^7.0.3",
164+
"css-loader": "^6.7.3",
165+
"electron": "^23.1.2",
166+
"electron-builder": "^23.6.0",
163167
"electron-devtools-installer": "^3.2.0",
164-
"electron-reloader": "^1.2.1",
165-
"expose-loader": "^1.0.0",
168+
"electron-reloader": "^1.2.3",
166169
"http-server": "^14.0.0",
167-
"img-loader": "^4.0.0",
170+
"mini-css-extract-plugin": "^2.7.2",
171+
"prettier": "^2.8.4",
168172
"rimraf": "^3.0.2",
169173
"sass": "^1.58.3",
170174
"sass-loader": "^13.2.0",
171-
"style-loader": "^2.0.0",
172175
"svg-loader": "^0.0.2",
173-
"wait-on": "^6.0.0",
176+
"wait-on": "^7.0.1",
174177
"webpack": "^5.75.0",
175178
"webpack-cli": "^5.0.1",
176179
"webpack-manifest-plugin": "^5.0.0"

0 commit comments

Comments
 (0)