Trying pre ESM conversion

RoadieHQ · Jan 8, 2024 · c12cbf4 · c12cbf4
1 parent 276be98
commit c12cbf4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/scaffolder-actions/scaffolder-backend-module-utils/package.json b/plugins/scaffolder-actions/scaffolder-backend-module-utils/package.json
@@ -38,7 +38,7 @@
     "@backstage/plugin-scaffolder-node": "^0.2.8",
     "adm-zip": "^0.5.9",
     "cross-fetch": "^3.1.4",
-    "detect-indent": "^7.0.1",
+    "detect-indent": "^6.1.0",
     "fs-extra": "^10.0.0",
     "js-yaml": "^4.0.0",
     "jsonata": "^1.8.6",

diff --git a/plugins/scaffolder-actions/scaffolder-backend-module-utils/src/actions/merge/merge.ts b/plugins/scaffolder-actions/scaffolder-backend-module-utils/src/actions/merge/merge.ts
@@ -21,6 +21,7 @@ import { extname } from 'path';
 import { isArray, isNull, mergeWith } from 'lodash';
 import yaml from 'js-yaml';
 import { supportedDumpOptions, yamlOptionsSchema } from '../../types';
+import detectIndent from 'detect-indent';
 
 function mergeArrayCustomiser(objValue: string | any[], srcValue: any) {
   if (isArray(objValue) && !isNull(objValue)) {
@@ -106,7 +107,6 @@ export function createMergeJSONAction({ actionId }: { actionId?: string }) {
 
       let fileIndent = 2;
       if (ctx.input.matchFileIndent) {
-        const detectIndent = (await import('detect-indent')).default;
         fileIndent = detectIndent(
           fs.readFileSync(sourceFilepath, 'utf8'),
         ).amount;