From d48992686e70f48ae9cab3c1889a5e8387b9cdc3 Mon Sep 17 00:00:00 2001 From: Bianca Morris Date: Wed, 24 Apr 2024 13:45:55 -0400 Subject: [PATCH 1/6] update react, react-dom to 18 --- package-lock.json | 52 +++++++++++++++++++++++------------------------ package.json | 24 +++++++++++----------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 87eff8a..ac14419 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,8 +42,8 @@ "jasmine": "^3.5.0", "plugin-error": "^1.0.1", "prop-types": "^15.7.2", - "react": ">=16.14.0", - "react-dom": ">=16.14.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-transition-group": "^4.4.1", "sass": "^1.39.0", "source-map-support": "^0.5.19", @@ -54,8 +54,8 @@ "peerDependencies": { "d3": ">=5.9.0", "prop-types": ">=15.7.2", - "react": ">=16.8.0", - "react-dom": ">=16.8.0", + "react": ">=18.2.0", + "react-dom": ">=18.2.0", "react-transition-group": ">=4.2.0" } }, @@ -9759,9 +9759,9 @@ } }, "node_modules/react": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.0.0.tgz", - "integrity": "sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", + "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "dev": true, "dependencies": { "loose-envify": "^1.1.0" @@ -9771,16 +9771,16 @@ } }, "node_modules/react-dom": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.0.0.tgz", - "integrity": "sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", "dev": true, "dependencies": { "loose-envify": "^1.1.0", - "scheduler": "^0.21.0" + "scheduler": "^0.23.0" }, "peerDependencies": { - "react": "^18.0.0" + "react": "^18.2.0" } }, "node_modules/react-is": { @@ -10261,9 +10261,9 @@ } }, "node_modules/scheduler": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.21.0.tgz", - "integrity": "sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", + "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", "dev": true, "dependencies": { "loose-envify": "^1.1.0" @@ -20410,22 +20410,22 @@ } }, "react": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.0.0.tgz", - "integrity": "sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", + "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "dev": true, "requires": { "loose-envify": "^1.1.0" } }, "react-dom": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.0.0.tgz", - "integrity": "sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", "dev": true, "requires": { "loose-envify": "^1.1.0", - "scheduler": "^0.21.0" + "scheduler": "^0.23.0" } }, "react-is": { @@ -20809,9 +20809,9 @@ } }, "scheduler": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.21.0.tgz", - "integrity": "sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", + "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", "dev": true, "requires": { "loose-envify": "^1.1.0" @@ -21137,7 +21137,7 @@ "dev": true, "requires": { "atob": "^2.1.2", - "decode-uri-component": "^0.2.2", + "decode-uri-component": "^0.2.0", "resolve-url": "^0.2.1", "source-map-url": "^0.4.0", "urix": "^0.1.0" diff --git a/package.json b/package.json index a6f2e8b..49d7921 100644 --- a/package.json +++ b/package.json @@ -27,25 +27,25 @@ "author": "4DN DCIC", "license": "MIT", "devDependencies": { + "@babel/cli": "^7.6.0", "@babel/core": "^7.17.5", "@babel/eslint-parser": "^7.5.0", "@babel/plugin-proposal-class-properties": "^7.16.7", + "@babel/plugin-proposal-decorators": "^7.17.8", + "@babel/plugin-proposal-export-default-from": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.17.3", + "@babel/plugin-proposal-pipeline-operator": "^7.17.6", "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-transform-async-to-generator": "^7.16.8", + "@babel/plugin-transform-runtime": "^7.17.0", + "@babel/plugin-transform-template-literals": "^7.16.7", "@babel/preset-env": "^7.16.11", "@babel/preset-react": "^7.16.7", "@babel/register": "^7.17.0", "@babel/runtime": "^7.17.8", - "@babel/plugin-transform-runtime": "^7.17.0", - "@babel/plugin-proposal-export-default-from": "^7.16.7", - "@babel/plugin-transform-template-literals": "^7.16.7", - "@babel/plugin-proposal-decorators": "^7.17.8", - "@babel/plugin-proposal-pipeline-operator": "^7.17.6", - "@babel/plugin-transform-async-to-generator": "^7.16.8", "babel-jest": "^27.5.1", "babel-loader": "^8.2.3", "babel-plugin-minify-dead-code-elimination": "^0.5.1", - "@babel/cli": "^7.6.0", "d3": ">=5.9.0", "eslint": "^8.10.0", "eslint-plugin-cypress": "^2.12.1", @@ -54,12 +54,12 @@ "gulp": "^4.0.0", "http-server": "^0.12.1", "jasmine": "^3.5.0", - "sass": "^1.39.0", "plugin-error": "^1.0.1", "prop-types": "^15.7.2", - "react": ">=16.14.0", - "react-dom": ">=16.14.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-transition-group": "^4.4.1", + "sass": "^1.39.0", "source-map-support": "^0.5.19", "string-replace-loader": "^2.3.0", "terser-webpack-plugin": "^4.2.3", @@ -68,8 +68,8 @@ "peerDependencies": { "d3": ">=5.9.0", "prop-types": ">=15.7.2", - "react": ">=16.8.0", - "react-dom": ">=16.8.0", + "react": ">=18.2.0", + "react-dom": ">=18.2.0", "react-transition-group": ">=4.2.0" }, "dependencies": { From ffc6e8519f983be1f6dfed164e7e39ff8264a3b4 Mon Sep 17 00:00:00 2001 From: Bianca Morris Date: Wed, 24 Apr 2024 13:52:12 -0400 Subject: [PATCH 2/6] Update demo app to use createRoot --- demo/demo.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/demo.js b/demo/demo.js index 5ff738e..0f3525b 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -1,5 +1,5 @@ import { Component } from 'react'; -import ReactDOM from 'react-dom'; +import { createRoot } from 'react-dom/client'; import _ from 'underscore'; import url from 'url'; import { default as packageJSON } from './../package.json'; @@ -269,6 +269,6 @@ function ParsingOptsCheckboxes(props){ ); } - -ReactDOM.render(, document.getElementById("root")); - +const container = document.getElementById('root'); +const root = createRoot(container); +root.render(); \ No newline at end of file From 3d2a32587f3daff86f0b7516b3ec64cc64662426 Mon Sep 17 00:00:00 2001 From: Bianca Morris Date: Wed, 24 Apr 2024 13:58:26 -0400 Subject: [PATCH 3/6] Update unkpg to 18 --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 798a8b6..876b7d2 100644 --- a/index.html +++ b/index.html @@ -2,8 +2,8 @@ React Workflow Viz Demo - - + +