Merge branch 'master' into read-remote-config

packages/cli/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @backstage/cli
 
+## 0.8.1
+
+### Patch Changes
+
+- f1e96dc5b1: Update usage of msw in default plugin template
+- b0dc1fd241: bump `@spotify/eslint-config-base` from 9.0.2 to 12.0.0
+- c5bb1df55d: Bump `msw` to `v0.35.0` to resolve [CVE-2021-32796](https://github.com/advisories/GHSA-5fg8-2547-mr8q).
+- 10615525f3: Switch to use the json and observable types from `@backstage/types`
+- Updated dependencies
+  - @backstage/config@0.1.11
+  - @backstage/cli-common@0.1.5
+  - @backstage/errors@0.1.4
+  - @backstage/config-loader@0.7.1
+
 ## 0.8.0
 
 ### Minor Changes

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -28,10 +28,10 @@
     "backstage-cli": "bin/backstage-cli"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.4",
-    "@backstage/config": "^0.1.10",
-    "@backstage/config-loader": "^0.7.0",
-    "@backstage/errors": "^0.1.3",
+    "@backstage/cli-common": "^0.1.5",
+    "@backstage/config": "^0.1.11",
+    "@backstage/config-loader": "^0.7.1",
+    "@backstage/errors": "^0.1.4",
     "@backstage/types": "^0.1.1",
     "@hot-loader/react-dom": "^16.13.0",
     "@lerna/package-graph": "^4.0.0",
@@ -41,7 +41,7 @@
     "@rollup/plugin-json": "^4.0.2",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@rollup/plugin-yaml": "^3.0.0",
-    "@spotify/eslint-config-base": "^9.0.0",
+    "@spotify/eslint-config-base": "^12.0.0",
     "@spotify/eslint-config-react": "^10.0.0",
     "@spotify/eslint-config-typescript": "^10.0.0",
     "@sucrase/jest-plugin": "^2.1.1",
@@ -110,21 +110,21 @@
     "typescript": "^4.0.3",
     "util": "^0.12.3",
     "webpack": "^5.48.0",
-    "webpack-dev-server": "4.0.0-rc.0",
+    "webpack-dev-server": "4.3.1",
     "webpack-node-externals": "^3.0.0",
     "yaml": "^1.10.0",
     "yml-loader": "^2.1.0",
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.9.7",
-    "@backstage/config": "^0.1.10",
-    "@backstage/core-components": "^0.7.1",
-    "@backstage/core-plugin-api": "^0.1.11",
-    "@backstage/core-app-api": "^0.1.18",
+    "@backstage/backend-common": "^0.9.8",
+    "@backstage/config": "^0.1.11",
+    "@backstage/core-components": "^0.7.2",
+    "@backstage/core-plugin-api": "^0.1.12",
+    "@backstage/core-app-api": "^0.1.19",
     "@backstage/dev-utils": "^0.2.12",
-    "@backstage/test-utils": "^0.1.19",
-    "@backstage/theme": "^0.2.11",
+    "@backstage/test-utils": "^0.1.20",
+    "@backstage/theme": "^0.2.12",
     "@types/diff": "^5.0.0",
     "@types/express": "^4.17.6",
     "@types/fs-extra": "^9.0.1",

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

@@ -36,7 +36,7 @@
       "@backstage/cli": "{{versionQuery '@backstage/cli'}}",
       "@types/supertest": "{{versionQuery '@types/supertest' '2.0.8'}}",
       "supertest": "{{versionQuery 'supertest' '4.0.2'}}",
-      "msw": "{{versionQuery 'msw' '0.29.0'}}"
+      "msw": "{{versionQuery 'msw' '0.35.0'}}"
     },
     "files": [
       "dist"

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

@@ -44,7 +44,7 @@
     "@testing-library/user-event": "{{versionQuery '@testing-library/user-event' '13.1.8'}}",
     "@types/jest": "{{versionQuery '@types/jest' '26.0.7'}}",
     "@types/node": "{{versionQuery '@types/node' '14.14.32'}}",
-    "msw": "{{versionQuery 'msw' '0.29.0'}}",
+    "msw": "{{versionQuery 'msw' '0.35.0'}}",
     "cross-fetch": "{{versionQuery 'cross-fetch' '3.0.6'}}"
   },
   "files": [

packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs

@@ -4,12 +4,15 @@ import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { msw, renderInTestApp } from '@backstage/test-utils';
+import {
+  setupRequestMockHandlers,
+  renderInTestApp,
+} from "@backstage/test-utils";
 
 describe('ExampleComponent', () => {
   const server = setupServer();
   // Enable sane handlers for network requests
-  msw.setupDefaultHandlers(server);
+  setupRequestMockHandlers(server);
 
   // setup mock response
   beforeEach(() => {

packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs

@@ -3,12 +3,12 @@ import { render } from '@testing-library/react';
 import { ExampleFetchComponent } from './ExampleFetchComponent';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { msw } from '@backstage/test-utils';
+import { setupRequestMockHandlers } from '@backstage/test-utils';
 
 describe('ExampleFetchComponent', () => {
   const server = setupServer();
   // Enable sane handlers for network requests
-  msw.setupDefaultHandlers(server);
+  setupRequestMockHandlers(server);
 
   // setup mock response
   beforeEach(() => {