Skip to content

Commit

Permalink
resolve loader-utils (#173)
Browse files Browse the repository at this point in the history
  • Loading branch information
naomiaro authored Mar 4, 2023
1 parent 86ffc5a commit ebb84c1
Show file tree
Hide file tree
Showing 3 changed files with 945 additions and 914 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.12.1
v18.14.2
39 changes: 21 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@
},
"homepage": "./",
"dependencies": {
"@hookform/devtools": "^4.0.0",
"@mui/icons-material": "^5.0.4",
"@mui/material": "^5.0.4",
"@mui/styles": "^5.0.1",
"@reduxjs/toolkit": "^1.5.1",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^12.1.1",
"@testing-library/user-event": "^13.2.1",
"archiver": "^5.3.0",
"draft-js": "^0.11.7",
"draftjs-to-html": "^0.9.1",
Expand All @@ -36,11 +32,9 @@
"is-electron": "^2.2.0",
"lint-staged": "^11.0.0",
"lodash": "^4.17.21",
"mini-css-extract-plugin": "^2.7.1",
"mustache": "^4.2.0",
"node-polyfill-webpack-plugin": "^2.0.1",
"node-static": "^0.7.11",
"prettier": "^2.3.2",
"react": "^17.0.2",
"react-color": "^2.19.3",
"react-dom": "^17.0.2",
Expand All @@ -58,14 +52,19 @@
"unzipper": "^0.10.11",
"web-vitals": "^2.1.0"
},
"resolutions": {
"react-scripts/**/loader-utils": "^2.0.4"
},
"scripts": {
"react-start": "react-scripts start",
"react-build": "react-scripts build",
"preclean-start": "rm -rf frontend-assets-build 'userFolder/preview/**/*.(js|css|html)'",
"clean-start": "yarn build-frontend && yarn start",
"start": "concurrently \"yarn cra-start\" \"yarn electron-start\"",
"cra-start": "BROWSER=none react-scripts --openssl-legacy-provider start",
"cra-start": "cross-env BROWSER=none yarn react-start",
"serve-preview": "http-server userFolder/preview",
"electron-start": "tsc -p electron && yarn copy-files && electron .",
"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 \"",
"electron-dev": "yarn clean && concurrently \"yarn cra-start\" \"wait-on http://localhost:3000 && yarn electron-start \"",
"postinstall": "electron-builder install-app-deps",
"prebuild": "react-scripts build && tsc -p electron && yarn build-frontend && yarn copy-files",
"build": "electron-builder",
Expand All @@ -76,7 +75,7 @@
"build": {
"appId": "com.mural",
"productName": "Mural",
"copyright": "Copyright © 2022 ${author}",
"copyright": "Copyright © 2023 ${author}",
"linux": {
"target": [
"deb",
Expand Down Expand Up @@ -142,6 +141,10 @@
]
},
"devDependencies": {
"@hookform/devtools": "^4.3.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@types/archiver": "^5.1.1",
"@types/draft-js": "^0.11.4",
"@types/draftjs-to-html": "^0.8.1",
Expand All @@ -155,22 +158,22 @@
"@types/redux-logger": "^3.0.8",
"@types/unzipper": "^0.10.4",
"blueimp-gallery": "^3.3.0",
"concurrently": "^6.4.0",
"concurrently": "^7.6.0",
"copyfiles": "^2.4.1",
"css-loader": "^3",
"electron": "^15.3.1",
"electron-builder": "^22.11.7",
"cross-env": "^7.0.3",
"css-loader": "^6.7.3",
"electron": "^23.1.2",
"electron-builder": "^23.6.0",
"electron-devtools-installer": "^3.2.0",
"electron-reloader": "^1.2.1",
"expose-loader": "^1.0.0",
"electron-reloader": "^1.2.3",
"http-server": "^14.0.0",
"img-loader": "^4.0.0",
"mini-css-extract-plugin": "^2.7.2",
"prettier": "^2.8.4",
"rimraf": "^3.0.2",
"sass": "^1.58.3",
"sass-loader": "^13.2.0",
"style-loader": "^2.0.0",
"svg-loader": "^0.0.2",
"wait-on": "^6.0.0",
"wait-on": "^7.0.1",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1",
"webpack-manifest-plugin": "^5.0.0"
Expand Down
Loading

0 comments on commit ebb84c1

Please sign in to comment.