From f47782834d13d7e022f2b9f77b16d7bb1236ef55 Mon Sep 17 00:00:00 2001 From: Ivan Shmidt Date: Wed, 17 Jun 2020 09:54:28 +0200 Subject: [PATCH] fix(backend): server standalone backend plugins --- packages/cli/src/lib/bundler/config.ts | 6 +++++- packages/cli/src/lib/bundler/paths.ts | 5 +++++ plugins/auth-backend/package.json | 2 +- plugins/catalog-backend/package.json | 2 +- plugins/identity-backend/package.json | 2 +- plugins/scaffolder-backend/package.json | 1 + plugins/sentry-backend/package.json | 2 +- 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts index e6d47573ef..50d174368a 100644 --- a/packages/cli/src/lib/bundler/config.ts +++ b/packages/cli/src/lib/bundler/config.ts @@ -182,7 +182,11 @@ export function createBackendConfig( }, devtool: isDev ? 'cheap-module-eval-source-map' : 'source-map', context: paths.targetPath, - entry: ['webpack/hot/poll?100', paths.targetEntry], + entry: [ + 'webpack/hot/poll?100', + paths.targetEntry, + ...(paths.targetRunFile ? [paths.targetRunFile] : []), + ], resolve: { extensions: ['.ts', '.tsx', '.mjs', '.js', '.jsx'], mainFields: ['main:src', 'browser', 'module', 'main'], diff --git a/packages/cli/src/lib/bundler/paths.ts b/packages/cli/src/lib/bundler/paths.ts index 1e1cd1298a..70e82d8d48 100644 --- a/packages/cli/src/lib/bundler/paths.ts +++ b/packages/cli/src/lib/bundler/paths.ts @@ -48,10 +48,15 @@ export function resolveBundlingPaths(options: BundlingPathsOptions) { } } + // Backend plugin dev run file + const targetRunFile = paths.resolveTarget('src/run.ts'); + const runFileExists = fs.pathExistsSync(targetRunFile); + return { targetHtml, targetPublic, targetPath: paths.resolveTarget('.'), + targetRunFile: runFileExists ? targetRunFile : undefined, targetDist: paths.resolveTarget('dist'), targetAssets: paths.resolveTarget('assets'), targetSrc: paths.resolveTarget('src'), diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json index 5eff22126d..82a0a525ba 100644 --- a/plugins/auth-backend/package.json +++ b/plugins/auth-backend/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "private": true, "scripts": { - "start": "tsc-watch --onFirstSuccess \"cross-env NODE_ENV=development nodemon dist/run.js\"", + "start": "backstage-cli backend:dev", "build": "tsc", "lint": "backstage-cli lint", "test": "backstage-cli test", diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json index e8b43de86a..ed0ce4c3a4 100644 --- a/plugins/catalog-backend/package.json +++ b/plugins/catalog-backend/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "private": true, "scripts": { - "start": "backstage-cli watch-deps --build -- tsc-watch --onFirstSuccess \\\"cross-env NODE_ENV=development nodemon -r esm dist/run.js\\\"", + "start": "backstage-cli backend:dev", "build": "tsc", "lint": "backstage-cli lint", "test": "backstage-cli test", diff --git a/plugins/identity-backend/package.json b/plugins/identity-backend/package.json index ae7526daa2..74881b1cd1 100644 --- a/plugins/identity-backend/package.json +++ b/plugins/identity-backend/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "private": true, "scripts": { - "start": "tsc-watch --onFirstSuccess \"cross-env NODE_ENV=development nodemon dist/run.js\"", + "start": "backstage-cli backend:dev", "build": "tsc", "lint": "backstage-cli lint", "test": "backstage-cli test", diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json index 2408471229..f6c6509916 100644 --- a/plugins/scaffolder-backend/package.json +++ b/plugins/scaffolder-backend/package.json @@ -7,6 +7,7 @@ "private": true, "scripts": { "build": "tsc", + "start": "backstage-cli backend:dev", "lint": "backstage-cli lint", "test": "backstage-cli test", "prepack": "backstage-cli prepack", diff --git a/plugins/sentry-backend/package.json b/plugins/sentry-backend/package.json index 03846ea5a9..696df5aaa9 100644 --- a/plugins/sentry-backend/package.json +++ b/plugins/sentry-backend/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "private": true, "scripts": { - "start": "tsc-watch --onFirstSuccess \"cross-env NODE_ENV=development nodemon dist/run.js\"", + "start": "backstage-cli backend:dev", "build": "tsc", "lint": "backstage-cli lint", "test": "backstage-cli test",