From ca990c98dc56b150ab1017459f986995e62b3b99 Mon Sep 17 00:00:00 2001 From: Jan Potoms <2109932+Janpot@users.noreply.github.com> Date: Fri, 12 Aug 2022 15:04:40 +0200 Subject: [PATCH 1/3] Use stable version of monaco-editor --- packages/toolpad-app/package.json | 2 +- packages/toolpad-core/package.json | 1 + yarn.lock | 31 +++++++++++++++++++++++++----- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/packages/toolpad-app/package.json b/packages/toolpad-app/package.json index a52bba2f6c9..df4aacf505e 100644 --- a/packages/toolpad-app/package.json +++ b/packages/toolpad-app/package.json @@ -71,7 +71,7 @@ "json-to-ts": "^1.7.0", "json5": "^2.2.1", "lodash-es": "^4.17.21", - "monaco-editor": "0.34.0-dev.20220725", + "monaco-editor": "0.34.0", "next": "12.2.0", "node-fetch": "^2.6.7", "node-fetch-har": "^1.0.1", diff --git a/packages/toolpad-core/package.json b/packages/toolpad-core/package.json index 6c6303ce08d..0f838c502ec 100644 --- a/packages/toolpad-core/package.json +++ b/packages/toolpad-core/package.json @@ -38,6 +38,7 @@ "react-query": "^4.0.0-beta.23" }, "devDependencies": { + "@types/react-query": "^1.2.9", "react": "^18.1.0" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 2f974cd896c..b58f8a3573a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2533,6 +2533,11 @@ resolved "https://registry.yarnpkg.com/@swc/wasm/-/wasm-1.2.208.tgz#7452a26d098cc68abebbb63f8d938460019c5eb3" integrity sha512-ZmQQMYTac/wn1tn3bT26paqcIhz0fyk/JFfNz3c/kwKQK9UkZdHkTj7tQMUX30Qacfwil2cgZoqB5xfh/gZdiQ== +"@tanstack/query-core@^4.0.0-beta.1": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.1.0.tgz#1d8aea0dad49e17de7b64da5ebac59904198bd31" + integrity sha512-edUYXcUp9nZjj28ZNDbM71l8dPqXv5B/Mct6GN6fuSozD9dTl5Nw0QAU7esBALcu4YBIKFs/+etKh5hsE4Snsw== + "@testing-library/dom@^8.5.0": version "8.14.0" resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.14.0.tgz#c9830a21006d87b9ef6e1aae306cf49b0283e28e" @@ -2866,6 +2871,13 @@ dependencies: "@types/react" "*" +"@types/react-query@^1.2.9": + version "1.2.9" + resolved "https://registry.yarnpkg.com/@types/react-query/-/react-query-1.2.9.tgz#61df5a0594ea4b90234f9c0fdd8f12a06e331fed" + integrity sha512-xfVcv5zjC6fGf6axPyKxdXNm9RKK9OFzSIyZeCR3r9h4zDuqSpHc8ilTBtfQ1zU/uCx+tAsB+W6vzdCBMu1jtg== + dependencies: + react-query "*" + "@types/react-router-dom@^5.3.3": version "5.3.3" resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83" @@ -9039,10 +9051,10 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== -monaco-editor@0.34.0-dev.20220725: - version "0.34.0-dev.20220725" - resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.34.0-dev.20220725.tgz#79e6bdef9dd3e1e5a66ebbbef549604064695b22" - integrity sha512-MiuJINwVQyqEEieWQ2NEcapjmi2MiAibthhpK2Tj2pd5tMHtZMO2PpoAKQla1cwxfhTlkb7e+cv0a+CN7Cl67A== +monaco-editor@0.34.0: + version "0.34.0" + resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.34.0.tgz#b1749870a1f795dbfc4dc03d8e9b646ddcbeefa7" + integrity sha512-VF+S5zG8wxfinLKLrWcl4WUizMx+LeJrG4PM/M78OhcwocpV0jiyhX/pG6Q9jIOhrb/ckYi6nHnaR5OojlOZCQ== mrmime@^1.0.0: version "1.0.1" @@ -10365,6 +10377,15 @@ react-lifecycles-compat@^3.0.4: resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== +react-query@*: + version "4.0.0" + resolved "https://registry.yarnpkg.com/react-query/-/react-query-4.0.0.tgz#d8a5347503d0aedebc957e35b408c4aa3f726580" + integrity sha512-qiW+Yvbl+EK8iwPDJAj4qWAKceh+g8Up8jxoNxJbzhV3bNheeyHF3EyynnkDO3S+CYgSwtCUFaP8vOjB62j7xQ== + dependencies: + "@tanstack/query-core" "^4.0.0-beta.1" + "@types/use-sync-external-store" "^0.0.3" + use-sync-external-store "^1.2.0" + react-query@^4.0.0-beta.23: version "4.0.0-beta.23" resolved "https://registry.yarnpkg.com/react-query/-/react-query-4.0.0-beta.23.tgz#76713547670ef1f991ae828b3d51df63ec6e035c" @@ -11974,7 +11995,7 @@ use-sync-external-store@1.1.0: resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.1.0.tgz#3343c3fe7f7e404db70f8c687adf5c1652d34e82" integrity sha512-SEnieB2FPKEVne66NpXPd1Np4R1lTNKfjuy3XdIoPQKYBAFdzbzSZlSn1KJZUiihQLQC5Znot4SBz1EOTBwQAQ== -use-sync-external-store@^1.1.0: +use-sync-external-store@^1.1.0, use-sync-external-store@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== From 8b1d1684f97f014fd9f555e611b42cc6ae539b4b Mon Sep 17 00:00:00 2001 From: Jan Potoms <2109932+Janpot@users.noreply.github.com> Date: Fri, 12 Aug 2022 15:07:42 +0200 Subject: [PATCH 2/3] meh --- packages/toolpad-core/package.json | 1 - yarn.lock | 23 +---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/packages/toolpad-core/package.json b/packages/toolpad-core/package.json index 0f838c502ec..6c6303ce08d 100644 --- a/packages/toolpad-core/package.json +++ b/packages/toolpad-core/package.json @@ -38,7 +38,6 @@ "react-query": "^4.0.0-beta.23" }, "devDependencies": { - "@types/react-query": "^1.2.9", "react": "^18.1.0" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index b58f8a3573a..d4f03048e55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2533,11 +2533,6 @@ resolved "https://registry.yarnpkg.com/@swc/wasm/-/wasm-1.2.208.tgz#7452a26d098cc68abebbb63f8d938460019c5eb3" integrity sha512-ZmQQMYTac/wn1tn3bT26paqcIhz0fyk/JFfNz3c/kwKQK9UkZdHkTj7tQMUX30Qacfwil2cgZoqB5xfh/gZdiQ== -"@tanstack/query-core@^4.0.0-beta.1": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.1.0.tgz#1d8aea0dad49e17de7b64da5ebac59904198bd31" - integrity sha512-edUYXcUp9nZjj28ZNDbM71l8dPqXv5B/Mct6GN6fuSozD9dTl5Nw0QAU7esBALcu4YBIKFs/+etKh5hsE4Snsw== - "@testing-library/dom@^8.5.0": version "8.14.0" resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.14.0.tgz#c9830a21006d87b9ef6e1aae306cf49b0283e28e" @@ -2871,13 +2866,6 @@ dependencies: "@types/react" "*" -"@types/react-query@^1.2.9": - version "1.2.9" - resolved "https://registry.yarnpkg.com/@types/react-query/-/react-query-1.2.9.tgz#61df5a0594ea4b90234f9c0fdd8f12a06e331fed" - integrity sha512-xfVcv5zjC6fGf6axPyKxdXNm9RKK9OFzSIyZeCR3r9h4zDuqSpHc8ilTBtfQ1zU/uCx+tAsB+W6vzdCBMu1jtg== - dependencies: - react-query "*" - "@types/react-router-dom@^5.3.3": version "5.3.3" resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83" @@ -10377,15 +10365,6 @@ react-lifecycles-compat@^3.0.4: resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== -react-query@*: - version "4.0.0" - resolved "https://registry.yarnpkg.com/react-query/-/react-query-4.0.0.tgz#d8a5347503d0aedebc957e35b408c4aa3f726580" - integrity sha512-qiW+Yvbl+EK8iwPDJAj4qWAKceh+g8Up8jxoNxJbzhV3bNheeyHF3EyynnkDO3S+CYgSwtCUFaP8vOjB62j7xQ== - dependencies: - "@tanstack/query-core" "^4.0.0-beta.1" - "@types/use-sync-external-store" "^0.0.3" - use-sync-external-store "^1.2.0" - react-query@^4.0.0-beta.23: version "4.0.0-beta.23" resolved "https://registry.yarnpkg.com/react-query/-/react-query-4.0.0-beta.23.tgz#76713547670ef1f991ae828b3d51df63ec6e035c" @@ -11995,7 +11974,7 @@ use-sync-external-store@1.1.0: resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.1.0.tgz#3343c3fe7f7e404db70f8c687adf5c1652d34e82" integrity sha512-SEnieB2FPKEVne66NpXPd1Np4R1lTNKfjuy3XdIoPQKYBAFdzbzSZlSn1KJZUiihQLQC5Znot4SBz1EOTBwQAQ== -use-sync-external-store@^1.1.0, use-sync-external-store@^1.2.0: +use-sync-external-store@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== From e31be0d44babe202fd7c461edca4977a9b2a7487 Mon Sep 17 00:00:00 2001 From: Jan Potoms <2109932+Janpot@users.noreply.github.com> Date: Fri, 12 Aug 2022 15:26:55 +0200 Subject: [PATCH 3/3] yep --- packages/toolpad-app/src/components/MonacoEditor.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolpad-app/src/components/MonacoEditor.tsx b/packages/toolpad-app/src/components/MonacoEditor.tsx index 18fcd6745df..319f3d1936d 100644 --- a/packages/toolpad-app/src/components/MonacoEditor.tsx +++ b/packages/toolpad-app/src/components/MonacoEditor.tsx @@ -44,7 +44,7 @@ function getExtension(language: string): string { declare global { interface Window { - MonacoEnvironment: monaco.Environment; + MonacoEnvironment?: monaco.Environment | undefined; } }