@teambit/prettier 0.0.577 → 0.0.579

package/dist/prettier-config-writer.d.ts

@@ -1,5 +1,5 @@
 import { ExecutionContext } from '@teambit/envs';
-import type { ConfigWriterEntry, WrittenConfigFile, ExtendingConfigFile, ConfigFile } from '@teambit/workspace-config-files';
+import type { ConfigWriterEntry, ExtendingConfigFile, ConfigFile, GenerateExtendingConfigFilesArgs } from '@teambit/workspace-config-files';
 import { FormatterMain } from '@teambit/formatter';
 export declare class PrettierConfigWriter implements ConfigWriterEntry {
     private formatter;
@@ -8,7 +8,7 @@ export declare class PrettierConfigWriter implements ConfigWriterEntry {
     constructor(formatter: FormatterMain);
     patterns: string[];
     calcConfigFiles(executionContext: ExecutionContext): ConfigFile[] | undefined;
-    generateExtendingFile(writtenConfigFiles: WrittenConfigFile[]): ExtendingConfigFile | undefined;
+    generateExtendingFile(args: GenerateExtendingConfigFilesArgs): ExtendingConfigFile | undefined;
     calcName(hash: string): string;
     isBitGenerated(filePath: string): boolean;
 }

package/dist/prettier-config-writer.js

@@ -42,16 +42,21 @@ class PrettierConfigWriter {
     };
     return [prettierConfigFile];
   }
