[E4E-0]: Fix some bad code/formatting

nrccua · Dec 15, 2021 · 153c536 · 153c536
1 parent 19895af
commit 153c536
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.nesteslintrc.js b/.nesteslintrc.js
@@ -10,21 +10,21 @@ const defaultConfig = require('./index');
 const tsConfig = defaultConfig.overrides.filter(o => o.files === ['**/*.ts', '**/*.tsx'])[0];
 
 const moduleConfig = {
-    ...tsConfig,
-    files: ['**/*.module.ts'],
-    rules: {
-        ...tsConfig.rules,
-        '@typescript-eslint/no-extraneous-class': 'off',
-    },
+  ...tsConfig,
+  files: ['**/*.module.ts'],
+  rules: {
+    ...tsConfig.rules,
+    '@typescript-eslint/no-extraneous-class': 'off',
+  },
 };
 
 const entityConfig = {
-    ...tsConfig,
-    files: ['**/*.entity.ts'],
-    rules: {
-        ...tsConfig.rules,
-        camel_case: 'off',
-    },
+  ...tsConfig,
+  files: ['**/*.entity.ts'],
+  rules: {
+    ...tsConfig.rules,
+    camel_case: 'off',
+  },
 };
 
 module.exports = { ...defaultConfig, overrides: [...defaultConfig.overrides, moduleConfig, entityConfig] };
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -11,7 +11,7 @@ config.insertPragma = false;
 config.requirePragma = false;
 config.overrides = [
   {
-    files: ["*.jsx", "*.tsx"],
+    files: ['*.jsx', '*.tsx'],
     options: {
       printWidth: 160,
     },

diff --git a/index.js b/index.js
@@ -9,9 +9,9 @@ const prettierConfig = require('./.prettierrc');
 
 const overridePrintWidth =
   prettierConfig && prettierConfig.overrides && prettierConfig.overrides.length > 0
-    ? Math.max(prettierConfig.overrides.map(o => o.printWidth))
+    ? Math.max(...prettierConfig.overrides.map(o => o.options.printWidth))
     : 0;
-const printWidth = Math.max([prettierConfig.printWidth || 160, overridePrintWidth]);
+const printWidth = Math.max(prettierConfig.printWidth, overridePrintWidth);
 
 const baseConfig = {
   extends: [