Skip to content

Commit

Permalink
Merge pull request #1377 from cityofaustin/17450_explore_replacing_re…
Browse files Browse the repository at this point in the history
…act_quill

17450 explore replacing react quill
  • Loading branch information
tillyw authored Sep 26, 2024
2 parents 328f2dc + fd72fb9 commit 7928885
Show file tree
Hide file tree
Showing 8 changed files with 1,073 additions and 156 deletions.
7 changes: 5 additions & 2 deletions moped-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"build:netlifypr": "env-cmd -e netlifypr npm run build:local",
"build:netlifybranch": "./set_env_branch_build.py",
"test": "react-scripts test --verbose",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"postinstall": "patch-package"
},
"browserslist": {
"production": [
Expand All @@ -47,6 +48,7 @@
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@hookform/resolvers": "^3.3.4",
"@lexical/react": "^0.16.1",
"@mapbox/mapbox-gl-draw": "^1.4.3",
"@mapbox/mapbox-gl-geocoder": "^5.0.2",
"@material-table/core": "~6.2.7",
Expand Down Expand Up @@ -79,12 +81,14 @@
"graphql": "^15.8.0",
"history": "^5.3.0",
"html-react-parser": "^1.4.14",
"lexical": "^0.16.1",
"lodash.foreach": "^4.5.0",
"lodash.get": "^4.4.2",
"lodash.isequal": "^4.5.0",
"lodash.toarray": "^4.4.0",
"mapbox-gl": "^3.0.1",
"papaparse": "^5.4.1",
"patch-package": "^8.0.0",
"prop-types": "^15.8.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand All @@ -94,7 +98,6 @@
"react-helmet": "^6.1.0",
"react-hook-form": "^7.49.3",
"react-map-gl": "^7.1.7",
"react-quill-new": "^3.2.0",
"react-router": "^6.3.0",
"react-router-dom": "^6.21.2",
"react-scripts": "^5.0.1",
Expand Down
16 changes: 16 additions & 0 deletions moped-editor/patches/react-scripts+5.0.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Generated with patch-package to fix our build when using Lexical with React v17
diff --git a/node_modules/react-scripts/config/webpack.config.js b/node_modules/react-scripts/config/webpack.config.js
index e465d8e..af64fc3 100644
--- a/node_modules/react-scripts/config/webpack.config.js
+++ b/node_modules/react-scripts/config/webpack.config.js
@@ -320,6 +320,10 @@ module.exports = function (webpackEnv) {
.map(ext => `.${ext}`)
.filter(ext => useTypeScript || !ext.includes('ts')),
alias: {
+ // https://github.com/facebook/react/issues/20235
+ // https://github.com/facebook/create-react-app/issues/11769
+ "react/jsx-dev-runtime": "react/jsx-dev-runtime.js",
+ "react/jsx-runtime": "react/jsx-runtime.js",
// Support React Native Web
// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
'react-native': 'react-native-web',
Loading

0 comments on commit 7928885

Please sign in to comment.