From 31ac7d710b2ebf69c0bfb633c225e9627a7b2bee Mon Sep 17 00:00:00 2001 From: Jack Pope Date: Thu, 29 Feb 2024 11:32:36 +0100 Subject: [PATCH 1/2] [RTR] Throw in shallow export --- .../__tests__/shallow-test.js | 22 +++++++++++++++++++ packages/react-test-renderer/npm/shallow.js | 8 ++++++- packages/react-test-renderer/package.json | 1 - packages/react-test-renderer/shallow.js | 3 ++- yarn.lock | 8 ------- 5 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 packages/react-test-renderer/__tests__/shallow-test.js diff --git a/packages/react-test-renderer/__tests__/shallow-test.js b/packages/react-test-renderer/__tests__/shallow-test.js new file mode 100644 index 0000000000000..9ee3e428bcb96 --- /dev/null +++ b/packages/react-test-renderer/__tests__/shallow-test.js @@ -0,0 +1,22 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @emails react-core + */ + +'use strict'; + +describe('shallow', () => { + it('throws an error on init', () => { + const ReactShallowRenderer = require('../shallow.js').default; + expect(() => { + // eslint-disable-next-line no-new + new ReactShallowRenderer(); + }).toThrow( + 'react-test-renderer/shallow has been removed. See https://react.dev/warnings/react-test-renderer.' + ); + }); +}); diff --git a/packages/react-test-renderer/npm/shallow.js b/packages/react-test-renderer/npm/shallow.js index 8c558b509a3c6..d964174eabd48 100644 --- a/packages/react-test-renderer/npm/shallow.js +++ b/packages/react-test-renderer/npm/shallow.js @@ -1,3 +1,9 @@ 'use strict'; -module.exports = require('react-shallow-renderer'); +function ReactShallowRenderer() { + throw new Error( + 'react-test-renderer/shallow has been removed. See https://react.dev/warnings/react-test-renderer.' + ); +} + +module.exports = ReactShallowRenderer; diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json index 81493fd628adb..ed32ffef0c950 100644 --- a/packages/react-test-renderer/package.json +++ b/packages/react-test-renderer/package.json @@ -20,7 +20,6 @@ "homepage": "https://react.dev/", "dependencies": { "react-is": "^18.2.0", - "react-shallow-renderer": "^16.15.0", "scheduler": "^0.23.0" }, "peerDependencies": { diff --git a/packages/react-test-renderer/shallow.js b/packages/react-test-renderer/shallow.js index f4e93d121e5c7..3e4ba25d83d72 100644 --- a/packages/react-test-renderer/shallow.js +++ b/packages/react-test-renderer/shallow.js @@ -7,4 +7,5 @@ * @flow */ -export {default} from 'react-shallow-renderer'; +import ReactShallowRenderer from './npm/shallow.js'; +export default ReactShallowRenderer; diff --git a/yarn.lock b/yarn.lock index 7d8b4374e2d26..71c9174c1c238 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13017,14 +13017,6 @@ react-native-web@0.0.0-26873b469: prop-types "^15.6.0" react-timer-mixin "^0.13.4" -react-shallow-renderer@^16.15.0: - version "16.15.0" - resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" - integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== - dependencies: - object-assign "^4.1.1" - react-is "^16.12.0 || ^17.0.0 || ^18.0.0" - react-timer-mixin@^0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.4.tgz#75a00c3c94c13abe29b43d63b4c65a88fc8264d3" From a4c5ff602aef5103c4175c9cb9c83a848c6ff104 Mon Sep 17 00:00:00 2001 From: Jack Pope Date: Tue, 26 Mar 2024 17:55:00 -0400 Subject: [PATCH 2/2] empty