Merge pull request #3 from open-rpc/shanejonas/update-react-monaco-re…

…wired
open-rpc · Nov 28, 2024 · c7699c9 · c7699c9
2 parents fe61d34 + 8608613
commit c7699c9
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 65 deletions.
diff --git a/packages/inspector/config-overrides.js b/packages/inspector/config-overrides.js
@@ -0,0 +1,10 @@
+const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
+
+module.exports = function override(config, env) {
+  config.plugins.push(
+    new MonacoWebpackPlugin({
+      languages: ["json"]
+    })
+  );
+  return config;
+}
diff --git a/packages/inspector/monaco-rescript.js b/packages/inspector/monaco-rescript.js
diff --git a/packages/inspector/package.json b/packages/inspector/package.json
@@ -10,20 +10,16 @@
     "access": "public"
   },
   "scripts": {
-    "start": "rescripts start",
-    "build": "rescripts build",
+    "start": "react-app-rewired start",
+    "build": "react-app-rewired build",
     "lint": "tslint --fix -p .",
-    "test": "npm run lint && rescripts test --coverage --passWithNoTests",
+    "test": "npm run lint && react-app-rewired test --coverage --passWithNoTests",
     "build:package": "tsc --noEmit false --outDir package --jsx react --declaration true --allowJs false --isolatedModules false --target es5 --module commonjs && mv package/exports.d.ts package/index.d.ts && mv package/exports.js package/index.js"
   },
-  "rescripts": [
-    "monaco-rescript"
-  ],
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@rescripts/cli": "latest",
-    "@rescripts/utilities": "0.0.7",
+    "react-app-rewired": "^2.1.8",
     "@types/jest": "^24.0.13",
     "@types/qs": "^6.5.3",
     "@types/react-dom": "^16.9.4",
@@ -60,10 +56,11 @@
     "@open-rpc/schema-utils-js": "^1.14.3",
     "@rehooks/window-size": "^1.0.2",
     "acorn-dynamic-import": "^4.0.0",
-    "monaco-editor": "^0.30.0",
+    "monaco-editor": "^0.34.1",
+    "monaco-vim": "0.0.14",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "qs": "^6.11.0",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
     "react-json-view": "^1.19.1",
     "react-split-pane": "^0.1.87",
     "semantic-release": "^15.13.21",

diff --git a/packages/logs-react/config-overrides.js b/packages/logs-react/config-overrides.js
@@ -0,0 +1,10 @@
+const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
+
+module.exports = function override(config, env) {
+  config.plugins.push(
+    new MonacoWebpackPlugin({
+      languages: ["json"]
+    })
+  );
+  return config;
+}
diff --git a/packages/logs-react/package.json b/packages/logs-react/package.json
@@ -11,17 +11,16 @@
     "access": "public"
   },
   "scripts": {
-    "start": "rescripts start",
-    "build": "rescripts build",
+    "start": "react-app-rewired start",
+    "build": "react-app-rewired build",
     "build:package": "tsc --noEmit false --outDir package --jsx react --declaration true --allowJs false --isolatedModules false --target es5 --module commonjs && mv package/exports.d.ts package/index.d.ts && mv package/exports.js package/index.js && find src/components -mindepth 1 -maxdepth 1 -type d -exec sh -c 'for f in {}/*.css; do cp \"$f\" \"package/components/$(basename {})\"; done' {} \\;",
     "lint": "tslint --fix -p .",
-    "test": "npm run lint && CI=true rescripts test --coverage --passWithNoTests"
+    "test": "npm run lint && CI=true react-app-rewired test --coverage --passWithNoTests"
   },
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@rescripts/cli": "latest",
-    "@rescripts/utilities": "0.0.7",
+    "react-app-rewired": "^2.1.8",
     "@types/jest": "^24.0.13",
     "@types/react-dom": "^16.9.4",
     "monaco-editor-webpack-plugin": "^6.0.0",
@@ -53,14 +52,11 @@
     "copy-to-clipboard": "^3.3.1",
     "date-fns": "^2.16.1",
     "moment": "^2.24.0",
-    "monaco-editor": "^0.30.0",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "monaco-editor": "^0.34.1",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "react-i18next": "^10.13.1"
   },
-  "rescripts": [
-    "rescript-monaco"
-  ],
   "engines": {
     "node": ">=18.20.5"
   }

diff --git a/packages/logs-react/rescript-monaco.js b/packages/logs-react/rescript-monaco.js
diff --git a/packages/playground/config-overrides.js b/packages/playground/config-overrides.js
@@ -0,0 +1,10 @@
+const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
+
+module.exports = function override(config, env) {
+  config.plugins.push(
+    new MonacoWebpackPlugin({
+      languages: ["json"]
+    })
+  );
+  return config;
+}
diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -30,28 +30,23 @@
     "json-schema-ref-parser": "^6.1.0",
     "jsonschema": "^1.2.4",
     "lodash": "^4.17.21",
-    "monaco-editor": "^0.30.0",
+    "monaco-editor": "^0.34.1",
     "open": "^6.4.0",
     "qs": "^6.11.0",
-    "react": "^16.12.0",
+    "react": "^18.2.0",
     "react-app-polyfill": "^1.0.1",
-    "react-dom": "^16.12.0",
+    "react-dom": "^18.2.0",
     "react-json-view": "^1.19.1",
     "react-markdown": "^4.1.0",
     "react-split-pane": "^0.1.87",
     "reusable": "^1.0.0-alpha.12",
     "use-debounce": "^8.0.4"
   },
   "scripts": {
-    "start": "rescripts start",
-    "build": "rescripts build",
+    "start": "react-app-rewired start",
+    "build": "react-app-rewired build",
     "lint": "tslint --fix -p .",
-    "test": "npm run lint && rescripts test",
-    "build": "turbo run build",
-    "test": "turbo run test",
-    "lint": "turbo run lint",
-    "watch": "turbo run build test --watch",
-    "dev": "turbo run build start --watch"
+    "test": "npm run lint && react-app-rewired test"
   },
   "browserslist": [
     ">0.2%",
@@ -60,8 +55,7 @@
     "not op_mini all"
   ],
   "devDependencies": {
-    "@rescripts/cli": "latest",
-    "@rescripts/utilities": "0.0.7",
+    "react-app-rewired": "^2.1.8",
     "@types/classnames": "^2.2.9",
     "@types/css-mediaquery": "^0.1.0",
     "@types/jest": "^24.0.23",
@@ -76,9 +70,6 @@
     "tslint": "^6.1.3",
     "typescript": "^5.0.0"
   },
-  "rescripts": [
-    "rescript-monaco"
-  ],
   "jest": {
     "collectCoverageFrom": [
       "src/**/*.{js,jsx,ts,tsx}",

diff --git a/packages/playground/rescript-monaco.js b/packages/playground/rescript-monaco.js