Merge branch 'master' into shmidt-i/backend-plugins-standalone-builds-fix

packages/backend-common/package.json

@@ -6,7 +6,9 @@
   "types": "src/index.ts",
   "private": false,
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
   },
   "homepage": "https://backstage.io",
   "repository": {
@@ -19,7 +21,7 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "backstage-cli build-cache -- tsc",
+    "build": "backstage-cli build --outputs cjs,types",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test",
     "prepack": "backstage-cli prepack",
@@ -27,6 +29,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
+    "@types/cors": "^2.8.6",
+    "@types/express": "^4.17.6",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "express": "^4.17.1",
@@ -38,8 +42,6 @@
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.8",
     "@types/compression": "^1.7.0",
-    "@types/cors": "^2.8.6",
-    "@types/express": "^4.17.6",
     "@types/http-errors": "^1.6.3",
     "@types/morgan": "^1.9.0",
     "@types/stoppable": "^1.1.0",
@@ -50,8 +52,7 @@
     "http-errors": "^1.7.3",
     "jest": "^26.0.1",
     "jest-fetch-mock": "^3.0.3",
-    "supertest": "^4.0.2",
-    "typescript": "^3.9.2"
+    "supertest": "^4.0.2"
   },
   "files": [
     "dist"

packages/backend-common/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "include": ["src"],
-  "compilerOptions": {
-    "outDir": "dist",
-    "incremental": true,
-    "sourceMap": true,
-    "declaration": true,
-    "strict": true,
-    "target": "ES2019",
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "types": ["node", "jest", "webpack-env"]
-  }
-}

packages/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-backend",
   "version": "0.1.1-alpha.8",
-  "main": "dist",
+  "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,
   "license": "Apache-2.0",
@@ -9,7 +9,7 @@
     "node": ">=12"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "backstage-cli backend:build",
     "start": "backstage-cli backend:dev",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test",
@@ -24,7 +24,6 @@
     "@backstage/plugin-identity-backend": "^0.1.1-alpha.8",
     "@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.8",
     "@backstage/plugin-sentry-backend": "^0.1.1-alpha.8",
-    "esm": "^3.2.25",
     "express": "^4.17.1",
     "knex": "^0.21.1",
     "sqlite3": "^4.2.0",
@@ -34,15 +33,6 @@
     "@backstage/cli": "^0.1.1-alpha.8",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
-    "@types/helmet": "^0.0.47",
-    "jest": "^26.0.1",
-    "tsc-watch": "^4.2.3",
-    "typescript": "^3.9.2"
-  },
-  "nodemonConfig": {
-    "watch": [
-      "./dist",
-      "node_modules/@backstage*"
-    ]
+    "@types/helmet": "^0.0.47"
   }
 }

packages/backend/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "include": ["src"],
-  "compilerOptions": {
-    "outDir": "dist",
-    "incremental": true,
-    "sourceMap": true,
-    "declaration": true,
-    "strict": true,
-    "target": "es2019",
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "lib": ["es2019", "dom"],
-    "types": ["node", "jest", "webpack-env"]
-  }
-}

packages/cli/src/commands/backend/build.ts

@@ -0,0 +1,23 @@
+/*
+ * 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 { buildPackage, Output } from '../../lib/packager';
+
+export default async () => {
+  await buildPackage({
+    outputs: new Set([Output.cjs, Output.types]),
+  });
+};

packages/cli/src/index.ts

@@ -41,6 +41,11 @@ const main = (argv: string[]) => {
     .option('--check', 'Enable type checking and linting')
     .action(lazyAction(() => import('./commands/app/serve'), 'default'));
 
+  program
+    .command('backend:build')
+    .description('Build a backend plugin')
+    .action(lazyAction(() => import('./commands/backend/build'), 'default'));
+
   program
     .command('backend:dev')
     .description('Start local development server with HMR for the backend')