Merge remote-tracking branch 'upstream/master'

packages/cli/templates/default-app/packages/app/package.json.hbs

@@ -16,7 +16,7 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/jest-dom": "^5.7.0",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^10.2.4",
     "@types/jest": "^25.2.1",

packages/cli/templates/default-app/packages/app/src/setupTests.ts

@@ -1 +1 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';

packages/cli/templates/default-app/plugins/welcome/package.json.hbs

@@ -28,7 +28,7 @@
   "devDependencies": {
     "@backstage/cli": "^{{version}}",
     "@backstage/dev-utils": "^{{version}}",
-    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/jest-dom": "^5.7.0",
     "@testing-library/react": "^9.3.2",
     "@types/testing-library__jest-dom": "^5.0.4",
     "jest-fetch-mock": "^3.0.3"

packages/cli/templates/default-app/plugins/welcome/src/setupTests.ts

@@ -1 +1 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';

packages/cli/templates/default-plugin/package.json.hbs

@@ -32,7 +32,7 @@
   "devDependencies": {
     "@backstage/cli": "^{{version}}",
     "@backstage/dev-utils": "^{{version}}",
-    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/jest-dom": "^5.7.0",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^10.2.4",
     "@types/jest": "^25.2.1",

packages/cli/templates/default-plugin/src/setupTests.ts

@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 require('jest-fetch-mock').enableMocks();