zixulu 1.56.2 → 1.56.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -137,8 +137,12 @@ async function addPrettier() {
|
|
|
137
137
|
import_consola.default.start("开始添加 prettier 配置");
|
|
138
138
|
const packageJson = await (0, import_readPackageJson.readPackageJson)();
|
|
139
139
|
const tailwind = Object.keys(packageJson.dependencies ?? {}).includes("tailwindcss") || Object.keys(packageJson.devDependencies ?? {}).includes("tailwindcss");
|
|
140
|
-
|
|
141
|
-
|
|
140
|
+
let atAlias = false;
|
|
141
|
+
try {
|
|
142
|
+
const config = await (0, import_readTsConfig.readTsConfig)();
|
|
143
|
+
atAlias = Object.keys(config.compilerOptions?.paths ?? {}).some((path) => /^@[a-zA-Z]/.test(path));
|
|
144
|
+
} catch (error) {
|
|
145
|
+
}
|
|
142
146
|
const next = !!await (0, import_getDependcy.getDependcy)("next");
|
|
143
147
|
const react = !!await (0, import_getDependcy.getDependcy)("react");
|
|
144
148
|
await (0, import_promises.writeFile)("./prettier.config.mjs", getPrettierConfig({ tailwind, atAlias, next, react }), "utf-8");
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/addPrettier.ts"],
|
|
4
|
-
"sourcesContent": ["import { writeFile } from \"fs/promises\"\r\nimport consola from \"consola\"\r\n\r\nimport { AddDependenciesConfig, addDependency } from \"./addDependency\"\r\nimport { getDependcy } from \"./getDependcy\"\r\nimport { installDependceny } from \"./installDependceny\"\r\nimport { readPackageJson } from \"./readPackageJson\"\r\nimport { readTsConfig } from \"./readTsConfig\"\r\nimport { writePackageJson } from \"./writePackageJson\"\r\n\r\n/**\r\n * prettier 配置生成器参数\r\n */\r\nexport type GetPrettierConfigParams = {\r\n /** 是否使用 tailwind */\r\n tailwind: boolean\r\n /** 是否使用了本地 @images 类似的别名 */\r\n atAlias: boolean\r\n /** 是否是 next 项目 */\r\n next: boolean\r\n /** 是否是 react 项目 */\r\n react: boolean\r\n}\r\n\r\n/**\r\n * 生成 prettier 配置文件内容\r\n * @param params 配置参数\r\n */\r\nexport function getPrettierConfig({ tailwind, atAlias, next, react }: GetPrettierConfigParams) {\r\n const plugins = [\"@ianvs/prettier-plugin-sort-imports\"]\r\n\r\n if (tailwind) plugins.push(\"prettier-plugin-tailwindcss\")\r\n\r\n const prettierConfigText = `// @ts-check\r\n${\r\n atAlias\r\n ? `\r\nimport { readFileSync } from \"fs\"`\r\n : \"\"\r\n}\r\nimport { parse } from \"path\"\r\nimport { globSync } from \"glob\"\r\n\r\n/**\r\n * 数组去重\r\n * @template T - 数组的元素类型\r\n * @param {T[]} array - 输入的数组\r\n * @return {T[]} 新数组\r\n */\r\nfunction unique(array) {\r\n return Array.from(new Set(array))\r\n}\r\n\r\nconst jsExts = [\".js\", \".jsx\", \".ts\", \".tsx\", \".cjs\", \".mjs\", \".cts\", \".mts\", \".vue\"]\r\n\r\nconst assetExts = unique(\r\n globSync(\"**/*\", { ignore: [\"node_modules/**\"${next ? `, \".next/**\"` : \"\"}], withFileTypes: true, cwd: import.meta.dirname })\r\n .filter(path => path.isFile() && !jsExts.some(ext => path.name.toLowerCase().endsWith(ext)))\r\n .map(path => parse(path.name).ext.slice(1))\r\n .filter(ext => ext !== \"\"),\r\n)\r\n\r\nconst assetExtsRegStr = \\`\\\\\\\\.(\\${assetExts.join(\"|\")}|\\${assetExts.join(\"|\").toUpperCase()})\\`\r\n\r\nconst assetQueryRegStr = \"(\\\\\\\\?[a-zA-Z0-9]+)?\"\r\n${\r\n atAlias\r\n ? `\r\nconst namespaces = unique(\r\n unique(\r\n globSync(\"**/package.json\", { withFileTypes: true, cwd: import.meta.dirname })\r\n .filter(path => path.isFile())\r\n .map(path => path.fullpath()),\r\n )\r\n .map(path => JSON.parse(readFileSync(path, \"utf8\")))\r\n .map(json =>\r\n Object.keys({\r\n ...json.dependencies,\r\n ...json.devDependencies,\r\n ...json.peerDependencies,\r\n ...json.optionalDependencies,\r\n }),\r\n )\r\n .flat()\r\n .filter(dep => dep.startsWith(\"@\"))\r\n .map(dep => dep.split(\"/\")[0].slice(1)),\r\n)\r\n`\r\n : \"\"\r\n}\r\nconst folders = unique(\r\n globSync(\"**/*\", { withFileTypes: true, cwd: import.meta.dirname, ignore: [\"node_modules/**\"${next ? `, \".next/**\"` : \"\"}] })\r\n .filter(path => path.isDirectory())\r\n .map(path => path.name),\r\n).sort()\r\n\r\n/**\r\n * @type {import(\"prettier\").Options}\r\n */\r\nconst config = {\r\n semi: false,\r\n tabWidth: 4,\r\n arrowParens: \"avoid\",\r\n printWidth: 160,\r\n plugins: [${plugins.map(plugin => `\"${plugin}\"`).join(\", \")}],\r\n importOrder: [${\r\n react\r\n ? `\r\n \"^react(/.+)?$\",\r\n \"^react-dom(/.+)?$\",\r\n \"^react-native(/.+)?$\",`\r\n : \"\"\r\n }\r\n \"<BUILTIN_MODULES>\",\r\n ${atAlias ? `\\`^@(\\${namespaces.join(\"|\")})/\\`,` : `\"^@[^/]\",`}\r\n \"<THIRD_PARTY_MODULES>\",\r\n ...folders.map(folder => [\"\", \\`^@/?\\${folder}(.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr}))?$\\`]).flat(),\r\n \"\",\r\n \\`^@/.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr})$\\`,\r\n \\`^\\\\\\\\.{1,2}/.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr})$\\`,\r\n \"\",\r\n \\`^@/.+?\\${assetExtsRegStr}\\${assetQueryRegStr}$\\`,\r\n \\`^\\\\\\\\.{1,2}/.+?\\${assetExtsRegStr}\\${assetQueryRegStr}$\\`,\r\n ],\r\n importOrderParserPlugins: [\"typescript\", \"jsx\", \"decorators-legacy\"],\r\n importOrderTypeScriptVersion: \"5.0.0\",\r\n importOrderCaseSensitive: true,\r\n}\r\n\r\nexport default config\r\n`\r\n return prettierConfigText\r\n}\r\n\r\n/**\r\n * 添加 prettier 相关配置\r\n * 包括安装依赖、创建配置文件等\r\n */\r\nexport async function addPrettier() {\r\n consola.start(\"开始添加 prettier 配置\")\r\n const packageJson = await readPackageJson()\r\n const tailwind =\r\n Object.keys(packageJson.dependencies ?? {}).includes(\"tailwindcss\") || Object.keys(packageJson.devDependencies ?? {}).includes(\"tailwindcss\")\r\n const config = await readTsConfig()\r\n
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAA0B;AAC1B,qBAAoB;AAEpB,2BAAqD;AACrD,yBAA4B;AAC5B,+BAAkC;AAClC,6BAAgC;AAChC,0BAA6B;AAC7B,8BAAiC;AAoB1B,SAAS,kBAAkB,EAAE,UAAU,SAAS,MAAM,MAAM,GAA4B;AAC3F,QAAM,UAAU,CAAC,qCAAqC;AAEtD,MAAI;AAAU,YAAQ,KAAK,6BAA6B;AAExD,QAAM,qBAAqB;AAAA,EAE3B,UACM;AAAA,qCAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mDAkByC,OAAO,iBAAiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUvE,UACM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAqBA;AAAA;AAAA,kGAGwF,OAAO,iBAAiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAa1G,QAAQ,IAAI,YAAU,IAAI,SAAS,EAAE,KAAK,IAAI;AAAA,oBAEtD,QACM;AAAA;AAAA;AAAA,mCAIA;AAAA;AAAA,UAGJ,UAAU,uCAAuC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBvD,SAAO;AACX;AAMA,eAAsB,cAAc;AAChC,iBAAAA,QAAQ,MAAM,kBAAkB;AAChC,QAAM,cAAc,UAAM,wCAAgB;AAC1C,QAAM,WACF,OAAO,KAAK,YAAY,gBAAgB,CAAC,CAAC,EAAE,SAAS,aAAa,KAAK,OAAO,KAAK,YAAY,mBAAmB,CAAC,CAAC,EAAE,SAAS,aAAa;AAChJ,
|
|
4
|
+
"sourcesContent": ["import { writeFile } from \"fs/promises\"\r\nimport consola from \"consola\"\r\n\r\nimport { AddDependenciesConfig, addDependency } from \"./addDependency\"\r\nimport { getDependcy } from \"./getDependcy\"\r\nimport { installDependceny } from \"./installDependceny\"\r\nimport { readPackageJson } from \"./readPackageJson\"\r\nimport { readTsConfig } from \"./readTsConfig\"\r\nimport { writePackageJson } from \"./writePackageJson\"\r\n\r\n/**\r\n * prettier 配置生成器参数\r\n */\r\nexport type GetPrettierConfigParams = {\r\n /** 是否使用 tailwind */\r\n tailwind: boolean\r\n /** 是否使用了本地 @images 类似的别名 */\r\n atAlias: boolean\r\n /** 是否是 next 项目 */\r\n next: boolean\r\n /** 是否是 react 项目 */\r\n react: boolean\r\n}\r\n\r\n/**\r\n * 生成 prettier 配置文件内容\r\n * @param params 配置参数\r\n */\r\nexport function getPrettierConfig({ tailwind, atAlias, next, react }: GetPrettierConfigParams) {\r\n const plugins = [\"@ianvs/prettier-plugin-sort-imports\"]\r\n\r\n if (tailwind) plugins.push(\"prettier-plugin-tailwindcss\")\r\n\r\n const prettierConfigText = `// @ts-check\r\n${\r\n atAlias\r\n ? `\r\nimport { readFileSync } from \"fs\"`\r\n : \"\"\r\n}\r\nimport { parse } from \"path\"\r\nimport { globSync } from \"glob\"\r\n\r\n/**\r\n * 数组去重\r\n * @template T - 数组的元素类型\r\n * @param {T[]} array - 输入的数组\r\n * @return {T[]} 新数组\r\n */\r\nfunction unique(array) {\r\n return Array.from(new Set(array))\r\n}\r\n\r\nconst jsExts = [\".js\", \".jsx\", \".ts\", \".tsx\", \".cjs\", \".mjs\", \".cts\", \".mts\", \".vue\"]\r\n\r\nconst assetExts = unique(\r\n globSync(\"**/*\", { ignore: [\"node_modules/**\"${next ? `, \".next/**\"` : \"\"}], withFileTypes: true, cwd: import.meta.dirname })\r\n .filter(path => path.isFile() && !jsExts.some(ext => path.name.toLowerCase().endsWith(ext)))\r\n .map(path => parse(path.name).ext.slice(1))\r\n .filter(ext => ext !== \"\"),\r\n)\r\n\r\nconst assetExtsRegStr = \\`\\\\\\\\.(\\${assetExts.join(\"|\")}|\\${assetExts.join(\"|\").toUpperCase()})\\`\r\n\r\nconst assetQueryRegStr = \"(\\\\\\\\?[a-zA-Z0-9]+)?\"\r\n${\r\n atAlias\r\n ? `\r\nconst namespaces = unique(\r\n unique(\r\n globSync(\"**/package.json\", { withFileTypes: true, cwd: import.meta.dirname })\r\n .filter(path => path.isFile())\r\n .map(path => path.fullpath()),\r\n )\r\n .map(path => JSON.parse(readFileSync(path, \"utf8\")))\r\n .map(json =>\r\n Object.keys({\r\n ...json.dependencies,\r\n ...json.devDependencies,\r\n ...json.peerDependencies,\r\n ...json.optionalDependencies,\r\n }),\r\n )\r\n .flat()\r\n .filter(dep => dep.startsWith(\"@\"))\r\n .map(dep => dep.split(\"/\")[0].slice(1)),\r\n)\r\n`\r\n : \"\"\r\n}\r\nconst folders = unique(\r\n globSync(\"**/*\", { withFileTypes: true, cwd: import.meta.dirname, ignore: [\"node_modules/**\"${next ? `, \".next/**\"` : \"\"}] })\r\n .filter(path => path.isDirectory())\r\n .map(path => path.name),\r\n).sort()\r\n\r\n/**\r\n * @type {import(\"prettier\").Options}\r\n */\r\nconst config = {\r\n semi: false,\r\n tabWidth: 4,\r\n arrowParens: \"avoid\",\r\n printWidth: 160,\r\n plugins: [${plugins.map(plugin => `\"${plugin}\"`).join(\", \")}],\r\n importOrder: [${\r\n react\r\n ? `\r\n \"^react(/.+)?$\",\r\n \"^react-dom(/.+)?$\",\r\n \"^react-native(/.+)?$\",`\r\n : \"\"\r\n }\r\n \"<BUILTIN_MODULES>\",\r\n ${atAlias ? `\\`^@(\\${namespaces.join(\"|\")})/\\`,` : `\"^@[^/]\",`}\r\n \"<THIRD_PARTY_MODULES>\",\r\n ...folders.map(folder => [\"\", \\`^@/?\\${folder}(.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr}))?$\\`]).flat(),\r\n \"\",\r\n \\`^@/.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr})$\\`,\r\n \\`^\\\\\\\\.{1,2}/.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr})$\\`,\r\n \"\",\r\n \\`^@/.+?\\${assetExtsRegStr}\\${assetQueryRegStr}$\\`,\r\n \\`^\\\\\\\\.{1,2}/.+?\\${assetExtsRegStr}\\${assetQueryRegStr}$\\`,\r\n ],\r\n importOrderParserPlugins: [\"typescript\", \"jsx\", \"decorators-legacy\"],\r\n importOrderTypeScriptVersion: \"5.0.0\",\r\n importOrderCaseSensitive: true,\r\n}\r\n\r\nexport default config\r\n`\r\n return prettierConfigText\r\n}\r\n\r\n/**\r\n * 添加 prettier 相关配置\r\n * 包括安装依赖、创建配置文件等\r\n */\r\nexport async function addPrettier() {\r\n consola.start(\"开始添加 prettier 配置\")\r\n const packageJson = await readPackageJson()\r\n const tailwind =\r\n Object.keys(packageJson.dependencies ?? {}).includes(\"tailwindcss\") || Object.keys(packageJson.devDependencies ?? {}).includes(\"tailwindcss\")\r\n let atAlias = false\r\n try {\r\n const config = await readTsConfig()\r\n atAlias = Object.keys(config.compilerOptions?.paths ?? {}).some(path => /^@[a-zA-Z]/.test(path))\r\n } catch (error) {}\r\n const next = !!(await getDependcy(\"next\"))\r\n const react = !!(await getDependcy(\"react\"))\r\n await writeFile(\"./prettier.config.mjs\", getPrettierConfig({ tailwind, atAlias, next, react }), \"utf-8\")\r\n const config2: AddDependenciesConfig = {\r\n package: [\"prettier\", \"@ianvs/prettier-plugin-sort-imports\", \"glob\"],\r\n type: \"devDependencies\",\r\n }\r\n if (tailwind) (config2.package as string[]).push(\"prettier-plugin-tailwindcss\")\r\n await addDependency(config2)\r\n const packageJson2 = await readPackageJson()\r\n packageJson2.scripts ??= {}\r\n packageJson2.scripts.lint = \"prettier --write .\"\r\n await writePackageJson({ data: packageJson2 })\r\n await installDependceny()\r\n consola.success(\"添加 prettier 配置成功\")\r\n}\r\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAA0B;AAC1B,qBAAoB;AAEpB,2BAAqD;AACrD,yBAA4B;AAC5B,+BAAkC;AAClC,6BAAgC;AAChC,0BAA6B;AAC7B,8BAAiC;AAoB1B,SAAS,kBAAkB,EAAE,UAAU,SAAS,MAAM,MAAM,GAA4B;AAC3F,QAAM,UAAU,CAAC,qCAAqC;AAEtD,MAAI;AAAU,YAAQ,KAAK,6BAA6B;AAExD,QAAM,qBAAqB;AAAA,EAE3B,UACM;AAAA,qCAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mDAkByC,OAAO,iBAAiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUvE,UACM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAqBA;AAAA;AAAA,kGAGwF,OAAO,iBAAiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAa1G,QAAQ,IAAI,YAAU,IAAI,SAAS,EAAE,KAAK,IAAI;AAAA,oBAEtD,QACM;AAAA;AAAA;AAAA,mCAIA;AAAA;AAAA,UAGJ,UAAU,uCAAuC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBvD,SAAO;AACX;AAMA,eAAsB,cAAc;AAChC,iBAAAA,QAAQ,MAAM,kBAAkB;AAChC,QAAM,cAAc,UAAM,wCAAgB;AAC1C,QAAM,WACF,OAAO,KAAK,YAAY,gBAAgB,CAAC,CAAC,EAAE,SAAS,aAAa,KAAK,OAAO,KAAK,YAAY,mBAAmB,CAAC,CAAC,EAAE,SAAS,aAAa;AAChJ,MAAI,UAAU;AACd,MAAI;AACA,UAAM,SAAS,UAAM,kCAAa;AAClC,cAAU,OAAO,KAAK,OAAO,iBAAiB,SAAS,CAAC,CAAC,EAAE,KAAK,UAAQ,aAAa,KAAK,IAAI,CAAC;AAAA,EACnG,SAAS,OAAP;AAAA,EAAe;AACjB,QAAM,OAAO,CAAC,CAAE,UAAM,gCAAY,MAAM;AACxC,QAAM,QAAQ,CAAC,CAAE,UAAM,gCAAY,OAAO;AAC1C,YAAM,2BAAU,yBAAyB,kBAAkB,EAAE,UAAU,SAAS,MAAM,MAAM,CAAC,GAAG,OAAO;AACvG,QAAM,UAAiC;AAAA,IACnC,SAAS,CAAC,YAAY,uCAAuC,MAAM;AAAA,IACnE,MAAM;AAAA,EACV;AACA,MAAI;AAAU,IAAC,QAAQ,QAAqB,KAAK,6BAA6B;AAC9E,YAAM,oCAAc,OAAO;AAC3B,QAAM,eAAe,UAAM,wCAAgB;AAC3C,eAAa,YAAY,CAAC;AAC1B,eAAa,QAAQ,OAAO;AAC5B,YAAM,0CAAiB,EAAE,MAAM,aAAa,CAAC;AAC7C,YAAM,4CAAkB;AACxB,iBAAAA,QAAQ,QAAQ,kBAAkB;AACtC;",
|
|
6
6
|
"names": ["consola"]
|
|
7
7
|
}
|
package/package.json
CHANGED
package/src/utils/addPrettier.ts
CHANGED
|
@@ -141,8 +141,11 @@ export async function addPrettier() {
|
|
|
141
141
|
const packageJson = await readPackageJson()
|
|
142
142
|
const tailwind =
|
|
143
143
|
Object.keys(packageJson.dependencies ?? {}).includes("tailwindcss") || Object.keys(packageJson.devDependencies ?? {}).includes("tailwindcss")
|
|
144
|
-
|
|
145
|
-
|
|
144
|
+
let atAlias = false
|
|
145
|
+
try {
|
|
146
|
+
const config = await readTsConfig()
|
|
147
|
+
atAlias = Object.keys(config.compilerOptions?.paths ?? {}).some(path => /^@[a-zA-Z]/.test(path))
|
|
148
|
+
} catch (error) {}
|
|
146
149
|
const next = !!(await getDependcy("next"))
|
|
147
150
|
const react = !!(await getDependcy("react"))
|
|
148
151
|
await writeFile("./prettier.config.mjs", getPrettierConfig({ tailwind, atAlias, next, react }), "utf-8")
|