@backstage/cli 0.25.3-next.2 → 0.26.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.25.3-next.2",
+  "version": "0.26.1",
   "publishConfig": {
     "access": "public"
   },
@@ -30,14 +30,14 @@
     "backstage-cli": "bin/backstage-cli"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^1.4.5-next.0",
+    "@backstage/catalog-model": "^1.4.5",
     "@backstage/cli-common": "^0.1.13",
-    "@backstage/cli-node": "^0.2.4-next.0",
-    "@backstage/config": "^1.2.0-next.1",
-    "@backstage/config-loader": "^1.7.0-next.1",
-    "@backstage/errors": "^1.2.4-next.0",
-    "@backstage/eslint-plugin": "^0.1.6-next.0",
-    "@backstage/integration": "^1.9.1-next.2",
+    "@backstage/cli-node": "^0.2.4",
+    "@backstage/config": "^1.2.0",
+    "@backstage/config-loader": "^1.7.0",
+    "@backstage/errors": "^1.2.4",
+    "@backstage/eslint-plugin": "^0.1.6",
+    "@backstage/integration": "^1.9.1",
     "@backstage/release-manifests": "^0.0.11",
     "@backstage/types": "^1.1.1",
     "@manypkg/get-packages": "^1.1.3",
@@ -50,9 +50,9 @@
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.0",
     "@rollup/plugin-yaml": "^4.0.0",
-    "@spotify/eslint-config-base": "^14.0.0",
-    "@spotify/eslint-config-react": "^14.0.0",
-    "@spotify/eslint-config-typescript": "^14.0.0",
+    "@spotify/eslint-config-base": "^15.0.0",
+    "@spotify/eslint-config-react": "^15.0.0",
+    "@spotify/eslint-config-typescript": "^15.0.0",
     "@sucrase/webpack-loader": "^2.0.0",
     "@svgr/core": "6.5.x",
     "@svgr/plugin-jsx": "6.5.x",
@@ -112,15 +112,17 @@
     "node-libs-browser": "^2.2.1",
     "npm-packlist": "^5.0.0",
     "ora": "^5.3.0",
+    "p-limit": "^3.1.0",
     "p-queue": "^6.6.2",
+    "pirates": "^4.0.6",
     "postcss": "^8.1.0",
     "process": "^0.11.10",
     "react-dev-utils": "^12.0.0-next.60",
     "react-refresh": "^0.14.0",
     "recursive-readdir": "^2.2.2",
-    "rollup": "^2.60.2",
-    "rollup-plugin-dts": "^4.0.1",
-    "rollup-plugin-esbuild": "^4.7.2",
+    "rollup": "^4.0.0",
+    "rollup-plugin-dts": "^6.1.0",
+    "rollup-plugin-esbuild": "^6.1.1",
     "rollup-plugin-postcss": "^4.0.0",
     "rollup-pluginutils": "^2.8.2",
     "run-script-webpack-plugin": "^0.2.0",
@@ -130,7 +132,6 @@
     "swc-loader": "^0.2.3",
     "tar": "^6.1.12",
     "terser-webpack-plugin": "^5.1.3",
-    "tsx": "^4.0.0",
     "util": "^0.12.3",
     "webpack": "^5.70.0",
     "webpack-dev-server": "^4.7.3",
@@ -141,16 +142,16 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.21.4-next.2",
-    "@backstage/backend-plugin-api": "^0.6.14-next.2",
-    "@backstage/backend-test-utils": "^0.3.4-next.2",
-    "@backstage/config": "^1.2.0-next.1",
-    "@backstage/core-app-api": "^1.12.1-next.1",
-    "@backstage/core-components": "^0.14.1-next.2",
-    "@backstage/core-plugin-api": "^1.9.1-next.1",
-    "@backstage/dev-utils": "^1.0.28-next.2",
-    "@backstage/test-utils": "^1.5.1-next.1",
-    "@backstage/theme": "^0.5.2-next.0",
+    "@backstage/backend-common": "^0.21.5",
+    "@backstage/backend-plugin-api": "^0.6.15",
+    "@backstage/backend-test-utils": "^0.3.5",
+    "@backstage/config": "^1.2.0",
+    "@backstage/core-app-api": "^1.12.2",
+    "@backstage/core-components": "^0.14.2",
+    "@backstage/core-plugin-api": "^1.9.1",
+    "@backstage/dev-utils": "^1.0.29",
+    "@backstage/test-utils": "^1.5.2",
+    "@backstage/theme": "^0.5.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/diff": "^5.0.0",
     "@types/ejs": "^3.1.3",
@@ -167,10 +168,13 @@
     "@types/tar": "^6.1.1",
     "@types/terser-webpack-plugin": "^5.0.4",
     "@types/yarnpkg__lockfile": "^1.1.4",
+    "@vitejs/plugin-react": "^4.0.4",
     "del": "^7.0.0",
     "msw": "^1.0.0",
     "nodemon": "^3.0.1",
