Merge branch 'master' of github.com:spotify/backstage into feat/backend-plugin

* 'master' of github.com:spotify/backstage: (21 commits)
  core/package.json: pin core-api to same version as core
  [microsite] tweaking CNCF logo styling (#2529)
  feat(catalog): show only components
  fix(gcp-projects): some postponed cleanup of the plugin code (#2523)
  feat: move add example components to a more visible space and change behavior
  use version from lerna.json or fallback to 0.1.0
  remove scope from registry
  revert templatingTask
  revert templatingTask test
  update templatingTask test
  fix plugin template verification
  fix plugin:diff
  remove console.log
  fix plugin:diff
  un-escape var
  keep addPluginDependencyToApp argument consistent
  detect monorepo
  fix registryURL
  rename packageName
  improvement
  ...

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

@@ -1,41 +1,44 @@
 {
-  "name": "@backstage/plugin-{{id}}-backend",
+  "name": "{{name}}",
   "version": "{{version}}",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
-  "private": true,
+  {{#if privatePackage}} "private": {{privatePackage}},
+  {{/if}}
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.cjs.js",
-    "types": "dist/index.d.ts"
-  },
-  "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
-  },
-  "dependencies": {
-    "@backstage/backend-common": "^{{version}}",
-    "@backstage/config": "^{{version}}",
-    "@types/express": "^4.17.6",
-    "express": "^4.17.1",
-    "express-promise-router": "^3.0.3",
-    "winston": "^3.2.1",
-    "node-fetch": "^2.6.0",
-    "yn": "^4.0.0"
-  },
-  "devDependencies": {
-    "@backstage/cli": "^{{version}}",
-    "@types/supertest": "^2.0.8",
-    "supertest": "^4.0.2",
-    "msw": "^0.19.5"
-  },
-  "files": [
-    "dist"
-  ]
-}
+    {{#if npmRegistry}} "registry": "{{npmRegistry}}",
+    {{/if}}
+      "access": "public",
+      "main": "dist/index.cjs.js",
+      "types": "dist/index.d.ts"
+    },
+    "scripts": {
+      "start": "backstage-cli backend:dev",
+      "build": "backstage-cli backend:build",
+      "lint": "backstage-cli lint",
+      "test": "backstage-cli test",
+      "prepack": "backstage-cli prepack",
+      "postpack": "backstage-cli postpack",
+      "clean": "backstage-cli clean"
+    },
+    "dependencies": {
+      "@backstage/backend-common": "^{{version}}",
+      "@backstage/config": "^{{version}}",
+      "@types/express": "^4.17.6",
+      "express": "^4.17.1",
+      "express-promise-router": "^3.0.3",
+      "winston": "^3.2.1",
+      "node-fetch": "^2.6.0",
+      "yn": "^4.0.0"
+    },
+    "devDependencies": {
+      "@backstage/cli": "^{{version}}",
+      "@types/supertest": "^2.0.8",
+      "supertest": "^4.0.2",
+      "msw": "^0.19.5"
+    },
+    "files": [
+      "dist"
+    ]
+  }

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

@@ -1,11 +1,14 @@
 {
-  "name": "@backstage/plugin-{{id}}",
+  "name": "{{name}}",
   "version": "{{version}}",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
-  "private": true,
+{{#if privatePackage}}  "private": {{privatePackage}},
+{{/if}}
   "publishConfig": {
+{{#if npmRegistry}}    "registry": "{{npmRegistry}}",
+{{/if}}
     "access": "public",
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"