Merge pull request #1837 from spotify/rugvip/release

Release v0.1.1-alpha.17
backstage · Aug 5, 2020 · 24ed336 · 24ed336
2 parents 7db913e + 0dd8fa2
commit 24ed336
Show file tree

Hide file tree

Showing 54 changed files with 254 additions and 375 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "packages": ["packages/*", "plugins/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.1.1-alpha.16"
+  "version": "0.1.1-alpha.17"
 }
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,26 +1,26 @@
 {
   "name": "example-app",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "private": true,
   "dependencies": {
-    "@backstage/cli": "^0.1.1-alpha.16",
-    "@backstage/core": "^0.1.1-alpha.16",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.16",
-    "@backstage/plugin-circleci": "^0.1.1-alpha.16",
-    "@backstage/plugin-explore": "^0.1.1-alpha.16",
-    "@backstage/plugin-github-actions": "^0.1.1-alpha.16",
-    "@backstage/plugin-gitops-profiles": "^0.1.1-alpha.16",
-    "@backstage/plugin-graphiql": "^0.1.1-alpha.16",
-    "@backstage/plugin-lighthouse": "^0.1.1-alpha.16",
-    "@backstage/plugin-register-component": "^0.1.1-alpha.16",
-    "@backstage/plugin-rollbar": "^0.1.1-alpha.16",
-    "@backstage/plugin-scaffolder": "^0.1.1-alpha.16",
-    "@backstage/plugin-sentry": "^0.1.1-alpha.16",
-    "@backstage/plugin-tech-radar": "^0.1.1-alpha.16",
-    "@backstage/plugin-techdocs": "^0.1.1-alpha.16",
-    "@backstage/plugin-welcome": "^0.1.1-alpha.16",
-    "@backstage/test-utils": "^0.1.1-alpha.16",
-    "@backstage/theme": "^0.1.1-alpha.16",
+    "@backstage/cli": "^0.1.1-alpha.17",
+    "@backstage/core": "^0.1.1-alpha.17",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.17",
+    "@backstage/plugin-circleci": "^0.1.1-alpha.17",
+    "@backstage/plugin-explore": "^0.1.1-alpha.17",
+    "@backstage/plugin-github-actions": "^0.1.1-alpha.17",
+    "@backstage/plugin-gitops-profiles": "^0.1.1-alpha.17",
+    "@backstage/plugin-graphiql": "^0.1.1-alpha.17",
+    "@backstage/plugin-lighthouse": "^0.1.1-alpha.17",
+    "@backstage/plugin-register-component": "^0.1.1-alpha.17",
+    "@backstage/plugin-rollbar": "^0.1.1-alpha.17",
+    "@backstage/plugin-scaffolder": "^0.1.1-alpha.17",
+    "@backstage/plugin-sentry": "^0.1.1-alpha.17",
+    "@backstage/plugin-tech-radar": "^0.1.1-alpha.17",
+    "@backstage/plugin-techdocs": "^0.1.1-alpha.17",
+    "@backstage/plugin-welcome": "^0.1.1-alpha.17",
+    "@backstage/test-utils": "^0.1.1-alpha.17",
+    "@backstage/theme": "^0.1.1-alpha.17",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@octokit/rest": "^18.0.0",

diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.1-alpha.16",
-    "@backstage/config": "^0.1.1-alpha.16",
-    "@backstage/config-loader": "^0.1.1-alpha.16",
+    "@backstage/cli-common": "^0.1.1-alpha.17",
+    "@backstage/config": "^0.1.1-alpha.17",
+    "@backstage/config-loader": "^0.1.1-alpha.17",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",
     "compression": "^1.7.4",
@@ -44,7 +44,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/cli": "^0.1.1-alpha.17",
     "@types/compression": "^1.7.0",
     "@types/http-errors": "^1.6.3",
     "@types/morgan": "^1.9.0",

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,
@@ -18,18 +18,18 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.16",
-    "@backstage/catalog-model": "^0.1.1-alpha.16",
-    "@backstage/config": "^0.1.1-alpha.16",
-    "@backstage/plugin-auth-backend": "^0.1.1-alpha.16",
-    "@backstage/plugin-catalog-backend": "^0.1.1-alpha.16",
-    "@backstage/plugin-identity-backend": "^0.1.1-alpha.16",
-    "@backstage/plugin-proxy-backend": "^0.1.1-alpha.16",
-    "@backstage/plugin-rollbar-backend": "^0.1.1-alpha.16",
-    "@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.16",
-    "@backstage/plugin-sentry-backend": "^0.1.1-alpha.16",
-    "@backstage/plugin-techdocs-backend": "^0.1.1-alpha.16",
-    "@backstage/plugin-graphql-backend": "^0.1.1-alpha.16",
+    "@backstage/backend-common": "^0.1.1-alpha.17",
+    "@backstage/catalog-model": "^0.1.1-alpha.17",
+    "@backstage/config": "^0.1.1-alpha.17",
+    "@backstage/plugin-auth-backend": "^0.1.1-alpha.17",
+    "@backstage/plugin-catalog-backend": "^0.1.1-alpha.17",
+    "@backstage/plugin-graphql-backend": "^0.1.1-alpha.17",
+    "@backstage/plugin-identity-backend": "^0.1.1-alpha.17",
+    "@backstage/plugin-proxy-backend": "^0.1.1-alpha.17",
+    "@backstage/plugin-rollbar-backend": "^0.1.1-alpha.17",
+    "@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.17",
+    "@backstage/plugin-sentry-backend": "^0.1.1-alpha.17",
+    "@backstage/plugin-techdocs-backend": "^0.1.1-alpha.17",
     "@octokit/rest": "^18.0.0",
     "dockerode": "^3.2.0",
     "express": "^4.17.1",
@@ -39,7 +39,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/cli": "^0.1.1-alpha.17",
     "@types/dockerode": "^2.5.32",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",

diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-model",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.1-alpha.16",
+    "@backstage/config": "^0.1.1-alpha.17",
     "@types/json-schema": "^7.0.5",
     "@types/yup": "^0.28.2",
     "json-schema": "^0.2.5",
@@ -29,7 +29,7 @@
     "yup": "^0.29.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/cli": "^0.1.1-alpha.17",
     "@types/express": "^4.17.6",
     "@types/jest": "^26.0.7",
     "@types/lodash": "^4.14.151",

diff --git a/packages/cli-common/package.json b/packages/cli-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli-common",
   "description": "Common functionality used by cli, backend, and create-app",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "private": false,
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -29,7 +29,7 @@
     "clean": "backstage-cli clean"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/cli": "^0.1.1-alpha.17",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0"
   },

diff --git a/packages/cli/e2e-test/cli-e2e-test.js b/packages/cli/e2e-test/cli-e2e-test.js
@@ -184,12 +184,15 @@ async function overrideModuleResolutions(appDir, workspaceDir) {
 
   for (const dir of ['packages', 'plugins']) {
     const packageNames = await fs.readdir(resolvePath(workspaceDir, dir));
-    for (const name of packageNames) {
-      const pkgPath = joinPath('..', 'workspace', dir, name);
-
-      pkgJson.dependencies[`@backstage/${name}`] = `file:${pkgPath}`;
-      pkgJson.resolutions[`@backstage/${name}`] = `file:${pkgPath}`;
-      delete pkgJson.devDependencies[`@backstage/${name}`];
+    for (const pkgDir of packageNames) {
+      const pkgPath = joinPath('..', 'workspace', dir, pkgDir);
+      const { name } = await fs.readJson(
+        resolvePath(workspaceDir, dir, pkgDir, 'package.json'),
+      );
+
+      pkgJson.dependencies[name] = `file:${pkgPath}`;
+      pkgJson.resolutions[name] = `file:${pkgPath}`;
+      delete pkgJson.devDependencies[name];
     }
   }
   fs.writeJson(pkgJsonPath, pkgJson, { spaces: 2 });

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -29,9 +29,9 @@
     "backstage-cli": "bin/backstage-cli"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.1-alpha.16",
-    "@backstage/config": "^0.1.1-alpha.16",
-    "@backstage/config-loader": "^0.1.1-alpha.16",
+    "@backstage/cli-common": "^0.1.1-alpha.17",
+    "@backstage/config": "^0.1.1-alpha.17",
+    "@backstage/config-loader": "^0.1.1-alpha.17",
     "@hot-loader/react-dom": "^16.13.0",
     "@lerna/package-graph": "^3.18.5",
     "@lerna/project": "^3.18.0",

diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config-loader",
   "description": "Config loading functionality used by Backstage backend, and CLI",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.1-alpha.16",
+    "@backstage/config": "^0.1.1-alpha.17",
     "fs-extra": "^9.0.0",
     "yaml": "^1.9.2",
     "yup": "^0.29.1"

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config",
   "description": "Config API used by Backstage core, backend, and CLI",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "private": false,
   "publishConfig": {
     "access": "public",

diff --git a/packages/core-api/package.json b/packages/core-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-api",
   "description": "Internal Core API used by Backstage plugins and apps",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,8 +29,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.1-alpha.16",
-    "@backstage/theme": "^0.1.1-alpha.16",
+    "@backstage/config": "^0.1.1-alpha.17",
+    "@backstage/theme": "^0.1.1-alpha.17",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@types/react": "^16.9",
@@ -41,8 +41,8 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.16",
-    "@backstage/test-utils-core": "^0.1.1-alpha.16",
+    "@backstage/cli": "^0.1.1-alpha.17",
+    "@backstage/test-utils-core": "^0.1.1-alpha.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core",
   "description": "Core API used by Backstage plugins and apps",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.1-alpha.16",
-    "@backstage/core-api": "^0.1.1-alpha.16",
-    "@backstage/theme": "^0.1.1-alpha.16",
+    "@backstage/config": "^0.1.1-alpha.17",
+    "@backstage/core-api": "^0.1.1-alpha.17",
+    "@backstage/theme": "^0.1.1-alpha.17",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -54,8 +54,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.16",
-    "@backstage/test-utils": "^0.1.1-alpha.16",
+    "@backstage/cli": "^0.1.1-alpha.17",
+    "@backstage/test-utils": "^0.1.1-alpha.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",

diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "Create app package for Backstage",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.17",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -25,9 +25,9 @@
     "lint": "backstage-cli lint"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.1-alpha.16",
-    "commander": "^4.1.1",
+    "@backstage/cli-common": "^0.1.1-alpha.17",
     "chalk": "^4.0.0",
+    "commander": "^4.1.1",
     "fs-extra": "^9.0.0",
     "handlebars": "^4.7.3",
     "inquirer": "^7.0.4",
@@ -36,10 +36,10 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.1",
-    "@types/react-dev-utils": "^9.0.4",
     "@types/inquirer": "^6.5.0",
-    "@types/recursive-readdir": "^2.2.0",
     "@types/ora": "^3.2.0",
+    "@types/react-dev-utils": "^9.0.4",
+    "@types/recursive-readdir": "^2.2.0",
     "ts-node": "^8.6.2"
   },
   "files": [

diff --git a/packages/create-app/templates/default-app/app-config.yaml b/packages/create-app/templates/default-app/app-config.yaml
@@ -20,3 +20,6 @@ proxy:
 
 techdocs:
   storageUrl: https://techdocs-mock-sites.storage.googleapis.com
+
+auth:
+  providers: {}
diff --git a/packages/create-app/templates/default-app/packages/backend/src/index.test.ts b/packages/create-app/templates/default-app/packages/backend/src/index.test.ts
@@ -1,19 +1,3 @@
-/*
- * 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.
- */
-
 import { PluginEnvironment } from './types';
 
 describe('test', () => {

diff --git a/packages/create-app/templates/default-app/packages/backend/src/index.ts.hbs b/packages/create-app/templates/default-app/packages/backend/src/index.ts.hbs
@@ -1,19 +1,3 @@
-/*
- * 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.
- */
-
 /*
  * Hi!
  *