chore: last bits

Signed-off-by: benjdlambert <ben@blam.sh>
2025-09-23 16:38:54 +02:00
parent 6e2bda78bd
commit c8aa21077c
22 changed files with 102 additions and 56 deletions
@@ -0,0 +1,18 @@
+---
+'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch
+'@backstage/plugin-scaffolder-backend-module-bitbucket-server': patch
+'@backstage/plugin-scaffolder-backend-module-bitbucket-cloud': patch
+'@backstage/plugin-scaffolder-backend-module-notifications': patch
+'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch
+'@backstage/plugin-scaffolder-backend-module-bitbucket': patch
+'@backstage/plugin-scaffolder-backend-module-gerrit': patch
+'@backstage/plugin-scaffolder-backend-module-github': patch
+'@backstage/plugin-scaffolder-backend-module-gitlab': patch
+'@backstage/plugin-scaffolder-backend-module-sentry': patch
+'@backstage/plugin-scaffolder-backend-module-yeoman': patch
+'@backstage/plugin-scaffolder-backend-module-azure': patch
+'@backstage/plugin-scaffolder-backend-module-gitea': patch
+'@backstage/plugin-scaffolder-backend-module-rails': patch
+---
+
+Updating import for the `scaffolderActionsExtensionPoint` to be the main export
@@ -0,0 +1,13 @@
+---
+'@backstage/plugin-scaffolder-node': patch
+---
+
+**BREAKING ALPHA**: We've moved the `scaffolderActionsExtensionPoint` from `/alpha` to the main export.
+
+```tsx
+// before
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+
+// after
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
+```
@@ -18,7 +18,7 @@ import {
  coreServices,
 } from '@backstage/backend-plugin-api';
 import { ScmIntegrations } from '@backstage/integration';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import { createPublishAzureAction } from './actions';

 /**
@@ -17,10 +17,7 @@ import {
  coreServices,
  createBackendModule,
 } from '@backstage/backend-plugin-api';
-import {
-  scaffolderActionsExtensionPoint,
-  scaffolderAutocompleteExtensionPoint,
-} from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderAutocompleteExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
 import { createBitbucketCloudBranchRestrictionAction } from './actions/bitbucketCloudBranchRestriction';
 import {
  createBitbucketPipelinesRunAction,
@@ -29,6 +26,7 @@ import {
 } from './actions';
 import { ScmIntegrations } from '@backstage/integration';
 import { handleAutocompleteRequest } from './autocomplete/autocomplete';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';

 /**
 * @public
@@ -17,7 +17,7 @@ import {
  coreServices,
  createBackendModule,
 } from '@backstage/backend-plugin-api';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import {
  createPublishBitbucketServerAction,
  createPublishBitbucketServerPullRequestAction,
@@ -17,7 +17,7 @@ import {
  coreServices,
  createBackendModule,
 } from '@backstage/backend-plugin-api';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import {
  createBitbucketPipelinesRunAction,
  createPublishBitbucketCloudAction,
@@ -17,7 +17,7 @@ import {
  createBackendModule,
  coreServices,
 } from '@backstage/backend-plugin-api';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import { createConfluenceToMarkdownAction } from './actions';
 import { ScmIntegrations } from '@backstage/integration';

@@ -17,7 +17,7 @@ import {
  coreServices,
  createBackendModule,
 } from '@backstage/backend-plugin-api';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import { createFetchCookiecutterAction } from './actions';
 import { ScmIntegrations } from '@backstage/integration';

@@ -17,7 +17,7 @@ import {
  coreServices,
  createBackendModule,
 } from '@backstage/backend-plugin-api';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import {
  createPublishGerritAction,
  createPublishGerritReviewAction,
@@ -17,7 +17,7 @@ import {
  createBackendModule,
  coreServices,
 } from '@backstage/backend-plugin-api';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import { createPublishGiteaAction } from './actions';
 import { ScmIntegrations } from '@backstage/integration';

@@ -17,10 +17,7 @@ import {
  coreServices,
  createBackendModule,
 } from '@backstage/backend-plugin-api';
-import {
-  scaffolderActionsExtensionPoint,
-  scaffolderAutocompleteExtensionPoint,
-} from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderAutocompleteExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
 import {
  createGithubActionsDispatchAction,
  createGithubAutolinksAction,
@@ -42,6 +39,7 @@ import {
 } from '@backstage/integration';
 import { createHandleAutocompleteRequest } from './autocomplete/autocomplete';
 import { catalogServiceRef } from '@backstage/plugin-catalog-node';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';

 /**
 * @public
@@ -18,10 +18,7 @@ import {
  createBackendModule,
 } from '@backstage/backend-plugin-api';
 import { ScmIntegrations } from '@backstage/integration';
-import {
-  scaffolderActionsExtensionPoint,
-  scaffolderAutocompleteExtensionPoint,
-} from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderAutocompleteExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
 import {
  createGitlabGroupEnsureExistsAction,
  createGitlabIssueAction,
@@ -36,6 +33,7 @@ import {
 } from './actions';
 import { createGitlabProjectMigrateAction } from './actions/gitlabProjectMigrate';
 import { createHandleAutocompleteRequest } from './autocomplete/autocomplete';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';

 /**
 * @public
@@ -15,7 +15,7 @@
 */
 import { createBackendModule } from '@backstage/backend-plugin-api';
 import { notificationService } from '@backstage/plugin-notifications-node';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import { createSendNotificationAction } from './actions';

 /**
@@ -17,7 +17,7 @@ import {
  coreServices,
  createBackendModule,
 } from '@backstage/backend-plugin-api';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import { createFetchRailsAction } from './actions';
 import { ScmIntegrations } from '@backstage/integration';

@@ -17,7 +17,7 @@ import {
  coreServices,
  createBackendModule,
 } from '@backstage/backend-plugin-api';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import { createSentryCreateProjectAction } from './actions/createProject';

 /**
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 import { createBackendModule } from '@backstage/backend-plugin-api';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
 import { createRunYeomanAction } from './actions';

 /**
@@ -21,7 +21,11 @@ import {
 import { ScmIntegrations } from '@backstage/integration';
 import { catalogServiceRef } from '@backstage/plugin-catalog-node';
 import { eventsServiceRef } from '@backstage/plugin-events-node';
-import { TaskBroker, TemplateAction } from '@backstage/plugin-scaffolder-node';
+import {
+  scaffolderActionsExtensionPoint,
+  TaskBroker,
+  TemplateAction,
+} from '@backstage/plugin-scaffolder-node';
 import {
  AutocompleteHandler,
  CreatedTemplateFilter,
@@ -29,7 +33,6 @@ import {
  createTemplateFilter,
  createTemplateGlobalFunction,
  createTemplateGlobalValue,
-  scaffolderActionsExtensionPoint,
  scaffolderAutocompleteExtensionPoint,
  scaffolderTaskBrokerExtensionPoint,
  scaffolderTemplatingExtensionPoint,
@@ -6,7 +6,6 @@
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { JsonValue } from '@backstage/types';
 import { TaskBroker } from '@backstage/plugin-scaffolder-node';
-import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { TemplateFilter as TemplateFilter_2 } from '@backstage/plugin-scaffolder-node';
 import { TemplateGlobal as TemplateGlobal_2 } from '@backstage/plugin-scaffolder-node';
 import { z } from 'zod';
@@ -123,15 +122,6 @@ export const restoreWorkspace: (opts: {
  buffer?: Buffer;
 }) => Promise<void>;

-// @alpha
-export interface ScaffolderActionsExtensionPoint {
-  // (undocumented)
-  addActions(...actions: TemplateAction<any, any, any>[]): void;
-}
-
-// @alpha
-export const scaffolderActionsExtensionPoint: ExtensionPoint<ScaffolderActionsExtensionPoint>;
-
 // @alpha
 export interface ScaffolderAutocompleteExtensionPoint {
  // (undocumented)
@@ -153,7 +143,7 @@ export interface ScaffolderTaskBrokerExtensionPoint {
  setTaskBroker(taskBroker: TaskBroker): void;
 }

-// @alpha
+// @alpha @deprecated
 export const scaffolderTaskBrokerExtensionPoint: ExtensionPoint<ScaffolderTaskBrokerExtensionPoint>;

 // @alpha
@@ -6,6 +6,7 @@
 import { BackstageCredentials } from '@backstage/backend-plugin-api';
 import { CheckpointContext } from '@backstage/plugin-scaffolder-node/alpha';
 import { Expand } from '@backstage/types';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { JsonObject } from '@backstage/types';
 import { JsonValue } from '@backstage/types';
 import { LoggerService } from '@backstage/backend-plugin-api';
@@ -306,6 +307,15 @@ export const parseRepoUrl: (
  project?: string;
 };

+// @public
+export interface ScaffolderActionsExtensionPoint {
+  // (undocumented)
+  addActions(...actions: TemplateAction<any, any, any>[]): void;
+}
+
+// @public
+export const scaffolderActionsExtensionPoint: ExtensionPoint<ScaffolderActionsExtensionPoint>;
+
 // @public (undocumented)
 export interface SerializedFile {
  // (undocumented)
@@ -17,7 +17,6 @@
 import { createExtensionPoint } from '@backstage/backend-plugin-api';
 import {
  TaskBroker,
-  TemplateAction,
  TemplateFilter,
  TemplateGlobal,
 } from '@backstage/plugin-scaffolder-node';
@@ -30,25 +29,6 @@ export * from './globals';
 export * from './types';
 export * from './checkpoints';

-/**
- * Extension point for managing scaffolder actions.
- *
- * @alpha
- */
-export interface ScaffolderActionsExtensionPoint {
-  addActions(...actions: TemplateAction<any, any, any>[]): void;
-}
-
-/**
- * Extension point for managing scaffolder actions.
- *
- * @alpha
- */
-export const scaffolderActionsExtensionPoint =
-  createExtensionPoint<ScaffolderActionsExtensionPoint>({
-    id: 'scaffolder.actions',
-  });
-
 /**
 * Extension point for replacing the scaffolder task broker.
 *
@@ -63,6 +43,7 @@ export interface ScaffolderTaskBrokerExtensionPoint {
 * Extension point for replacing the scaffolder task broker.
 *
 * @alpha
+ * @deprecated this extension point is planned to be removed, please reach out to us in an issue if you're using this extension point and your use cases.
 */
 export const scaffolderTaskBrokerExtensionPoint =
  createExtensionPoint<ScaffolderTaskBrokerExtensionPoint>({
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * 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 { createExtensionPoint } from '@backstage/backend-plugin-api';
+import { TemplateAction } from './actions';
+
+/**
+ * Extension point for managing scaffolder actions.
+ *
+ * @public
+ */
+export interface ScaffolderActionsExtensionPoint {
+  addActions(...actions: TemplateAction<any, any, any>[]): void;
+}
+
+/**
+ * Extension point for managing scaffolder actions.
+ *
+ * @public
+ */
+export const scaffolderActionsExtensionPoint =
+  createExtensionPoint<ScaffolderActionsExtensionPoint>({
+    id: 'scaffolder.actions',
+  });
@@ -24,3 +24,4 @@ export * from './actions';
 export * from './tasks';
 export * from './files';
 export * from './types';
+export * from './extensions';