Merge branch 'master' of github.com:spotify/backstage into ndudnik/use-catalog-backend

packages/backend/package.json

@@ -45,6 +45,9 @@
     "typescript": "^3.9.2"
   },
   "nodemonConfig": {
-    "watch": "./dist"
+    "watch": [
+      "./dist",
+      "node_modules/@backstage*"
+    ]
   }
 }

packages/catalog-model/src/setupTests.ts

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */