chore: update imports

Signed-off-by: blam <ben@blam.sh>

packages/cli/src/lib/version.ts

@@ -44,8 +44,8 @@ import { version as coreComponents } from '../../../../packages/core-components/
 import { version as corePluginApi } from '../../../../packages/core-plugin-api/package.json';
 import { version as devUtils } from '../../../../packages/dev-utils/package.json';
 import { version as testUtils } from '../../../../packages/test-utils/package.json';
+import { version as scaffolderNode } from '../../../../plugins/scaffolder-node/package.json';
 import { version as theme } from '../../../../packages/theme/package.json';
-import { version as scaffolderBackend } from '../../../../plugins/scaffolder-backend/package.json';
 
 export const packageVersions: Record<string, string> = {
   '@backstage/backend-common': backendCommon,
@@ -59,7 +59,7 @@ export const packageVersions: Record<string, string> = {
   '@backstage/dev-utils': devUtils,
   '@backstage/test-utils': testUtils,
   '@backstage/theme': theme,
-  '@backstage/plugin-scaffolder-backend': scaffolderBackend,
+  '@backstage/plugin-scaffolder-node': scaffolderNode,
 };
 
 export function findVersion() {

plugins/scaffolder-backend/package.json

@@ -61,6 +61,11 @@
     "@backstage/plugin-catalog-node": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
     "@backstage/plugin-permission-node": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-azure": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-gerrit": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-github": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-gitlab": "workspace:^",
     "@backstage/plugin-scaffolder-common": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "@backstage/types": "workspace:^",

plugins/scaffolder-backend/src/lib/templating/filters.ts

@@ -17,7 +17,7 @@ import { parseEntityRef } from '@backstage/catalog-model';
 import { ScmIntegrations } from '@backstage/integration';
 import type { JsonObject, JsonValue } from '@backstage/types';
 import { TemplateFilter } from '..';
-import { parseRepoUrl } from '../../scaffolder/actions/builtin/publish/util';
+import { parseRepoUrl } from '@backstage/plugin-scaffolder-node';
 import get from 'lodash/get';
 
 export const createDefaultFilters = ({

plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts

@@ -48,20 +48,28 @@ import {
   createGithubRepoCreateAction,
   createGithubRepoPushAction,
   createGithubWebhookAction,
-} from './github';
+  createPublishGithubAction,
+  createPublishGithubPullRequestAction,
+} from '@backstage/plugin-scaffolder-backend-module-github';
+
+import { createPublishAzureAction } from '@backstage/plugin-scaffolder-backend-module-azure';
+
 import {
-  createPublishAzureAction,
   createPublishBitbucketAction,
   createPublishBitbucketCloudAction,
   createPublishBitbucketServerAction,
   createPublishBitbucketServerPullRequestAction,
+} from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+
+import {
   createPublishGerritAction,
   createPublishGerritReviewAction,
-  createPublishGithubAction,
-  createPublishGithubPullRequestAction,
+} from '@backstage/plugin-scaffolder-backend-module-gerrit';
+
+import {
   createPublishGitlabAction,
   createPublishGitlabMergeRequestAction,
-} from './publish';
+} from '@backstage/plugin-scaffolder-backend-module-gitlab';
 
 /**
  * The options passed to {@link createBuiltinActions}
@@ -96,8 +104,11 @@ export interface CreateBuiltInActionsOptions {
  * A function to generate create a list of default actions that the scaffolder provides.
  * Is called internally in the default setup, but can be used when adding your own actions or overriding the default ones
  *
+ * TODO(blam): version 2 of the scaffolder shouldn't ship with the additional modules. We should ship the basics, and let people install
+ * modules for the providers they want to use.
  * @public
  * @returns A list of actions that can be used in the scaffolder
+ *
  */
 export const createBuiltinActions = (
   options: CreateBuiltInActionsOptions,

plugins/scaffolder-backend/src/scaffolder/actions/builtin/index.ts

@@ -19,5 +19,3 @@ export * from './createBuiltinActions';
 export * from './debug';
 export * from './fetch';
 export * from './filesystem';
-export * from './publish';
-export * from './github';

plugins/scaffolder-backend/src/scaffolder/dryrun/createDryRunner.ts

@@ -21,20 +21,19 @@ import { v4 as uuid } from 'uuid';
 import { pathToFileURL } from 'url';
 import { Logger } from 'winston';
 import {
+  createTemplateAction,
+  TaskSecrets,
+  TemplateFilter,
+  TemplateGlobal,
   deserializeDirectoryContents,
   SerializedFile,
   serializeDirectoryContents,
-} from '../../lib/files';
-import { TemplateFilter, TemplateGlobal } from '../../lib';
+} from '@backstage/plugin-scaffolder-node';
 import { TemplateActionRegistry } from '../actions';
 import { NunjucksWorkflowRunner } from '../tasks/NunjucksWorkflowRunner';
 import { DecoratedActionsRegistry } from './DecoratedActionsRegistry';
 import fs from 'fs-extra';
 import { resolveSafeChildPath } from '@backstage/backend-common';
-import {
-  createTemplateAction,
-  TaskSecrets,
-} from '@backstage/plugin-scaffolder-node';
 import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 
 interface DryRunInput {

yarn.lock

@@ -8611,6 +8611,38 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-scaffolder-backend-module-azure@workspace:^, @backstage/plugin-scaffolder-backend-module-azure@workspace:plugins/scaffolder-backend-module-azure":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-backend-module-azure@workspace:plugins/scaffolder-backend-module-azure"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    azure-devops-node-api: ^11.0.1
+    yaml: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
+"@backstage/plugin-scaffolder-backend-module-bitbucket@workspace:^, @backstage/plugin-scaffolder-backend-module-bitbucket@workspace:plugins/scaffolder-backend-module-bitbucket":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-backend-module-bitbucket@workspace:plugins/scaffolder-backend-module-bitbucket"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    msw: ^1.0.0
+    node-fetch: ^2.6.7
+    yaml: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
 "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown@workspace:^, @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@workspace:plugins/scaffolder-backend-module-confluence-to-markdown":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown@workspace:plugins/scaffolder-backend-module-confluence-to-markdown"
@@ -8655,18 +8687,61 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-scaffolder-backend-module-gitlab@workspace:plugins/scaffolder-backend-module-gitlab":
+"@backstage/plugin-scaffolder-backend-module-gerrit@workspace:^, @backstage/plugin-scaffolder-backend-module-gerrit@workspace:plugins/scaffolder-backend-module-gerrit":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-backend-module-gerrit@workspace:plugins/scaffolder-backend-module-gerrit"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    msw: ^1.0.0
+    node-fetch: ^2.6.7
+    yaml: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
+"@backstage/plugin-scaffolder-backend-module-github@workspace:^, @backstage/plugin-scaffolder-backend-module-github@workspace:plugins/scaffolder-backend-module-github":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-backend-module-github@workspace:plugins/scaffolder-backend-module-github"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    "@octokit/webhooks": ^10.0.0
+    "@types/libsodium-wrappers": ^0.7.10
+    fs-extra: 10.1.0
+    jest-when: ^3.1.0
+    jsonschema: ^1.2.6
+    libsodium-wrappers: ^0.7.11
+    octokit: ^2.0.0
+    octokit-plugin-create-pull-request: ^3.10.0
+    winston: ^3.2.1
+    yaml: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
+"@backstage/plugin-scaffolder-backend-module-gitlab@workspace:^, @backstage/plugin-scaffolder-backend-module-gitlab@workspace:plugins/scaffolder-backend-module-gitlab":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-scaffolder-backend-module-gitlab@workspace:plugins/scaffolder-backend-module-gitlab"
   dependencies:
     "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
     "@backstage/core-app-api": "workspace:^"
     "@backstage/errors": "workspace:^"
     "@backstage/integration": "workspace:^"
     "@backstage/plugin-scaffolder-node": "workspace:^"
-    "@gitbeaker/node": ^35.8.0
+    "@gitbeaker/core": ^35.8.0
+    "@gitbeaker/node": ^35.1.0
     yaml: ^2.0.0
     zod: ^3.21.4
   languageName: unknown
@@ -8729,7 +8804,6 @@ __metadata:
     "@backstage/backend-common": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-tasks": "workspace:^"
-    "@backstage/backend-test-utils": "workspace:^"
     "@backstage/catalog-client": "workspace:^"
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
@@ -8743,17 +8817,18 @@ __metadata:
     "@backstage/plugin-catalog-node": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/plugin-permission-node": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-azure": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-bitbucket": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-gerrit": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-github": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-gitlab": "workspace:^"
     "@backstage/plugin-scaffolder-common": "workspace:^"
     "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@gitbeaker/core": ^35.6.0
-    "@gitbeaker/node": ^35.1.0
-    "@octokit/webhooks": ^10.0.0
     "@types/command-exists": ^1.2.0
     "@types/express": ^4.17.6
     "@types/fs-extra": ^9.0.1
     "@types/git-url-parse": ^9.0.0
-    "@types/libsodium-wrappers": ^0.7.10
     "@types/luxon": ^3.0.0
     "@types/nunjucks": ^3.1.4
     "@types/supertest": ^2.0.8
@@ -8774,15 +8849,12 @@ __metadata:
     jest-when: ^3.1.0
     jsonschema: ^1.2.6
     knex: ^3.0.0
-    libsodium-wrappers: ^0.7.11
     lodash: ^4.17.21
     luxon: ^3.0.0
     morgan: ^1.10.0
     msw: ^1.0.0
     node-fetch: ^2.6.7
     nunjucks: ^3.2.3
-    octokit: ^2.0.0
-    octokit-plugin-create-pull-request: ^3.10.0
     p-limit: ^3.1.0
     p-queue: ^6.6.2
     prom-client: ^14.0.1
@@ -8814,6 +8886,7 @@ __metadata:
   dependencies:
     "@backstage/backend-common": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
@@ -8822,7 +8895,9 @@ __metadata:
     "@backstage/plugin-scaffolder-common": "workspace:^"
     "@backstage/types": "workspace:^"
     fs-extra: 10.1.0
+    globby: ^11.0.0
     jsonschema: ^1.2.6
+    p-limit: ^3.1.0
     winston: ^3.2.1
     zod: ^3.21.4
     zod-to-json-schema: ^3.20.4
@@ -11555,7 +11630,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gitbeaker/core@npm:^35.6.0, @gitbeaker/core@npm:^35.8.1":
+"@gitbeaker/core@npm:^35.6.0, @gitbeaker/core@npm:^35.8.0, @gitbeaker/core@npm:^35.8.1":
   version: 35.8.1
   resolution: "@gitbeaker/core@npm:35.8.1"
   dependencies:
@@ -11569,7 +11644,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gitbeaker/node@npm:^35.1.0, @gitbeaker/node@npm:^35.8.0":
+"@gitbeaker/node@npm:^35.1.0":
   version: 35.8.1
   resolution: "@gitbeaker/node@npm:35.8.1"
   dependencies: