backend-common: add resolvePackagePath

plugins/app-backend/src/service/router.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { resolve as resolvePath, dirname } from 'path';
-import { notFoundHandler } from '@backstage/backend-common';
+import { resolve as resolvePath } from 'path';
+import { notFoundHandler, resolvePackagePath } from '@backstage/backend-common';
 import express from 'express';
 import Router from 'express-promise-router';
 import { Logger } from 'winston';
@@ -23,19 +23,14 @@ import { injectEnvConfig } from '../lib/config';
 
 export interface RouterOptions {
   logger: Logger;
-  appPackageName?: string;
+  appPackageName: string;
   staticFallbackHandler?: express.Handler;
 }
 
 export async function createRouter(
   options: RouterOptions,
 ): Promise<express.Router> {
-  const appDistDir = resolvePath(
-    dirname(
-      __non_webpack_require__.resolve(`${options.appPackageName}/package.json`),
-    ),
-    'dist',
-  );
+  const appDistDir = resolvePackagePath(options.appPackageName, 'dist');
   options.logger.info(`Serving static app content from ${appDistDir}`);
 
   await injectEnvConfig({

plugins/auth-backend/src/identity/DatabaseKeyStore.ts

@@ -15,13 +15,13 @@
  */
 
 import Knex from 'knex';
-import path from 'path';
 import { utc } from 'moment';
+import { resolvePackagePath } from '@backstage/backend-common';
 import { AnyJWK, KeyStore, StoredKey } from './types';
 
-const migrationsDir = path.resolve(
-  require.resolve('@backstage/plugin-auth-backend/package.json'),
-  '../migrations',
+const migrationsDir = resolvePackagePath(
+  '@backstage/plugin-auth-backend',
+  'migrations',
 );
 
 const TABLE = 'signing_keys';

plugins/catalog-backend/src/database/DatabaseManager.ts

@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-import { getVoidLogger } from '@backstage/backend-common';
+import { getVoidLogger, resolvePackagePath } from '@backstage/backend-common';
 import { makeValidator } from '@backstage/catalog-model';
 import Knex from 'knex';
-import path from 'path';
 import { Logger } from 'winston';
 import { CommonDatabase } from './CommonDatabase';
 import { Database } from './types';
 
-const migrationsDir = path.resolve(
-  require.resolve('@backstage/plugin-catalog-backend/package.json'),
-  '../migrations',
+const migrationsDir = resolvePackagePath(
+  '@backstage/plugin-catalog-backend',
+  'migrations',
 );
 
 export type CreateDatabaseOptions = {

plugins/graphql/src/service/router.ts

@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-import { errorHandler } from '@backstage/backend-common';
+import { errorHandler, resolvePackagePath } from '@backstage/backend-common';
 import express from 'express';
 import Router from 'express-promise-router';
 import { Logger } from 'winston';
 import fs from 'fs';
-import path from 'path';
 import { ApolloServer } from 'apollo-server-express';
 
-const schemaPath = path.resolve(
-  require.resolve('@backstage/plugin-graphql-backend/package.json'),
-  '../schema.gql',
+const schemaPath = resolvePackagePath(
+  '@backstage/plugin-graphql-backend',
+  'schema.gql',
 );
 
 export interface RouterOptions {