-    "ts-node": "^10.0.0"
+    "vite": "^4.4.9",
+    "vite-plugin-html": "^3.2.0",
+    "vite-plugin-node-polyfills": "^0.21.0"
   },
   "peerDependencies": {
     "@vitejs/plugin-react": "^4.0.4",

package/templates/default-backend-plugin/dev/index.ts

@@ -0,0 +1,9 @@
+import { createBackend } from '@backstage/backend-defaults';
+
+const backend = createBackend();
+
+backend.add(import('@backstage/plugin-auth-backend'));
+backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
+backend.add(import('../src'));
+
+backend.start();

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

@@ -29,6 +29,8 @@
   },
   "dependencies": {
     "@backstage/backend-common": "{{versionQuery '@backstage/backend-common'}}",
+    "@backstage/backend-defaults": "{{versionQuery '@backstage/backend-defaults'}}",
+    "@backstage/backend-plugin-api": "{{versionQuery '@backstage/backend-plugin-api'}}",
     "@backstage/config": "{{versionQuery '@backstage/config'}}",
     "@types/express": "{{versionQuery '@types/express' '4.17.6'}}",
     "express": "{{versionQuery 'express' '4.17.1'}}",
@@ -39,6 +41,8 @@
   },
   "devDependencies": {
     "@backstage/cli": "{{versionQuery '@backstage/cli'}}",
+    "@backstage/plugin-auth-backend": "{{versionQuery '@backstage/plugin-auth-backend'}}",
+    "@backstage/plugin-auth-backend-module-guest-provider": "{{versionQuery '@backstage/plugin-auth-backend-module-guest-provider'}}",
     "@types/supertest": "{{versionQuery '@types/supertest' '2.0.12'}}",
     "supertest": "{{versionQuery 'supertest' '6.2.4'}}",
     "msw": "{{versionQuery 'msw' '1.0.0'}}"

package/templates/default-backend-plugin/src/index.ts.hbs

@@ -0,0 +1,2 @@
+export * from './service/router';
+export { {{pluginVar}} as default } from './plugin';

package/templates/default-backend-plugin/src/plugin.ts.hbs

@@ -0,0 +1,32 @@
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { createRouter } from './service/router';
+
+/**
+ * {{pluginVar}} backend plugin
+ *
+ * @public
+ */
+export const {{pluginVar}} = createBackendPlugin({
+  pluginId: '{{pluginVar}}',
+  register(env) {
+    env.registerInit({
+      deps: {
+        httpRouter: coreServices.httpRouter,
+        logger: coreServices.logger,
+      },
+      async init({
+        httpRouter,
+        logger,
+      }) {
+        httpRouter.use(
+          await createRouter({
+            logger,
+          }),
+        );
+      },
+    });
+  },
+});

package/templates/default-backend-plugin/src/service/router.ts

@@ -1,10 +1,10 @@
 import { errorHandler } from '@backstage/backend-common';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import express from 'express';
 import Router from 'express-promise-router';
-import { Logger } from 'winston';
 
 export interface RouterOptions {
-  logger: Logger;
+  logger: LoggerService;
 }
 
 export async function createRouter(
@@ -19,6 +19,7 @@ export async function createRouter(
     logger.info('PONG!');
     response.json({ status: 'ok' });
   });
+
   router.use(errorHandler());
   return router;
 }

package/dist/cjs/clean-5afc7d48.cjs.js

@@ -1,22 +0,0 @@
-'use strict';
-
-var fs = require('fs-extra');
-var index = require('./index-e1de5c59.cjs.js');
-require('commander');
-require('chalk');
-require('semver');
-require('@backstage/cli-common');
-require('@backstage/errors');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-
-async function clean() {
-  await fs__default["default"].remove(index.paths.resolveTarget("dist"));
-  await fs__default["default"].remove(index.paths.resolveTarget("dist-types"));
-  await fs__default["default"].remove(index.paths.resolveTarget("coverage"));
-}
-
-exports["default"] = clean;
-//# sourceMappingURL=clean-5afc7d48.cjs.js.map

package/templates/default-backend-plugin/src/index.ts

@@ -1 +0,0 @@
-export * from './service/router';

package/templates/default-backend-plugin/src/run.ts.hbs

@@ -1,17 +0,0 @@
-import { getRootLogger } from '@backstage/backend-common';
-import yn from 'yn';
-import { startStandaloneServer } from './service/standaloneServer';
-
-const port = process.env.PLUGIN_PORT ? Number(process.env.PLUGIN_PORT) : 7007;
-const enableCors = yn(process.env.PLUGIN_CORS, { default: false });
-const logger = getRootLogger();
-
-startStandaloneServer({ port, enableCors, logger }).catch(err => {
-  logger.error(err);
-  process.exit(1);
-});
-
-process.on('SIGINT', () => {
-  logger.info('CTRL+C pressed; exiting.');
-  process.exit(0);
-});

package/templates/default-backend-plugin/src/service/standaloneServer.ts.hbs

@@ -1,34 +0,0 @@
-import { createServiceBuilder } from '@backstage/backend-common';
-import { Server } from 'http';
-import { Logger } from 'winston';
-import { createRouter } from './router';
-
-export interface ServerOptions {
-  port: number;
-  enableCors: boolean;
-  logger: Logger;
-}
-
-export async function startStandaloneServer(
-  options: ServerOptions,
-): Promise<Server> {
-  const logger = options.logger.child({ service: '{{id}}-backend' });
-  logger.debug('Starting application server...');
-  const router = await createRouter({
-    logger,
-  });
-
-  let service = createServiceBuilder(module)
-    .setPort(options.port)
-    .addRouter('/{{id}}', router);
-  if (options.enableCors) {
-    service = service.enableCors({ origin: 'http://localhost:3000' });
-  }
-
-  return await service.start().catch(err => {
-    logger.error(err);
-    process.exit(1);
-  });
-}
-
-module.hot?.accept();