-  generateExtendingFile(writtenConfigFiles) {
+  generateExtendingFile(args) {
+    const {
+      writtenConfigFiles
+    } = args;
     const prettierConfigFile = writtenConfigFiles[0];
+    // Using DSL to make sure it will be replaced with relative path
     const configContent = `module.exports = {
-  ...require('${prettierConfigFile.filePath}')
+  ...require('{${prettierConfigFile.name}}')
 }`;
     const content = `${BIT_GENERATED_PRETTIER_CONFIG_COMMENT}\n${configContent}`;
     return {
       content,
       name: CONFIG_NAME,
-      extendingTarget: prettierConfigFile.filePath
+      extendingTarget: prettierConfigFile,
+      useAbsPaths: false
     };
   }
   calcName(hash) {

package/dist/prettier-config-writer.js.map

@@ -1 +1 @@
-{"version":3,"names":["CONFIG_NAME","BIT_GENERATED_PRETTIER_CONFIG_COMMENT","PrettierConfigWriter","constructor","formatter","calcConfigFiles","executionContext","getFormatter","undefined","id","toLowerCase","includes","config","generateIdeConfig","prettierConfig","content","JSON","stringify","prettierConfigFile","name","generateExtendingFile","writtenConfigFiles","configContent","filePath","extendingTarget","calcName","hash","isBitGenerated","fs","readFileSync","toString"],"sources":["prettier-config-writer.ts"],"sourcesContent":["import fs from 'fs-extra';\nimport { ExecutionContext } from '@teambit/envs';\nimport type {\n  ConfigWriterEntry,\n  WrittenConfigFile,\n  ExtendingConfigFile,\n  ConfigFile,\n} from '@teambit/workspace-config-files';\nimport { FormatterMain } from '@teambit/formatter';\nimport { PrettierFormatterInterface } from './prettier-formatter-interface';\n\nconst CONFIG_NAME = '.prettierrc.cjs';\nconst BIT_GENERATED_PRETTIER_CONFIG_COMMENT = '// bit-generated-prettier-config';\n\nexport class PrettierConfigWriter implements ConfigWriterEntry {\n  name = 'PrettierConfigWriter';\n  cliName = 'prettier';\n\n  constructor(private formatter: FormatterMain) {}\n  patterns: string[] = [`**/${CONFIG_NAME}`];\n\n  calcConfigFiles(executionContext: ExecutionContext): ConfigFile[] | undefined {\n    const formatter = this.formatter.getFormatter(executionContext, {}) as PrettierFormatterInterface;\n    if (!formatter) return undefined;\n    if (!formatter.id.toLowerCase().includes('prettier')) return undefined;\n    const config = formatter.generateIdeConfig?.();\n    if (!config || !config.prettierConfig) return undefined;\n    const content = `module.exports = ${JSON.stringify(config.prettierConfig, null, 2)}`;\n    const prettierConfigFile = {\n      content,\n      name: '.prettierrc.bit.{hash}.cjs',\n    };\n    return [prettierConfigFile];\n  }\n\n  generateExtendingFile(writtenConfigFiles: WrittenConfigFile[]): ExtendingConfigFile | undefined {\n    const prettierConfigFile = writtenConfigFiles[0];\n    const configContent = `module.exports = {\n  ...require('${prettierConfigFile.filePath}')\n}`;\n    const content = `${BIT_GENERATED_PRETTIER_CONFIG_COMMENT}\\n${configContent}`;\n    return { content, name: CONFIG_NAME, extendingTarget: prettierConfigFile.filePath };\n  }\n  calcName(hash: string): string {\n    return `.prettierrc.bit.${hash}.cjs`;\n  }\n\n  isBitGenerated(filePath: string): boolean {\n    const content = fs.readFileSync(filePath).toString();\n    return content.includes(BIT_GENERATED_PRETTIER_CONFIG_COMMENT);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAWA,MAAMA,WAAW,GAAG,iBAAiB;AACrC,MAAMC,qCAAqC,GAAG,kCAAkC;AAEzE,MAAMC,oBAAoB,CAA8B;EAI7DC,WAAW,CAASC,SAAwB,EAAE;IAAA,KAA1BA,SAAwB,GAAxBA,SAAwB;IAAA,8CAHrC,sBAAsB;IAAA,iDACnB,UAAU;IAAA,kDAGC,CAAE,MAAKJ,WAAY,EAAC,CAAC;EADK;EAG/CK,eAAe,CAACC,gBAAkC,EAA4B;IAAA;IAC5E,MAAMF,SAAS,GAAG,IAAI,CAACA,SAAS,CAACG,YAAY,CAACD,gBAAgB,EAAE,CAAC,CAAC,CAA+B;IACjG,IAAI,CAACF,SAAS,EAAE,OAAOI,SAAS;IAChC,IAAI,CAACJ,SAAS,CAACK,EAAE,CAACC,WAAW,EAAE,CAACC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAOH,SAAS;IACtE,MAAMI,MAAM,4BAAGR,SAAS,CAACS,iBAAiB,0DAA3B,2BAAAT,SAAS,CAAsB;IAC9C,IAAI,CAACQ,MAAM,IAAI,CAACA,MAAM,CAACE,cAAc,EAAE,OAAON,SAAS;IACvD,MAAMO,OAAO,GAAI,oBAAmBC,IAAI,CAACC,SAAS,CAACL,MAAM,CAACE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAE,EAAC;IACpF,MAAMI,kBAAkB,GAAG;MACzBH,OAAO;MACPI,IAAI,EAAE;IACR,CAAC;IACD,OAAO,CAACD,kBAAkB,CAAC;EAC7B;EAEAE,qBAAqB,CAACC,kBAAuC,EAAmC;IAC9F,MAAMH,kBAAkB,GAAGG,kBAAkB,CAAC,CAAC,CAAC;IAChD,MAAMC,aAAa,GAAI;AAC3B,gBAAgBJ,kBAAkB,CAACK,QAAS;AAC5C,EAAE;IACE,MAAMR,OAAO,GAAI,GAAEd,qCAAsC,KAAIqB,aAAc,EAAC;IAC5E,OAAO;MAAEP,OAAO;MAAEI,IAAI,EAAEnB,WAAW;MAAEwB,eAAe,EAAEN,kBAAkB,CAACK;IAAS,CAAC;EACrF;EACAE,QAAQ,CAACC,IAAY,EAAU;IAC7B,OAAQ,mBAAkBA,IAAK,MAAK;EACtC;EAEAC,cAAc,CAACJ,QAAgB,EAAW;IACxC,MAAMR,OAAO,GAAGa,kBAAE,CAACC,YAAY,CAACN,QAAQ,CAAC,CAACO,QAAQ,EAAE;IACpD,OAAOf,OAAO,CAACJ,QAAQ,CAACV,qCAAqC,CAAC;EAChE;AACF;AAAC"}
+{"version":3,"names":["CONFIG_NAME","BIT_GENERATED_PRETTIER_CONFIG_COMMENT","PrettierConfigWriter","constructor","formatter","calcConfigFiles","executionContext","getFormatter","undefined","id","toLowerCase","includes","config","generateIdeConfig","prettierConfig","content","JSON","stringify","prettierConfigFile","name","generateExtendingFile","args","writtenConfigFiles","configContent","extendingTarget","useAbsPaths","calcName","hash","isBitGenerated","filePath","fs","readFileSync","toString"],"sources":["prettier-config-writer.ts"],"sourcesContent":["import fs from 'fs-extra';\nimport { ExecutionContext } from '@teambit/envs';\nimport type {\n  ConfigWriterEntry,\n  ExtendingConfigFile,\n  ConfigFile,\n  GenerateExtendingConfigFilesArgs,\n} from '@teambit/workspace-config-files';\nimport { FormatterMain } from '@teambit/formatter';\nimport { PrettierFormatterInterface } from './prettier-formatter-interface';\n\nconst CONFIG_NAME = '.prettierrc.cjs';\nconst BIT_GENERATED_PRETTIER_CONFIG_COMMENT = '// bit-generated-prettier-config';\n\nexport class PrettierConfigWriter implements ConfigWriterEntry {\n  name = 'PrettierConfigWriter';\n  cliName = 'prettier';\n\n  constructor(private formatter: FormatterMain) {}\n  patterns: string[] = [`**/${CONFIG_NAME}`];\n\n  calcConfigFiles(executionContext: ExecutionContext): ConfigFile[] | undefined {\n    const formatter = this.formatter.getFormatter(executionContext, {}) as PrettierFormatterInterface;\n    if (!formatter) return undefined;\n    if (!formatter.id.toLowerCase().includes('prettier')) return undefined;\n    const config = formatter.generateIdeConfig?.();\n    if (!config || !config.prettierConfig) return undefined;\n    const content = `module.exports = ${JSON.stringify(config.prettierConfig, null, 2)}`;\n    const prettierConfigFile = {\n      content,\n      name: '.prettierrc.bit.{hash}.cjs',\n    };\n    return [prettierConfigFile];\n  }\n\n  generateExtendingFile(args: GenerateExtendingConfigFilesArgs): ExtendingConfigFile | undefined {\n    const { writtenConfigFiles } = args;\n    const prettierConfigFile = writtenConfigFiles[0];\n    // Using DSL to make sure it will be replaced with relative path\n    const configContent = `module.exports = {\n  ...require('{${prettierConfigFile.name}}')\n}`;\n    const content = `${BIT_GENERATED_PRETTIER_CONFIG_COMMENT}\\n${configContent}`;\n    return { content, name: CONFIG_NAME, extendingTarget: prettierConfigFile, useAbsPaths: false };\n  }\n  calcName(hash: string): string {\n    return `.prettierrc.bit.${hash}.cjs`;\n  }\n\n  isBitGenerated(filePath: string): boolean {\n    const content = fs.readFileSync(filePath).toString();\n    return content.includes(BIT_GENERATED_PRETTIER_CONFIG_COMMENT);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAWA,MAAMA,WAAW,GAAG,iBAAiB;AACrC,MAAMC,qCAAqC,GAAG,kCAAkC;AAEzE,MAAMC,oBAAoB,CAA8B;EAI7DC,WAAW,CAASC,SAAwB,EAAE;IAAA,KAA1BA,SAAwB,GAAxBA,SAAwB;IAAA,8CAHrC,sBAAsB;IAAA,iDACnB,UAAU;IAAA,kDAGC,CAAE,MAAKJ,WAAY,EAAC,CAAC;EADK;EAG/CK,eAAe,CAACC,gBAAkC,EAA4B;IAAA;IAC5E,MAAMF,SAAS,GAAG,IAAI,CAACA,SAAS,CAACG,YAAY,CAACD,gBAAgB,EAAE,CAAC,CAAC,CAA+B;IACjG,IAAI,CAACF,SAAS,EAAE,OAAOI,SAAS;IAChC,IAAI,CAACJ,SAAS,CAACK,EAAE,CAACC,WAAW,EAAE,CAACC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAOH,SAAS;IACtE,MAAMI,MAAM,4BAAGR,SAAS,CAACS,iBAAiB,0DAA3B,2BAAAT,SAAS,CAAsB;IAC9C,IAAI,CAACQ,MAAM,IAAI,CAACA,MAAM,CAACE,cAAc,EAAE,OAAON,SAAS;IACvD,MAAMO,OAAO,GAAI,oBAAmBC,IAAI,CAACC,SAAS,CAACL,MAAM,CAACE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAE,EAAC;IACpF,MAAMI,kBAAkB,GAAG;MACzBH,OAAO;MACPI,IAAI,EAAE;IACR,CAAC;IACD,OAAO,CAACD,kBAAkB,CAAC;EAC7B;EAEAE,qBAAqB,CAACC,IAAsC,EAAmC;IAC7F,MAAM;MAAEC;IAAmB,CAAC,GAAGD,IAAI;IACnC,MAAMH,kBAAkB,GAAGI,kBAAkB,CAAC,CAAC,CAAC;IAChD;IACA,MAAMC,aAAa,GAAI;AAC3B,iBAAiBL,kBAAkB,CAACC,IAAK;AACzC,EAAE;IACE,MAAMJ,OAAO,GAAI,GAAEd,qCAAsC,KAAIsB,aAAc,EAAC;IAC5E,OAAO;MAAER,OAAO;MAAEI,IAAI,EAAEnB,WAAW;MAAEwB,eAAe,EAAEN,kBAAkB;MAAEO,WAAW,EAAE;IAAM,CAAC;EAChG;EACAC,QAAQ,CAACC,IAAY,EAAU;IAC7B,OAAQ,mBAAkBA,IAAK,MAAK;EACtC;EAEAC,cAAc,CAACC,QAAgB,EAAW;IACxC,MAAMd,OAAO,GAAGe,kBAAE,CAACC,YAAY,CAACF,QAAQ,CAAC,CAACG,QAAQ,EAAE;IACpD,OAAOjB,OAAO,CAACJ,QAAQ,CAACV,qCAAqC,CAAC;EAChE;AACF;AAAC"}

package/dist/{preview-1680146722705.js → preview-1680406095586.js}

@@ -1,4 +1,4 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_prettier@0.0.577/dist/prettier.composition.js';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_prettier@0.0.579/dist/prettier.composition.js';
 ;
 
 export const compositions = [compositions_0];

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/prettier",
-  "version": "0.0.577",
-  "homepage": "https://bit.dev/teambit/defender/prettier",
+  "version": "0.0.579",
+  "homepage": "https://bit.cloud/teambit/defender/prettier",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.defender",
     "name": "prettier",
-    "version": "0.0.577"
+    "version": "0.0.579"
   },
   "dependencies": {
     "fs-extra": "10.0.0",
@@ -15,11 +15,11 @@
     "core-js": "^3.0.0",
     "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
-    "@teambit/envs": "0.0.1026",
-    "@teambit/formatter": "0.0.577",
-    "@teambit/workspace-config-files": "0.0.6",
-    "@teambit/logger": "0.0.782",
-    "@teambit/cli": "0.0.689",
+    "@teambit/envs": "0.0.1028",
+    "@teambit/formatter": "0.0.579",
+    "@teambit/workspace-config-files": "0.0.8",
+    "@teambit/logger": "0.0.784",
+    "@teambit/cli": "0.0.691",
     "@teambit/defender.prettier.config-mutator": "0.0.90"
   },
   "devDependencies": {
@@ -33,7 +33,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.469",
+    "@teambit/legacy": "1.0.471",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },