fix(js): programmatically format .swcrc with json

nrwl · May 14, 2022 · 0da26d4 · 0da26d4
1 parent a140401
commit 0da26d4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 41 deletions.
diff --git a/packages/devkit/src/generators/format-files.ts b/packages/devkit/src/generators/format-files.ts
@@ -47,6 +47,10 @@ export async function formatFiles(tree: Tree): Promise<void> {
         ...resolvedOptions,
       };
 
+      if (file.path.endsWith('.swcrc')) {
+        options.parser = 'json';
+      }
+
       const support = await prettier.getFileInfo(systemPath, options);
       if (support.ignored || !support.inferredParser) {
         return;

diff --git a/packages/js/src/utils/swc/add-swc-config.ts b/packages/js/src/utils/swc/add-swc-config.ts
@@ -39,46 +39,6 @@ const swcOptionsString = () => `{
 
 export function addSwcConfig(tree: Tree, projectDir: string) {
   const swcrcPath = join(projectDir, '.lib.swcrc');
-  updatePrettierRcForSwcrc(tree);
   if (tree.exists(swcrcPath)) return;
   tree.write(swcrcPath, swcOptionsString());
 }
-
-function updatePrettierRcForSwcrc(tree: Tree) {
-  const prettierrcPath = '.prettierrc';
-  const isExist = tree.exists(prettierrcPath);
-  if (!isExist) {
-    logger.info(`
-For SWC, @nrwl/js:lib attempted to update Prettier Configuration for ".swcrc" file 
-but the root ".prettierrc" does not exist. Please consider adding parser support for ".lib.swcrc" file
-`);
-    return;
-  }
-
-  try {
-    const prettierRc = readJson(tree, prettierrcPath);
-    const hasSwcrcOverride = prettierRc.overrides?.some((override) => {
-      const files = Array.isArray(override.files)
-        ? override.files
-        : [override.files];
-      return files.some((file) => file.includes('.swcrc'));
-    });
-
-    if (hasSwcrcOverride) return;
-    updateJson(tree, prettierrcPath, (json) => {
-      json.overrides = [
-        ...(json.overrides ?? []),
-        {
-          files: '**/*.swcrc',
-          options: {
-            parser: 'json',
-          },
-        },
-      ];
-
-      return json;
-    });
-  } catch (e) {
-    logger.error(e);
-  }
-}
diff --git a/packages/nx/src/command-line/format.ts b/packages/nx/src/command-line/format.ts
@@ -157,12 +157,33 @@ function chunkify(target: string[], size: number): string[][] {
 
 function write(patterns: string[]) {
   if (patterns.length > 0) {
+    const [swcrcPatterns, regularPatterns] = patterns.reduce(
+      (result, pattern) => {
+        result[pattern.includes('.swcrc') ? 0 : 1].push(pattern);
+        return result;
+      },
+      [[], []] as [swcrcPatterns: string[], regularPatterns: string[]]
+    );
+
     execSync(
-      `node "${PRETTIER_PATH}" --write --list-different ${patterns.join(' ')}`,
+      `node "${PRETTIER_PATH}" --write --list-different ${regularPatterns.join(
+        ' '
+      )}`,
       {
         stdio: [0, 1, 2],
       }
     );
+
+    if (swcrcPatterns.length) {
+      execSync(
+        `node "${PRETTIER_PATH}" --write --list-different ${swcrcPatterns.join(
+          ' '
+        )} --parser json`,
+        {
+          stdio: [0, 1, 2],
+        }
+      );
+    }
   }
 }