From cc30494a60516e4a34b397abfe4399a21268e2e5 Mon Sep 17 00:00:00 2001 From: "sourcegraph-commit-signing-app[bot]" <188111114+sourcegraph-commit-signing-app[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 02:10:29 +0000 Subject: [PATCH 1/5] Tests running tests on React 18 --- example/pubspec.yaml | 12 ++++++++++++ pubspec.yaml | 14 ++++++++++++++ w_flux_codemod/pubspec.yaml | 14 ++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 3fb2ca5..9e67813 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -20,3 +20,15 @@ dev_dependencies: dependency_overrides: w_flux: path: ../ + react: + git: + url: https://github.com/Workiva/react-dart.git + ref: react-18-2-0-testing + react_testing_library: + git: + url: https://github.com/Workiva/react_testing_library.git + ref: r18 + dart_dev_workiva: + git: + url: https://github.com/Workiva/dart_dev_workiva.git + ref: override-react-js-files-for-r18 diff --git a/pubspec.yaml b/pubspec.yaml index f913bbc..938d8dd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,3 +20,17 @@ dev_dependencies: dependency_validator: ^3.0.0 test: ^1.18.2 workiva_analysis_options: ^1.4.1 + +dependency_overrides: + react: + git: + url: https://github.com/Workiva/react-dart.git + ref: react-18-2-0-testing + react_testing_library: + git: + url: https://github.com/Workiva/react_testing_library.git + ref: r18 + dart_dev_workiva: + git: + url: https://github.com/Workiva/dart_dev_workiva.git + ref: override-react-js-files-for-r18 diff --git a/w_flux_codemod/pubspec.yaml b/w_flux_codemod/pubspec.yaml index 702874b..8eb0ec2 100644 --- a/w_flux_codemod/pubspec.yaml +++ b/w_flux_codemod/pubspec.yaml @@ -22,3 +22,17 @@ dev_dependencies: meta: ^1.16.0 source_span: ^1.10.0 test: ^1.24.3 + +dependency_overrides: + react: + git: + url: https://github.com/Workiva/react-dart.git + ref: react-18-2-0-testing + react_testing_library: + git: + url: https://github.com/Workiva/react_testing_library.git + ref: r18 + dart_dev_workiva: + git: + url: https://github.com/Workiva/dart_dev_workiva.git + ref: override-react-js-files-for-r18 From 727642f46b58ac31d17cb956cd1fe4042c8b133f Mon Sep 17 00:00:00 2001 From: Sydney Jodon Date: Tue, 10 Jun 2025 16:56:20 -0700 Subject: [PATCH 2/5] Update dep overrides --- example/pubspec.yaml | 8 ++++---- pubspec.yaml | 8 ++++---- w_flux_codemod/pubspec.yaml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 9e67813..c2c1f4a 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: none environment: sdk: '>=2.19.0 <3.0.0' dependencies: - w_flux: + w_flux: dev_dependencies: react: ^7.0.0 @@ -22,13 +22,13 @@ dependency_overrides: path: ../ react: git: - url: https://github.com/Workiva/react-dart.git + url: git@github.com:Workiva/react-dart.git ref: react-18-2-0-testing react_testing_library: git: - url: https://github.com/Workiva/react_testing_library.git + url: git@github.com:Workiva/react_testing_library.git ref: r18 dart_dev_workiva: git: - url: https://github.com/Workiva/dart_dev_workiva.git + url: git@github.com:Workiva/dart_dev_workiva.git ref: override-react-js-files-for-r18 diff --git a/pubspec.yaml b/pubspec.yaml index 938d8dd..91053ce 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,18 +19,18 @@ dev_dependencies: dart_dev: ^4.0.0 dependency_validator: ^3.0.0 test: ^1.18.2 - workiva_analysis_options: ^1.4.1 + workiva_analysis_options: ^1.4.1 dependency_overrides: react: git: - url: https://github.com/Workiva/react-dart.git + url: git@github.com:Workiva/react-dart.git ref: react-18-2-0-testing react_testing_library: git: - url: https://github.com/Workiva/react_testing_library.git + url: git@github.com:Workiva/react_testing_library.git ref: r18 dart_dev_workiva: git: - url: https://github.com/Workiva/dart_dev_workiva.git + url: git@github.com:Workiva/dart_dev_workiva.git ref: override-react-js-files-for-r18 diff --git a/w_flux_codemod/pubspec.yaml b/w_flux_codemod/pubspec.yaml index 8eb0ec2..8a231a5 100644 --- a/w_flux_codemod/pubspec.yaml +++ b/w_flux_codemod/pubspec.yaml @@ -26,13 +26,13 @@ dev_dependencies: dependency_overrides: react: git: - url: https://github.com/Workiva/react-dart.git + url: git@github.com:Workiva/react-dart.git ref: react-18-2-0-testing react_testing_library: git: - url: https://github.com/Workiva/react_testing_library.git + url: git@github.com:Workiva/react_testing_library.git ref: r18 dart_dev_workiva: git: - url: https://github.com/Workiva/dart_dev_workiva.git + url: git@github.com:Workiva/dart_dev_workiva.git ref: override-react-js-files-for-r18 From 5f5536c77bd7d076eeb8a595d3d05f122608a5c5 Mon Sep 17 00:00:00 2001 From: Sydney Jodon Date: Tue, 10 Jun 2025 17:03:44 -0700 Subject: [PATCH 3/5] remove dart_dev_workiva dep --- example/pubspec.yaml | 4 ---- pubspec.yaml | 4 ---- w_flux_codemod/pubspec.yaml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index c2c1f4a..c0404b9 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -28,7 +28,3 @@ dependency_overrides: git: url: git@github.com:Workiva/react_testing_library.git ref: r18 - dart_dev_workiva: - git: - url: git@github.com:Workiva/dart_dev_workiva.git - ref: override-react-js-files-for-r18 diff --git a/pubspec.yaml b/pubspec.yaml index 91053ce..5432926 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -30,7 +30,3 @@ dependency_overrides: git: url: git@github.com:Workiva/react_testing_library.git ref: r18 - dart_dev_workiva: - git: - url: git@github.com:Workiva/dart_dev_workiva.git - ref: override-react-js-files-for-r18 diff --git a/w_flux_codemod/pubspec.yaml b/w_flux_codemod/pubspec.yaml index 8a231a5..0150ac4 100644 --- a/w_flux_codemod/pubspec.yaml +++ b/w_flux_codemod/pubspec.yaml @@ -32,7 +32,3 @@ dependency_overrides: git: url: git@github.com:Workiva/react_testing_library.git ref: r18 - dart_dev_workiva: - git: - url: git@github.com:Workiva/dart_dev_workiva.git - ref: override-react-js-files-for-r18 From bd01035d299302790922c3be787bda7210aa1501 Mon Sep 17 00:00:00 2001 From: Sydney Jodon Date: Wed, 11 Jun 2025 14:25:26 -0700 Subject: [PATCH 4/5] remove unused dep --- example/pubspec.yaml | 4 ---- pubspec.yaml | 4 ---- w_flux_codemod/pubspec.yaml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index c0404b9..9dfc7c5 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -24,7 +24,3 @@ dependency_overrides: git: url: git@github.com:Workiva/react-dart.git ref: react-18-2-0-testing - react_testing_library: - git: - url: git@github.com:Workiva/react_testing_library.git - ref: r18 diff --git a/pubspec.yaml b/pubspec.yaml index 5432926..2a47ec7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,7 +26,3 @@ dependency_overrides: git: url: git@github.com:Workiva/react-dart.git ref: react-18-2-0-testing - react_testing_library: - git: - url: git@github.com:Workiva/react_testing_library.git - ref: r18 diff --git a/w_flux_codemod/pubspec.yaml b/w_flux_codemod/pubspec.yaml index 0150ac4..30753a4 100644 --- a/w_flux_codemod/pubspec.yaml +++ b/w_flux_codemod/pubspec.yaml @@ -28,7 +28,3 @@ dependency_overrides: git: url: git@github.com:Workiva/react-dart.git ref: react-18-2-0-testing - react_testing_library: - git: - url: git@github.com:Workiva/react_testing_library.git - ref: r18 From 7c5e4654869ce9566dd73ccf7bdf39be866fe6d1 Mon Sep 17 00:00:00 2001 From: Sydney Jodon Date: Wed, 18 Jun 2025 11:14:42 -0700 Subject: [PATCH 5/5] Update deps --- example/pubspec.yaml | 6 +++++- pubspec.yaml | 6 +++++- w_flux_codemod/pubspec.yaml | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 9dfc7c5..83feed5 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -22,5 +22,9 @@ dependency_overrides: path: ../ react: git: - url: git@github.com:Workiva/react-dart.git + url: https://github.com/Workiva/react-dart.git ref: react-18-2-0-testing + react_testing_library: + git: + url: https://github.com/Workiva/react_testing_library.git + ref: r18 diff --git a/pubspec.yaml b/pubspec.yaml index 2a47ec7..6bc48c4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,5 +24,9 @@ dev_dependencies: dependency_overrides: react: git: - url: git@github.com:Workiva/react-dart.git + url: https://github.com/Workiva/react-dart.git ref: react-18-2-0-testing + react_testing_library: + git: + url: https://github.com/Workiva/react_testing_library.git + ref: r18 diff --git a/w_flux_codemod/pubspec.yaml b/w_flux_codemod/pubspec.yaml index 30753a4..9d27304 100644 --- a/w_flux_codemod/pubspec.yaml +++ b/w_flux_codemod/pubspec.yaml @@ -26,5 +26,9 @@ dev_dependencies: dependency_overrides: react: git: - url: git@github.com:Workiva/react-dart.git + url: https://github.com/Workiva/react-dart.git ref: react-18-2-0-testing + react_testing_library: + git: + url: https://github.com/Workiva/react_testing_library.git + ref: r18