From 7a4c7cfedd6dc5a2819b74914646fc2b966b9215 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 13 Sep 2023 14:35:11 +0200 Subject: [PATCH 01/82] Update urls.py (url -> re_path) --- omero_forms/urls.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/omero_forms/urls.py b/omero_forms/urls.py index 64aa8e6..e7a13bb 100644 --- a/omero_forms/urls.py +++ b/omero_forms/urls.py @@ -1,68 +1,68 @@ -from django.conf.urls import url +from django.conf.urls import re_path from . import views urlpatterns = [ # Designer App - url(r"^designer/$", views.designer, name="omeroforms_designer"), + re_path(r"^designer/$", views.designer, name="omeroforms_designer"), # API - url(r"^$", lambda x: None, name="omeroforms_base"), + re_path(r"^$", lambda x: None, name="omeroforms_base"), # List all forms - url(r"^list_forms/$", views.list_forms, name="omeroforms_list_forms"), + re_path(r"^list_forms/$", views.list_forms, name="omeroforms_list_forms"), # List the forms that are assigned to the user's active group that # apply to the object type - url( + re_path( r"^list_applicable_forms/(?P\w+)/$", views.list_applicable_forms, name="omeroforms_list_applicable_forms", ), # Get a form (latest version) - url(r"^get_form/(?P[\w ]+)/$", views.get_form, name="omeroforms_get_form"), + re_path(r"^get_form/(?P[\w ]+)/$", views.get_form, name="omeroforms_get_form"), # Get data for a form (latest version) for a certain object - url( + re_path( r"^get_form_data/" r"(?P[\w ]+)/(?P\w+)/(?P[\w ]+)/$", views.get_form_data, name="omeroforms_get_form_data", ), # Get assignments (restricted to those the user can unassign) - url( + re_path( r"get_form_assignments/$", views.get_form_assignments, name="omeroforms_get_form_assignments", ), # Get the entire history of a form including all data and the forms used # to enter that data - url( + re_path( r"^get_form_data_history/" r"(?P[\w ]+)/(?P\w+)/(?P[\w ]+)/$", views.get_form_data_history, name="omeroforms_get_form_data_history", ), # Get groups that the user can manage - url( + re_path( r"^get_managed_groups/$", views.get_managed_groups, name="omeroforms_get_managed_groups", ), # Lookup usernames by uid - url(r"^get_users/$", views.get_users, name="omeroforms_get_users"), + re_path(r"^get_users/$", views.get_users, name="omeroforms_get_users"), # Check form id ownership - url( + re_path( r"^get_formid_editable/(?P[\w ]+)/$", views.get_formid_editable, name="omeroforms_get_formid_editable", ), # Save a form version (potentially a new form) - url(r"^save_form/$", views.save_form, name="omeroforms_save_form"), + re_path(r"^save_form/$", views.save_form, name="omeroforms_save_form"), # Save data for a form - url( + re_path( r"^save_form_data/" r"(?P[\w ]+)/(?P\w+)/(?P[\w ]+)/$", views.save_form_data, name="omeroforms_save_form_data", ), # Save a form assignment - url( + re_path( r"^save_form_assignment/$", views.save_form_assignment, name="omeroforms_save_form_assignment", From 960a3671c5d0d503262016f7d790d176a1247191 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 13 Sep 2023 14:42:56 +0200 Subject: [PATCH 02/82] Update urls.py --- omero_forms/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omero_forms/urls.py b/omero_forms/urls.py index e7a13bb..ec23df0 100644 --- a/omero_forms/urls.py +++ b/omero_forms/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import re_path +from django.urls import re_path from . import views urlpatterns = [ From 6854ffcc3d92b8ed1937034b43de7bdf938246fc Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 18 Oct 2023 17:22:56 +0200 Subject: [PATCH 03/82] Update package.json --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 3408e6b..1f5a8fe 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ "author": "Douglas P.W. Russell", "license": "MIT", "devDependencies": { - "babel-core": "^6.4.5", + "@babel/core": "^7.2.0", "babel-loader": "^6.2.2", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "babel-preset-es2015": "^6.3.13", + "@babel/preset-env": "^6.3.13", "babel-preset-react": "^6.3.13", "babel-preset-stage-2": "^6.13.0", "babel-runtime": "^6.5.0", @@ -24,7 +24,7 @@ "react-bootstrap": "^0.30.5", "react-codemirror": "^0.2.6", "react-dom": "^15.1.0", - "react-jsonschema-form": "^0.33.2", + "@rjsf/core": "^5.13.2", "react-select": "^1.0.0-rc", "react-tooltip": "^2.0.3", "style-loader": "^0.13.0", From 4f3956fdd2fcb6f4f6598a6ce17b98cb8adc0df2 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 18 Oct 2023 17:31:58 +0200 Subject: [PATCH 04/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f5a8fe..c3c3421 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "babel-loader": "^6.2.2", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "@babel/preset-env": "^6.3.13", + "babel-preset-env": "^6.3.13", "babel-preset-react": "^6.3.13", "babel-preset-stage-2": "^6.13.0", "babel-runtime": "^6.5.0", From 1d1f2c79dc3523d3da189631b380c34e248368b7 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 18 Oct 2023 17:33:11 +0200 Subject: [PATCH 05/82] Update Forms.jsx --- src/Forms.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Forms.jsx b/src/Forms.jsx index 8e80f44..b701808 100644 --- a/src/Forms.jsx +++ b/src/Forms.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import Select from 'react-select'; -import Form from "react-jsonschema-form"; +import Form from '@rjsf/core'; function compareFormData(d1, d2) { // No previous data From a400f067bc726efec76714ce2c0b4de2d8251c65 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 18 Oct 2023 17:33:26 +0200 Subject: [PATCH 06/82] Update History.jsx --- src/History.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/History.jsx b/src/History.jsx index f271892..54bfc4d 100644 --- a/src/History.jsx +++ b/src/History.jsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import Select from 'react-select'; -import Form from "react-jsonschema-form"; +import Form from '@rjsf/core'; const padDate = v => { return v < 10 ? '0' + v : v From b8c5273f869b67925acad65be47e3140e4b29248 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 18 Oct 2023 17:34:47 +0200 Subject: [PATCH 07/82] Update designer-editor.jsx --- src/designer-editor.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/designer-editor.jsx b/src/designer-editor.jsx index cca0687..30691be 100644 --- a/src/designer-editor.jsx +++ b/src/designer-editor.jsx @@ -5,7 +5,7 @@ import 'codemirror/mode/javascript/javascript'; import { shouldRender } from 'react-jsonschema-form/lib/utils'; import defaultData from './designer-default'; const samples = {}; -import Form from 'react-jsonschema-form'; +import Form from '@rjsf/core'; import { Modal, Button, FormGroup, FormControl, ControlLabel, HelpBlock, Checkbox } from 'react-bootstrap' // Patching CodeMirror#componentWillReceiveProps so it's executed synchronously From 8c62167eacf546ee30fb1b74b95c7cbcb705344e Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 18 Oct 2023 17:46:11 +0200 Subject: [PATCH 08/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c3c3421..8a14240 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "babel-loader": "^6.2.2", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "babel-preset-env": "^6.3.13", + "babel-preset-es2015": "^6.3.13", "babel-preset-react": "^6.3.13", "babel-preset-stage-2": "^6.13.0", "babel-runtime": "^6.5.0", From 582b394c7dd93e818c1603c9bfbb48faafa8dac9 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 18 Oct 2023 18:00:45 +0200 Subject: [PATCH 09/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a14240..8a4573e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "babel-runtime": "^6.5.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", - "react": "^15.1.0", + "react": "^15.7.0", "react-bootstrap": "^0.30.5", "react-codemirror": "^0.2.6", "react-dom": "^15.1.0", From 2e3c567b71c0602a94118f02176bbf4a1dbf67b4 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 18 Oct 2023 18:21:04 +0200 Subject: [PATCH 10/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a4573e..1f47e78 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "babel-runtime": "^6.5.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", - "react": "^15.7.0", + "react": "^17.0.2", "react-bootstrap": "^0.30.5", "react-codemirror": "^0.2.6", "react-dom": "^15.1.0", From 0e0df4203ab971335d85d83a405654ced2722289 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 11:04:01 +0200 Subject: [PATCH 11/82] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1f47e78..946c6e9 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "babel-runtime": "^6.5.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", - "react": "^17.0.2", - "react-bootstrap": "^0.30.5", + "react": "^15.7.0", + "react-bootstrap": "^2.9.0", "react-codemirror": "^0.2.6", "react-dom": "^15.1.0", "@rjsf/core": "^5.13.2", From cf2ae587f7875dace7e83e0571e22f8c4ce9da94 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 11:23:21 +0200 Subject: [PATCH 12/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 946c6e9..5ef60f6 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "css-loader": "^0.23.1", "file-loader": "^0.8.5", "react": "^15.7.0", - "react-bootstrap": "^2.9.0", + "react-bootstrap": "^2.5.0", "react-codemirror": "^0.2.6", "react-dom": "^15.1.0", "@rjsf/core": "^5.13.2", From 074a292f21f2113a73f9d072c1167611c3b2cdc6 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 12:44:21 +0200 Subject: [PATCH 13/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ef60f6..7978165 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "babel-runtime": "^6.5.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", - "react": "^15.7.0", + "react": "^16.14.0", "react-bootstrap": "^2.5.0", "react-codemirror": "^0.2.6", "react-dom": "^15.1.0", From a71614ef19a91733ebb4a000c6ebc6f8a02ca476 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 13:06:17 +0200 Subject: [PATCH 14/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7978165..fa9d497 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "react": "^16.14.0", "react-bootstrap": "^2.5.0", "react-codemirror": "^0.2.6", - "react-dom": "^15.1.0", + "react-dom": "^16.14.0", "@rjsf/core": "^5.13.2", "react-select": "^1.0.0-rc", "react-tooltip": "^2.0.3", From 6242286473f6e389821bcad02c8ae5faedfb0c42 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 13:29:23 +0200 Subject: [PATCH 15/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fa9d497..e94e8d4 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "file-loader": "^0.8.5", "react": "^16.14.0", "react-bootstrap": "^2.5.0", - "react-codemirror": "^0.2.6", + "react-codemirror": "^1.0.0", "react-dom": "^16.14.0", "@rjsf/core": "^5.13.2", "react-select": "^1.0.0-rc", From 1ae749ce4c8b0f28eb9ac2bad793046ddd3bf9aa Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 13:49:38 +0200 Subject: [PATCH 16/82] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e94e8d4..bd25038 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,10 @@ "babel-runtime": "^6.5.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", - "react": "^16.14.0", + "react": "^15.7.0", "react-bootstrap": "^2.5.0", "react-codemirror": "^1.0.0", - "react-dom": "^16.14.0", + "react-dom": "^15.7.0", "@rjsf/core": "^5.13.2", "react-select": "^1.0.0-rc", "react-tooltip": "^2.0.3", From 4225b60f2a75e24c3d3af2e5ad7d6b3d70b689d8 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 14:12:28 +0200 Subject: [PATCH 17/82] Update package.json --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index bd25038..678180f 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,10 @@ "babel-runtime": "^6.5.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", - "react": "^15.7.0", + "react": "^16.14.0", "react-bootstrap": "^2.5.0", - "react-codemirror": "^1.0.0", - "react-dom": "^15.7.0", + "react-codemirror2": "^7.3.0", + "react-dom": "^16.14.0", "@rjsf/core": "^5.13.2", "react-select": "^1.0.0-rc", "react-tooltip": "^2.0.3", From 1e25bf40877df887de4938a2ea0dc79f4d18d1b3 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 14:32:45 +0200 Subject: [PATCH 18/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 678180f..ff20368 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "react-dom": "^16.14.0", "@rjsf/core": "^5.13.2", "react-select": "^1.0.0-rc", - "react-tooltip": "^2.0.3", + "react-tooltip": "^4.5.1", "style-loader": "^0.13.0", "url-loader": "^0.5.7", "webpack": "^1.12.13", From 3d79979e41ace49ac4ab0fe1e67604cd082b49fd Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 14:54:59 +0200 Subject: [PATCH 19/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff20368..d062b8c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "css-loader": "^0.23.1", "file-loader": "^0.8.5", "react": "^16.14.0", - "react-bootstrap": "^2.5.0", + "react-bootstrap": "^2.9.0", "react-codemirror2": "^7.3.0", "react-dom": "^16.14.0", "@rjsf/core": "^5.13.2", From 18c97e88eb7a209118be143cdd10487176f8ae77 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 14:56:28 +0200 Subject: [PATCH 20/82] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index d062b8c..d51fb93 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "file-loader": "^0.8.5", "react": "^16.14.0", "react-bootstrap": "^2.9.0", + "react-codemirror": "^1.0.0", "react-codemirror2": "^7.3.0", "react-dom": "^16.14.0", "@rjsf/core": "^5.13.2", From 9f737143343ccbf54dc13f690aaf5c91971f54a7 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 15:16:36 +0200 Subject: [PATCH 21/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d51fb93..58321cb 100644 --- a/package.json +++ b/package.json @@ -18,11 +18,11 @@ "babel-preset-react": "^6.3.13", "babel-preset-stage-2": "^6.13.0", "babel-runtime": "^6.5.0", + "codemirror": "^5.57.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", "react": "^16.14.0", "react-bootstrap": "^2.9.0", - "react-codemirror": "^1.0.0", "react-codemirror2": "^7.3.0", "react-dom": "^16.14.0", "@rjsf/core": "^5.13.2", From c34e4c9e889ae5bd4f94ed79cd8ac4965431bf8d Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 15:25:11 +0200 Subject: [PATCH 22/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 58321cb..22be576 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "author": "Douglas P.W. Russell", "license": "MIT", "devDependencies": { - "@babel/core": "^7.2.0", + "@babel/core": "^7.20.0", "babel-loader": "^6.2.2", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", From e0833740b3cbde0d42a2691f621cc69748547621 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 15:50:32 +0200 Subject: [PATCH 23/82] Update designer-editor.jsx --- src/designer-editor.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/designer-editor.jsx b/src/designer-editor.jsx index 30691be..45e11e6 100644 --- a/src/designer-editor.jsx +++ b/src/designer-editor.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Codemirror from 'react-codemirror'; +import CodeMirror from 'react-codemirror2'; import Select from 'react-select'; import 'codemirror/mode/javascript/javascript'; import { shouldRender } from 'react-jsonschema-form/lib/utils'; @@ -10,7 +10,7 @@ import { Modal, Button, FormGroup, FormControl, ControlLabel, HelpBlock, Checkbo // Patching CodeMirror#componentWillReceiveProps so it's executed synchronously // Ref https://github.com/mozilla-services/react-jsonschema-form/issues/174 -Codemirror.prototype.componentWillReceiveProps = function (nextProps) { +CodeMirror.prototype.componentWillReceiveProps = function (nextProps) { if (this.codeMirror && nextProps.value !== undefined && this.codeMirror.getValue() != nextProps.value) { From 5c1c671c04970dd203fd8f6e595a5bad3946f248 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 15:52:47 +0200 Subject: [PATCH 24/82] Update designer-editor.jsx --- src/designer-editor.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/designer-editor.jsx b/src/designer-editor.jsx index 45e11e6..320a940 100644 --- a/src/designer-editor.jsx +++ b/src/designer-editor.jsx @@ -2,7 +2,7 @@ import React from 'react'; import CodeMirror from 'react-codemirror2'; import Select from 'react-select'; import 'codemirror/mode/javascript/javascript'; -import { shouldRender } from 'react-jsonschema-form/lib/utils'; +import { shouldRender } from "@rjsf/core/lib/utils"; import defaultData from './designer-default'; const samples = {}; import Form from '@rjsf/core'; From 68fafaaa2a242c44ca4cd6b75ade565b6b04381c Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 16:27:26 +0200 Subject: [PATCH 25/82] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 22be576..390adfd 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "react-codemirror2": "^7.3.0", "react-dom": "^16.14.0", "@rjsf/core": "^5.13.2", + "react-scripts": "^5.0.1", "react-select": "^1.0.0-rc", "react-tooltip": "^4.5.1", "style-loader": "^0.13.0", From 7ade87811d08fb3db77c8f2aa14777e1ac3937cf Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 16:30:14 +0200 Subject: [PATCH 26/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 390adfd..caff6ae 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "react-tooltip": "^4.5.1", "style-loader": "^0.13.0", "url-loader": "^0.5.7", - "webpack": "^1.12.13", + "webpack": "^5.89.0", "whatwg-fetch": "^1.0.0" } } From 323182092eb493e5dac2ebb1c55b5f64d0a834b5 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 16:34:07 +0200 Subject: [PATCH 27/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index caff6ae..7e310c7 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "license": "MIT", "devDependencies": { "@babel/core": "^7.20.0", - "babel-loader": "^6.2.2", + "babel-loader": "^6.4.1", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", "babel-preset-es2015": "^6.3.13", From cc58d588ee27f4009cd5c75aa4bd2a63041159f0 Mon Sep 17 00:00:00 2001 From: mmongy Date: Thu, 19 Oct 2023 17:08:26 +0200 Subject: [PATCH 28/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7e310c7..a56acc5 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "license": "MIT", "devDependencies": { "@babel/core": "^7.20.0", - "babel-loader": "^6.4.1", + "babel-loader": "^9.1.3", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", "babel-preset-es2015": "^6.3.13", From 35a4d07d7f67786e462652d4a72fe51117046415 Mon Sep 17 00:00:00 2001 From: mmongy Date: Fri, 20 Oct 2023 17:51:48 +0200 Subject: [PATCH 29/82] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index a56acc5..1b9c74b 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "style-loader": "^0.13.0", "url-loader": "^0.5.7", "webpack": "^5.89.0", + "webpack-cli": "^5.1.4", "whatwg-fetch": "^1.0.0" } } From 3738554b891c46c99795d82f0ed6d168aa9e9ffc Mon Sep 17 00:00:00 2001 From: mmongy Date: Fri, 20 Oct 2023 18:05:34 +0200 Subject: [PATCH 30/82] Update webpack.config.js --- webpack.config.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 8938d48..e892942 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,6 @@ // webpack.config.js var webpack = require('webpack'); - +const TerserPlugin = require("terser-webpack-plugin"); var path = require('path'); module.exports = { @@ -10,17 +10,16 @@ module.exports = { 'designer': ['whatwg-fetch', './src/designer.jsx'], 'designer.min': ['whatwg-fetch', './src/designer.jsx'], }, + optimization: { + minimize: true, + minimizer: [new TerserPlugin()], + }, output: { path: './omero_forms/static/forms/js', filename: '[name].js', library: 'omeroforms' }, - plugins: [ - new webpack.optimize.UglifyJsPlugin({ - include: /\.min\.js$/, - minimize: true - }) - ], + plugins: [], module: { loaders: [ { From 7b4b3c25f7d697b011d17e9db13496eb705432fe Mon Sep 17 00:00:00 2001 From: mmongy Date: Fri, 20 Oct 2023 18:08:28 +0200 Subject: [PATCH 31/82] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 1b9c74b..15f0697 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "react-select": "^1.0.0-rc", "react-tooltip": "^4.5.1", "style-loader": "^0.13.0", + "terser-webpack-plugin":"^5.3.9", "url-loader": "^0.5.7", "webpack": "^5.89.0", "webpack-cli": "^5.1.4", From f022c4c903f13686cf28c7012586ae20d754e344 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 10:46:56 +0200 Subject: [PATCH 32/82] Update webpack.config.js --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index e892942..86dfc1f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -21,7 +21,7 @@ module.exports = { }, plugins: [], module: { - loaders: [ + rules: [ { test: /\.jsx$/, loader: 'babel-loader', From 395286a0e75f8995d1124bd7767c34730f352f5c Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 11:26:04 +0200 Subject: [PATCH 33/82] Update webpack.config.js --- webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 86dfc1f..df97c9d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -26,7 +26,7 @@ module.exports = { test: /\.jsx$/, loader: 'babel-loader', exclude: /node_modules/, - query: { + options: { plugins: ['transform-runtime'], presets: ['react', 'es2015', 'stage-2'] } @@ -35,7 +35,7 @@ module.exports = { test: /\.js$/, loader: 'babel-loader', exclude: /node_modules/, - query: { + options: { plugins: ['transform-runtime'], presets: ['es2015', 'stage-2'] } From b66ba9585fb0560f6e6ec3183a48b9eee8379d84 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 11:51:20 +0200 Subject: [PATCH 34/82] Update package.json --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index 15f0697..1318252 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "codemirror": "^5.57.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", + "path": "^0.12.7", "react": "^16.14.0", "react-bootstrap": "^2.9.0", "react-codemirror2": "^7.3.0", @@ -34,6 +35,7 @@ "url-loader": "^0.5.7", "webpack": "^5.89.0", "webpack-cli": "^5.1.4", + "webpack-dev-server": "^4.15.1", "whatwg-fetch": "^1.0.0" } } From 3b3e94e3c5393e00289651b9a81193e19e91921f Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 12:27:18 +0200 Subject: [PATCH 35/82] Update webpack.config.js --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index df97c9d..cab75d0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -15,7 +15,7 @@ module.exports = { minimizer: [new TerserPlugin()], }, output: { - path: './omero_forms/static/forms/js', + path: __dirname + '/omero_forms/static/forms/js', filename: '[name].js', library: 'omeroforms' }, From d4a82848263ce189990b31d8f62148a02baf180a Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 13:53:30 +0200 Subject: [PATCH 36/82] Update webpack.config.js --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index cab75d0..05caa67 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -42,7 +42,7 @@ module.exports = { }, { test: /\.css$/, // Only .css files - loader: 'style-loader!css-loader' // Run both loaders + use: ['style-loader', 'css-loader'], // Run both loaders }, { test: /\.png$/, loader: "url-loader?limit=100000" From b460ebec03fe60bb48e4defc226c256494e30a7c Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 14:31:00 +0200 Subject: [PATCH 37/82] Update webpack.config.js --- webpack.config.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 05caa67..725c1c9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -44,25 +44,27 @@ module.exports = { test: /\.css$/, // Only .css files use: ['style-loader', 'css-loader'], // Run both loaders }, - { test: /\.png$/, - loader: "url-loader?limit=100000" + { + test: /\.png$/, + use: ["url-loader?limit=100000"], }, // Bootstrap { test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, - loader: 'url?limit=10000&mimetype=application/font-woff'}, + use: ['url?limit=10000&mimetype=application/font-woff'], + }, { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, - loader: 'url?limit=10000&mimetype=application/octet-stream' + use: ['url?limit=10000&mimetype=application/octet-stream'], }, { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, - loader: 'file' + use: ['file'], }, { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, - loader: 'url?limit=10000&mimetype=image/svg+xml' + use: ['url?limit=10000&mimetype=image/svg+xml'], } ] From e0481395414bf0fdccd086f06b23d7512c2ee4b8 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 14:38:06 +0200 Subject: [PATCH 38/82] Update webpack.config.js --- webpack.config.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 725c1c9..8784b8a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -46,7 +46,14 @@ module.exports = { }, { test: /\.png$/, - use: ["url-loader?limit=100000"], + use: [ + { + loader: "url-loader", + options: { + limit=100000, + }, + }, + ], }, // Bootstrap From 5d8c709af1e2887feec17292d27cb14bb1c2dd94 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 15:16:46 +0200 Subject: [PATCH 39/82] Update webpack.config.js --- webpack.config.js | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 8784b8a..e9235b6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -50,7 +50,7 @@ module.exports = { { loader: "url-loader", options: { - limit=100000, + limit: 100000, }, }, ], @@ -59,19 +59,47 @@ module.exports = { // Bootstrap { test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, - use: ['url?limit=10000&mimetype=application/font-woff'], + use: [ + { + loader: 'url-loader', + options: { + limit: 10000, + mimetype: 'application/font-woff', + }, + }, + ], }, { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, - use: ['url?limit=10000&mimetype=application/octet-stream'], + use: [ + { + loader: 'url-loader', + options: { + limit: 10000, + mimetype: 'application/octet-stream', + }, + }, + ], }, { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, - use: ['file'], + use: [ + { + loader: 'file-loader', + }, + ], }, { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, - use: ['url?limit=10000&mimetype=image/svg+xml'], + use: [ + { + loader: 'url-loader', + options: { + limit: 10000, + mimetype: 'image/svg+xml', + }, + }, + ], } ] From c3c2b73f713915b2a233c2bfab35083360654e85 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 15:31:54 +0200 Subject: [PATCH 40/82] Update webpack.config.js --- webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index e9235b6..0786838 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,7 +28,7 @@ module.exports = { exclude: /node_modules/, options: { plugins: ['transform-runtime'], - presets: ['react', 'es2015', 'stage-2'] + presets: ['@babel/react', '@babel/es2015', '@babel/stage-2'] } }, { @@ -37,7 +37,7 @@ module.exports = { exclude: /node_modules/, options: { plugins: ['transform-runtime'], - presets: ['es2015', 'stage-2'] + presets: ['@babel/es2015', '@babel/stage-2'] } }, { From 03799810a5a676a0d514c1bfc80fbd5fa68d6a0c Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 15:59:51 +0200 Subject: [PATCH 41/82] Update package.json --- package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1318252..eb69294 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,14 @@ "author": "Douglas P.W. Russell", "license": "MIT", "devDependencies": { - "@babel/core": "^7.20.0", - "babel-loader": "^9.1.3", + "@babel/core": "^7.0.0-beta.40", + "@babel/cli": "^7.0.0-beta.40", + "babel-loader": "^8.0.0-beta.0", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "babel-preset-es2015": "^6.3.13", - "babel-preset-react": "^6.3.13", - "babel-preset-stage-2": "^6.13.0", + "@babel/preset-es2015": "^6.3.13", + "@babel/preset-react": "^7.0.0-beta.40", + "@babel/preset-stage-2": "^7.0.0-beta.40", "babel-runtime": "^6.5.0", "codemirror": "^5.57.0", "css-loader": "^0.23.1", From 92317b82d75ed45ee91c8cd2a0ea7e828082d94d Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 16:01:25 +0200 Subject: [PATCH 42/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb69294..709655f 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "babel-loader": "^8.0.0-beta.0", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "@babel/preset-es2015": "^6.3.13", + "@babel/preset-es2015": "^7.0.0-beta.40", "@babel/preset-react": "^7.0.0-beta.40", "@babel/preset-stage-2": "^7.0.0-beta.40", "babel-runtime": "^6.5.0", From 4316140d0ab7166e91e8bc8dd00c935d4b80f3b0 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 16:13:14 +0200 Subject: [PATCH 43/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 709655f..bbcd856 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "babel-loader": "^8.0.0-beta.0", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "@babel/preset-es2015": "^7.0.0-beta.40", + "@babel/preset-es2015": "^7.0.0-beta.53", "@babel/preset-react": "^7.0.0-beta.40", "@babel/preset-stage-2": "^7.0.0-beta.40", "babel-runtime": "^6.5.0", From 8a929d568d213959c8810e06c9582cdbbe853913 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 16:19:54 +0200 Subject: [PATCH 44/82] Update webpack.config.js --- webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 0786838..b85cd57 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,7 +28,7 @@ module.exports = { exclude: /node_modules/, options: { plugins: ['transform-runtime'], - presets: ['@babel/react', '@babel/es2015', '@babel/stage-2'] + presets: ['@babel/react', '@babel/env', '@babel/stage-2'] } }, { @@ -37,7 +37,7 @@ module.exports = { exclude: /node_modules/, options: { plugins: ['transform-runtime'], - presets: ['@babel/es2015', '@babel/stage-2'] + presets: ['@babel/env', '@babel/stage-2'] } }, { From 09fd70c8fea6ea065c176aa0713eea11b362e1e6 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 16:20:27 +0200 Subject: [PATCH 45/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bbcd856..ccac4a9 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "babel-loader": "^8.0.0-beta.0", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "@babel/preset-es2015": "^7.0.0-beta.53", + "@babel/preset-env": "^7.23.2", "@babel/preset-react": "^7.0.0-beta.40", "@babel/preset-stage-2": "^7.0.0-beta.40", "babel-runtime": "^6.5.0", From 2b583e946f046d405b8fc87e208a7898ef3ec01f Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 17:14:09 +0200 Subject: [PATCH 46/82] Update package.json --- package.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package.json b/package.json index ccac4a9..795e34f 100644 --- a/package.json +++ b/package.json @@ -38,5 +38,21 @@ "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.15.1", "whatwg-fetch": "^1.0.0" + }, + "babel": { + "plugins": [ + // Stage 2 + ["@babel/plugin-proposal-decorators", { "legacy": true }], + "@babel/plugin-proposal-function-sent", + "@babel/plugin-proposal-export-namespace-from", + "@babel/plugin-proposal-numeric-separator", + "@babel/plugin-proposal-throw-expressions", + + // Stage 3 + "@babel/plugin-syntax-dynamic-import", + "@babel/plugin-syntax-import-meta", + ["@babel/plugin-proposal-class-properties", { "loose": false }], + "@babel/plugin-proposal-json-strings" + ], } } From 1b50483b4c2553dba139718acb3218479ed884f7 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 17:18:33 +0200 Subject: [PATCH 47/82] Update package.json --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index 795e34f..7563c17 100644 --- a/package.json +++ b/package.json @@ -41,14 +41,11 @@ }, "babel": { "plugins": [ - // Stage 2 ["@babel/plugin-proposal-decorators", { "legacy": true }], "@babel/plugin-proposal-function-sent", "@babel/plugin-proposal-export-namespace-from", "@babel/plugin-proposal-numeric-separator", "@babel/plugin-proposal-throw-expressions", - - // Stage 3 "@babel/plugin-syntax-dynamic-import", "@babel/plugin-syntax-import-meta", ["@babel/plugin-proposal-class-properties", { "loose": false }], From bc06321a0c96bd9b3bedc033dd13c7c5b2a5eecb Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 17:40:13 +0200 Subject: [PATCH 48/82] Update package.json --- package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 7563c17..743180e 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,19 @@ }, "author": "Douglas P.W. Russell", "license": "MIT", + "babel": { + "plugins": [ + ["@babel/plugin-proposal-decorators", { "legacy": true }], + "@babel/plugin-proposal-function-sent", + "@babel/plugin-proposal-export-namespace-from", + "@babel/plugin-proposal-numeric-separator", + "@babel/plugin-proposal-throw-expressions", + "@babel/plugin-syntax-dynamic-import", + "@babel/plugin-syntax-import-meta", + ["@babel/plugin-proposal-class-properties", { "loose": false }], + "@babel/plugin-proposal-json-strings" + ], + } "devDependencies": { "@babel/core": "^7.0.0-beta.40", "@babel/cli": "^7.0.0-beta.40", @@ -38,18 +51,5 @@ "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.15.1", "whatwg-fetch": "^1.0.0" - }, - "babel": { - "plugins": [ - ["@babel/plugin-proposal-decorators", { "legacy": true }], - "@babel/plugin-proposal-function-sent", - "@babel/plugin-proposal-export-namespace-from", - "@babel/plugin-proposal-numeric-separator", - "@babel/plugin-proposal-throw-expressions", - "@babel/plugin-syntax-dynamic-import", - "@babel/plugin-syntax-import-meta", - ["@babel/plugin-proposal-class-properties", { "loose": false }], - "@babel/plugin-proposal-json-strings" - ], } } From 750079ceff663bb8aad9cee1f1de2d987ee54ae8 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 17:41:24 +0200 Subject: [PATCH 49/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 743180e..3ae4346 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ ["@babel/plugin-proposal-class-properties", { "loose": false }], "@babel/plugin-proposal-json-strings" ], - } + }, "devDependencies": { "@babel/core": "^7.0.0-beta.40", "@babel/cli": "^7.0.0-beta.40", From a4f062b24d630c2168fc2950c4503dfd3842d290 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 18:07:51 +0200 Subject: [PATCH 50/82] Update package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 3ae4346..e797028 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ ["@babel/plugin-proposal-class-properties", { "loose": false }], "@babel/plugin-proposal-json-strings" ], - }, "devDependencies": { "@babel/core": "^7.0.0-beta.40", "@babel/cli": "^7.0.0-beta.40", From 06b66464ed21c1fa53fef0bb0a61c675eb60b76a Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 23 Oct 2023 18:11:40 +0200 Subject: [PATCH 51/82] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index e797028..bf97f3d 100644 --- a/package.json +++ b/package.json @@ -52,3 +52,4 @@ "whatwg-fetch": "^1.0.0" } } +, From 4b01003e6310e1a1257ffe3fdca844e39e0e1007 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 10:03:58 +0200 Subject: [PATCH 52/82] Update package.json --- package.json | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/package.json b/package.json index bf97f3d..ccac4a9 100644 --- a/package.json +++ b/package.json @@ -9,18 +9,6 @@ }, "author": "Douglas P.W. Russell", "license": "MIT", - "babel": { - "plugins": [ - ["@babel/plugin-proposal-decorators", { "legacy": true }], - "@babel/plugin-proposal-function-sent", - "@babel/plugin-proposal-export-namespace-from", - "@babel/plugin-proposal-numeric-separator", - "@babel/plugin-proposal-throw-expressions", - "@babel/plugin-syntax-dynamic-import", - "@babel/plugin-syntax-import-meta", - ["@babel/plugin-proposal-class-properties", { "loose": false }], - "@babel/plugin-proposal-json-strings" - ], "devDependencies": { "@babel/core": "^7.0.0-beta.40", "@babel/cli": "^7.0.0-beta.40", @@ -52,4 +40,3 @@ "whatwg-fetch": "^1.0.0" } } -, From 4061421225aeb186f92e10cffc7cfdefb2fd4bc4 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 10:05:00 +0200 Subject: [PATCH 53/82] Create .babelrc --- .babelrc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .babelrc diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..de6210b --- /dev/null +++ b/.babelrc @@ -0,0 +1,16 @@ +{ + "plugins": [ + // Stage 2 + ["@babel/plugin-proposal-decorators", { "legacy": true }], + "@babel/plugin-proposal-function-sent", + "@babel/plugin-proposal-export-namespace-from", + "@babel/plugin-proposal-numeric-separator", + "@babel/plugin-proposal-throw-expressions", + + // Stage 3 + "@babel/plugin-syntax-dynamic-import", + "@babel/plugin-syntax-import-meta", + ["@babel/plugin-proposal-class-properties", { "loose": false }], + "@babel/plugin-proposal-json-strings" + ] +} From 0e8f7aff33ce7b510e980498c52833937c179f9d Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 10:06:18 +0200 Subject: [PATCH 54/82] Rename .babelrc to .babelrc.js --- .babelrc => .babelrc.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .babelrc => .babelrc.js (100%) diff --git a/.babelrc b/.babelrc.js similarity index 100% rename from .babelrc rename to .babelrc.js From f25d8fdfbeac3897e474184ae0221a9b9a84565d Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 10:07:25 +0200 Subject: [PATCH 55/82] Rename .babelrc.js to .babelrc.json --- .babelrc.js => .babelrc.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .babelrc.js => .babelrc.json (100%) diff --git a/.babelrc.js b/.babelrc.json similarity index 100% rename from .babelrc.js rename to .babelrc.json From 6166ab21e6fab5e92e880b7c5e8025506f3ffcfa Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 10:32:50 +0200 Subject: [PATCH 56/82] Update package.json --- package.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package.json b/package.json index ccac4a9..9a2223e 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,15 @@ "@babel/core": "^7.0.0-beta.40", "@babel/cli": "^7.0.0-beta.40", "babel-loader": "^8.0.0-beta.0", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-proposal-decorators": "^7.23.2", + "@babel/plugin-proposal-export-namespace-from": "^7.18.9", + "@babel/plugin-proposal-function-sent": "^7.22.5", + "@babel/plugin-proposal-json-strings": "^7.18.6", + "@babel/plugin-proposal-numeric-separator": "^7.18.6", + "@babel/plugin-proposal-throw-expressions": "^7.22.5", + "@babel/plugin-syntax-dynamic-import": "^6.18.0", + "@babel/plugin-syntax-import-meta": "^7.10.4", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", "@babel/preset-env": "^7.23.2", From d04252053a32cd3a5cfd13afc3b28f8c90487e1d Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 11:03:47 +0200 Subject: [PATCH 57/82] Update package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 9a2223e..2625442 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "@babel/plugin-proposal-json-strings": "^7.18.6", "@babel/plugin-proposal-numeric-separator": "^7.18.6", "@babel/plugin-proposal-throw-expressions": "^7.22.5", - "@babel/plugin-syntax-dynamic-import": "^6.18.0", "@babel/plugin-syntax-import-meta": "^7.10.4", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", From f081b16eb97569831f203e0ec1c34f0a79335a44 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 11:38:01 +0200 Subject: [PATCH 58/82] Update and rename .babelrc.json to babel.config.js --- .babelrc.json | 16 ---------------- babel.config.js | 13 +++++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 .babelrc.json create mode 100644 babel.config.js diff --git a/.babelrc.json b/.babelrc.json deleted file mode 100644 index de6210b..0000000 --- a/.babelrc.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "plugins": [ - // Stage 2 - ["@babel/plugin-proposal-decorators", { "legacy": true }], - "@babel/plugin-proposal-function-sent", - "@babel/plugin-proposal-export-namespace-from", - "@babel/plugin-proposal-numeric-separator", - "@babel/plugin-proposal-throw-expressions", - - // Stage 3 - "@babel/plugin-syntax-dynamic-import", - "@babel/plugin-syntax-import-meta", - ["@babel/plugin-proposal-class-properties", { "loose": false }], - "@babel/plugin-proposal-json-strings" - ] -} diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 0000000..dccab04 --- /dev/null +++ b/babel.config.js @@ -0,0 +1,13 @@ +module.exports = { + presets: [ + ['@babel/preset-env', { targets: { node: 'current' } }], + [ + '@babel/preset-react', + { + runtime: 'automatic', + }, + ], + '@babel/preset-typescript', + ], + plugins: ['@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-optional-chaining'], +}; From 58c857f5e8171ee756c95268320ddb702b647afc Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 11:41:38 +0200 Subject: [PATCH 59/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2625442..c8deb3a 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,6 @@ "webpack": "^5.89.0", "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.15.1", - "whatwg-fetch": "^1.0.0" + "whatwg-fetch": "^3.6.19" } } From 0f11b1e68045b605c9b84d58139610d31b0814a0 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 11:47:52 +0200 Subject: [PATCH 60/82] Update package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index c8deb3a..afffc62 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "babel-polyfill": "^6.5.0", "@babel/preset-env": "^7.23.2", "@babel/preset-react": "^7.0.0-beta.40", - "@babel/preset-stage-2": "^7.0.0-beta.40", "babel-runtime": "^6.5.0", "codemirror": "^5.57.0", "css-loader": "^0.23.1", From fa51b43fab7856067f919e9d4d1c1254c11def52 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 11:48:20 +0200 Subject: [PATCH 61/82] Update webpack.config.js --- webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index b85cd57..b55f169 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,7 +28,7 @@ module.exports = { exclude: /node_modules/, options: { plugins: ['transform-runtime'], - presets: ['@babel/react', '@babel/env', '@babel/stage-2'] + presets: ['@babel/react', '@babel/env'] } }, { @@ -37,7 +37,7 @@ module.exports = { exclude: /node_modules/, options: { plugins: ['transform-runtime'], - presets: ['@babel/env', '@babel/stage-2'] + presets: ['@babel/env'] } }, { From 3c7acce180db4a0c588b6662da8caa6caae553bf Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 12:13:44 +0200 Subject: [PATCH 62/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index afffc62..8447780 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "devDependencies": { "@babel/core": "^7.0.0-beta.40", "@babel/cli": "^7.0.0-beta.40", - "babel-loader": "^8.0.0-beta.0", + "babel-loader": "^7.0.0-beta.40", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.23.2", "@babel/plugin-proposal-export-namespace-from": "^7.18.9", From d7a2ee3b10d2c1b8dfd9d5208e5a982cc903053e Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 12:23:44 +0200 Subject: [PATCH 63/82] Update package.json --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8447780..3dee3b0 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "author": "Douglas P.W. Russell", "license": "MIT", "devDependencies": { - "@babel/core": "^7.0.0-beta.40", - "@babel/cli": "^7.0.0-beta.40", - "babel-loader": "^7.0.0-beta.40", + "@babel/core": "^7.1.6", + "@babel/cli": "^7.23.0", + "babel-loader": "^8.0.4", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.23.2", "@babel/plugin-proposal-export-namespace-from": "^7.18.9", @@ -23,8 +23,8 @@ "@babel/plugin-syntax-import-meta": "^7.10.4", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "@babel/preset-env": "^7.23.2", - "@babel/preset-react": "^7.0.0-beta.40", + "@babel/preset-env": "^7.1.6", + "@babel/preset-react": "^7.0.0", "babel-runtime": "^6.5.0", "codemirror": "^5.57.0", "css-loader": "^0.23.1", From fc4dc6656e1fdd1ec27b8d5e55c3fb8320522534 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 12:30:46 +0200 Subject: [PATCH 64/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3dee3b0..fdf0dab 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "devDependencies": { "@babel/core": "^7.1.6", "@babel/cli": "^7.23.0", - "babel-loader": "^8.0.4", + "babel-loader": "^7.1.5", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.23.2", "@babel/plugin-proposal-export-namespace-from": "^7.18.9", From 616fb4e5e90ab50db4fc3b8a56aa8bb0ad7259d9 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 13:49:27 +0200 Subject: [PATCH 65/82] Update package.json --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index fdf0dab..c984b8d 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "author": "Douglas P.W. Russell", "license": "MIT", "devDependencies": { - "@babel/core": "^7.1.6", - "@babel/cli": "^7.23.0", - "babel-loader": "^7.1.5", + "@babel/core": "^8.0.0", + "@babel/cli": "^8.0.0", + "babel-loader": "^8.0.0", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.23.2", "@babel/plugin-proposal-export-namespace-from": "^7.18.9", @@ -23,9 +23,9 @@ "@babel/plugin-syntax-import-meta": "^7.10.4", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "@babel/preset-env": "^7.1.6", - "@babel/preset-react": "^7.0.0", - "babel-runtime": "^6.5.0", + "@babel/preset-env": "^8.0.0", + "@babel/preset-react": "^8.0.0", + "babel-runtime": "^7.23.2", "codemirror": "^5.57.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", From 989490c076aa832d5f9ed58a6d2a9f155049c5a3 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 13:53:19 +0200 Subject: [PATCH 66/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c984b8d..fdac413 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "author": "Douglas P.W. Russell", "license": "MIT", "devDependencies": { - "@babel/core": "^8.0.0", + "@babel/core": "^7.23.2", "@babel/cli": "^8.0.0", "babel-loader": "^8.0.0", "@babel/plugin-proposal-class-properties": "^7.18.6", From 15a9f1a8f57bbe7304e167dccf0886e383641225 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 14:15:58 +0200 Subject: [PATCH 67/82] Update package.json --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fdac413..2a4f31e 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "license": "MIT", "devDependencies": { "@babel/core": "^7.23.2", - "@babel/cli": "^8.0.0", - "babel-loader": "^8.0.0", + "@babel/cli": "^7.23.0", + "babel-loader": "^9.1.3", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.23.2", "@babel/plugin-proposal-export-namespace-from": "^7.18.9", @@ -23,9 +23,9 @@ "@babel/plugin-syntax-import-meta": "^7.10.4", "babel-plugin-transform-runtime": "^6.8.0", "babel-polyfill": "^6.5.0", - "@babel/preset-env": "^8.0.0", - "@babel/preset-react": "^8.0.0", - "babel-runtime": "^7.23.2", + "@babel/preset-env": "^7.23.2", + "@babel/preset-react": "^7.22.15", + "@babel/runtime": "^7.23.2", "codemirror": "^5.57.0", "css-loader": "^0.23.1", "file-loader": "^0.8.5", From d4f14443c6590eb3f6de18f199c2b427ae9cad36 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 14:38:01 +0200 Subject: [PATCH 68/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2a4f31e..8370b0e 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "devDependencies": { "@babel/core": "^7.23.2", "@babel/cli": "^7.23.0", - "babel-loader": "^9.1.3", + "babel-loader": "^7.1.5", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.23.2", "@babel/plugin-proposal-export-namespace-from": "^7.18.9", From b67185d9a70a8468134f8b25fbc1b62554b29a45 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 14:44:40 +0200 Subject: [PATCH 69/82] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8370b0e..4589aca 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "style-loader": "^0.13.0", "terser-webpack-plugin":"^5.3.9", "url-loader": "^0.5.7", - "webpack": "^5.89.0", - "webpack-cli": "^5.1.4", + "webpack": "^4.47.0", + "webpack-cli": "^4.10.0", "webpack-dev-server": "^4.15.1", "whatwg-fetch": "^3.6.19" } From 140fc0a06bfb53431bc238eee7d5dd2acc935941 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 15:08:16 +0200 Subject: [PATCH 70/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4589aca..a829f59 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "react-select": "^1.0.0-rc", "react-tooltip": "^4.5.1", "style-loader": "^0.13.0", - "terser-webpack-plugin":"^5.3.9", + "terser-webpack-plugin":"^4.2.3", "url-loader": "^0.5.7", "webpack": "^4.47.0", "webpack-cli": "^4.10.0", From d6575bacf0277f5b3f6d50c0b5f3134df5dbaee7 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 15:42:28 +0200 Subject: [PATCH 71/82] Update webpack.config.js --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index b55f169..e0ad1bb 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -105,6 +105,6 @@ module.exports = { ] }, resolve: { - extensions: ['', '.js', '.jsx', '.json'] + extensions: ['.js', '.jsx', '.json'] }, }; From c75a97e18631bbc534486d899f50414f737c2b23 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 16:49:50 +0200 Subject: [PATCH 72/82] Update package.json --- package.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package.json b/package.json index a829f59..0af2ef7 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,13 @@ "version": "1.1.0", "description": "", "main": "bundle.js", + "babel": { + "presets": [ + "react", + "env", + "babel-preset-react" + ] + }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "build": "./node_modules/webpack/bin/webpack.js --progress" From 7cd70b775f340b4f2ac788e11aba90ac63edd328 Mon Sep 17 00:00:00 2001 From: mmongy Date: Tue, 24 Oct 2023 17:17:25 +0200 Subject: [PATCH 73/82] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 0af2ef7..68c9d36 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "presets": [ "react", "env", - "babel-preset-react" + "@babel/preset-env", + "@babel/preset-react" ] }, "scripts": { From c52f4d45cfcffd5424e6e328e42b096357c0d3b5 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 25 Oct 2023 10:20:00 +0200 Subject: [PATCH 74/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 68c9d36..75bac31 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "author": "Douglas P.W. Russell", "license": "MIT", - "devDependencies": { + "dependencies": { "@babel/core": "^7.23.2", "@babel/cli": "^7.23.0", "babel-loader": "^7.1.5", From 911a12b822430153ef48540f30bef1b616a4accb Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 25 Oct 2023 14:13:50 +0200 Subject: [PATCH 75/82] Update webpack.config.js --- webpack.config.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index e0ad1bb..b069e41 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -101,10 +101,6 @@ module.exports = { }, ], } - ] }, - resolve: { - extensions: ['.js', '.jsx', '.json'] - }, }; From 19eec574e35c8e156e87a24f0c7fb4248d593ca2 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 25 Oct 2023 14:47:16 +0200 Subject: [PATCH 76/82] Update webpack.config.js --- webpack.config.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webpack.config.js b/webpack.config.js index b069e41..a5dae30 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -103,4 +103,7 @@ module.exports = { } ] }, + resolve: { + extensions: ['.js', '.jsx', '.json'] + }, }; From 307503194e24561af3a14141c4c255f2f75a24e2 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 25 Oct 2023 14:57:33 +0200 Subject: [PATCH 77/82] Update babel.config.js --- babel.config.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/babel.config.js b/babel.config.js index dccab04..d10b177 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,13 +1,7 @@ module.exports = { presets: [ ['@babel/preset-env', { targets: { node: 'current' } }], - [ - '@babel/preset-react', - { - runtime: 'automatic', - }, - ], - '@babel/preset-typescript', + ['@babel/preset-react', {runtime: 'automatic',},], ], plugins: ['@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-optional-chaining'], }; From 80b68c80980e4c2dd0ab11553664e4d0aa1dbcd0 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 25 Oct 2023 15:07:08 +0200 Subject: [PATCH 78/82] Update webpack.config.js --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index a5dae30..56dbbf7 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,7 +28,7 @@ module.exports = { exclude: /node_modules/, options: { plugins: ['transform-runtime'], - presets: ['@babel/react', '@babel/env'] + presets: ['@babel/react'] } }, { From f985888de93b909b925f2dd64af86b7ace019611 Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 25 Oct 2023 15:40:25 +0200 Subject: [PATCH 79/82] Update webpack.config.js --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 56dbbf7..a5dae30 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,7 +28,7 @@ module.exports = { exclude: /node_modules/, options: { plugins: ['transform-runtime'], - presets: ['@babel/react'] + presets: ['@babel/react', '@babel/env'] } }, { From 1298b670cb9c8fb72e0e2b32e138891eb111107c Mon Sep 17 00:00:00 2001 From: mmongy Date: Wed, 25 Oct 2023 15:43:26 +0200 Subject: [PATCH 80/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 75bac31..7afc7c7 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dependencies": { "@babel/core": "^7.23.2", "@babel/cli": "^7.23.0", - "babel-loader": "^7.1.5", + "babel-loader": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.23.2", "@babel/plugin-proposal-export-namespace-from": "^7.18.9", From 864b16598c1de9a69fbd3a6a21be567072bed1e9 Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 6 Nov 2023 10:58:16 +0100 Subject: [PATCH 81/82] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7afc7c7..56a8a0a 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "react-bootstrap": "^2.9.0", "react-codemirror2": "^7.3.0", "react-dom": "^16.14.0", - "@rjsf/core": "^5.13.2", + "@rjsf/core": "^5.13.4", "react-scripts": "^5.0.1", "react-select": "^1.0.0-rc", "react-tooltip": "^4.5.1", From c6c8674a6f8aee2bef1193e95da511c275b1f33e Mon Sep 17 00:00:00 2001 From: mmongy Date: Mon, 6 Nov 2023 12:38:39 +0100 Subject: [PATCH 82/82] Update package.json --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index 56a8a0a..7464e79 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,8 @@ "react-codemirror2": "^7.3.0", "react-dom": "^16.14.0", "@rjsf/core": "^5.13.4", + "@rjsf/utils": "^5.13.4", + "@rjsf/validator-ajv8": "^5.13.4", "react-scripts": "^5.0.1", "react-select": "^1.0.0-rc", "react-tooltip": "^4.5.1",