Merge pull request #33084 from backstage/rugvip/fix-prepack-postpack-cjs-compat

cli: fix prepack and postpack commands CJS compat

packages/cli/src/modules/build/commands/package/postpack.ts

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020 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 { cli } from 'cleye';
+import { targetPaths } from '@backstage/cli-common';
+import { revertProductionPack } from '../../lib/packager/productionPack';
+import type { CommandContext } from '../../../../wiring/types';
+
+export default async ({ args, info }: CommandContext) => {
+  cli({ help: info }, undefined, args);
+  await revertProductionPack(targetPaths.dir);
+};

packages/cli/src/modules/build/commands/package/prepack.ts

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-import {
-  productionPack,
-  revertProductionPack,
-} from '../../lib/packager/productionPack';
-import { targetPaths } from '@backstage/cli-common';
-
+import { cli } from 'cleye';
 import fs from 'fs-extra';
+import { targetPaths } from '@backstage/cli-common';
+import { productionPack } from '../../lib/packager/productionPack';
 import { publishPreflightCheck } from '../../lib/publishing';
 import { createTypeDistProject } from '../../lib/typeDistProject';
+import type { CommandContext } from '../../../../wiring/types';
+
+export default async ({ args, info }: CommandContext) => {
+  cli({ help: info }, undefined, args);
 
-export const pre = async () => {
   publishPreflightCheck({
     dir: targetPaths.dir,
     packageJson: await fs.readJson(targetPaths.resolve('package.json')),
@@ -35,7 +35,3 @@ export const pre = async () => {
     featureDetectionProject: await createTypeDistProject(),
   });
 };
-
-export const post = async () => {
-  await revertProductionPack(targetPaths.dir);
-};

packages/cli/src/modules/build/index.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { cli } from 'cleye';
 import { Command, Option } from 'commander';
 import { createCliPlugin } from '../../wiring/factory';
 import { lazy } from '../../wiring/lazy';
@@ -215,20 +214,16 @@ export const buildPlugin = createCliPlugin({
     reg.addCommand({
       path: ['package', 'prepack'],
       description: 'Prepares a package for packaging before publishing',
-      execute: async ({ args, info }) => {
-        cli({ help: info }, undefined, args);
-        const { pre } = await import('./commands/package/pack');
-        await pre();
+      execute: {
+        loader: () => import('./commands/package/prepack'),
       },
     });
 
     reg.addCommand({
       path: ['package', 'postpack'],
       description: 'Restores the changes made by the prepack command',
-      execute: async ({ args, info }) => {
-        cli({ help: info }, undefined, args);
-        const { post } = await import('./commands/package/pack');
-        await post();
+      execute: {
+        loader: () => import('./commands/package/postpack'),
       },
     });