zixulu 1.65.2 → 1.65.4
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.
|
@@ -181,7 +181,7 @@ async function addPrettier() {
|
|
|
181
181
|
await (0, import_addDependency.addDependency)(config2);
|
|
182
182
|
const packageJson2 = await (0, import_readPackageJson.readPackageJson)();
|
|
183
183
|
packageJson2.scripts ??= {};
|
|
184
|
-
packageJson2.scripts.format = "prettier --config
|
|
184
|
+
packageJson2.scripts.format = "prettier --config prettier.config.mjs --write . && prettier --config .prettierrc.mjs --write .";
|
|
185
185
|
await (0, import_writePackageJson.writePackageJson)({ data: packageJson2 });
|
|
186
186
|
await (0, import_installDependceny.installDependceny)();
|
|
187
187
|
import_consola.default.success("添加 prettier 配置成功");
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/addPrettier.ts"],
|
|
4
|
-
"sourcesContent": ["import { writeFile } from \"fs/promises\"\nimport consola from \"consola\"\n\nimport { AddDependenciesConfig, addDependency } from \"./addDependency\"\nimport { getDependcy } from \"./getDependcy\"\nimport { hasDependency } from \"./hasDependency\"\nimport { installDependceny } from \"./installDependceny\"\nimport { readPackageJson } from \"./readPackageJson\"\nimport { readTsConfig } from \"./readTsConfig\"\nimport { writePackageJson } from \"./writePackageJson\"\n\nconst originalConfig = `// @ts-check\n\n/**\n * @type {import(\"prettier\").Options}\n */\nconst config = {\n semi: false,\n tabWidth: 4,\n arrowParens: \"avoid\",\n printWidth: 160,\n plugins: [\"@prettier/plugin-oxc\", \"prettier-plugin-organize-imports\"],\n}\n\nexport default config\n`\n\nconst ignoreConfig = `node_modules\npublic\ndist\nbuild\ngenerated\n.next\n.vscode\n.generated\n`\n\n/**\n * prettier 配置生成器参数\n */\nexport type GetPrettierConfigParams = {\n /** 是否使用 tailwind */\n tailwind: boolean\n /** 是否使用了本地 @images 类似的别名 */\n atAlias: boolean\n /** 是否是 next 项目 */\n next: boolean\n /** 是否是 react 项目 */\n react: boolean\n}\n\n/**\n * 生成 prettier 配置文件内容\n * @param params 配置参数\n */\nexport function getPrettierConfig({ tailwind, atAlias, next, react }: GetPrettierConfigParams) {\n const plugins = [\"@prettier/plugin-oxc\", \"@ianvs/prettier-plugin-sort-imports\"]\n\n if (tailwind) plugins.push(\"prettier-plugin-tailwindcss\")\n\n const prettierConfigText = `// @ts-check\n${\n atAlias\n ? `\nimport { readFileSync } from \"fs\"`\n : \"\"\n}\nimport { parse } from \"path\"\nimport { globSync } from \"glob\"\n\n/**\n * 数组去重\n * @template T - 数组的元素类型\n * @param {T[]} array - 输入的数组\n * @return {T[]} 新数组\n */\nfunction unique(array) {\n return Array.from(new Set(array))\n}\n\nconst jsExts = [\".js\", \".jsx\", \".ts\", \".tsx\", \".cjs\", \".mjs\", \".cts\", \".mts\", \".vue\"]\n\nconst assetExts = unique(\n globSync(\"**/*\", { ignore: [\"node_modules/**\"${next ? `, \".next/**\"` : \"\"}], withFileTypes: true, cwd: import.meta.dirname })\n .filter(path => path.isFile() && !jsExts.some(ext => path.name.toLowerCase().endsWith(ext)))\n .map(path => parse(path.name).ext.slice(1))\n .filter(ext => ext !== \"\"),\n)\n\nconst assetExtsRegStr = \\`\\\\\\\\.(\\${assetExts.join(\"|\")}|\\${assetExts.join(\"|\").toUpperCase()})\\`\n\nconst assetQueryRegStr = \"(\\\\\\\\?[a-zA-Z0-9]+)?\"\n${\n atAlias\n ? `\nconst namespaces = unique(\n unique(\n globSync(\"**/package.json\", { withFileTypes: true, cwd: import.meta.dirname })\n .filter(path => path.isFile())\n .map(path => path.fullpath()),\n )\n .map(path => JSON.parse(readFileSync(path, \"utf8\")))\n .map(json =>\n Object.keys({\n ...json.dependencies,\n ...json.devDependencies,\n ...json.peerDependencies,\n ...json.optionalDependencies,\n }),\n )\n .flat()\n .filter(dep => dep.startsWith(\"@\"))\n .map(dep => dep.split(\"/\")[0].slice(1)),\n)\n`\n : \"\"\n}\nconst folders = unique(\n globSync(\"**/*\", { withFileTypes: true, cwd: import.meta.dirname, ignore: [\"node_modules/**\"${next ? `, \".next/**\"` : \"\"}] })\n .filter(path => path.isDirectory())\n .map(path => path.name),\n).sort()\n\n/**\n * @type {import(\"prettier\").Options}\n */\nconst config = {\n semi: false,\n tabWidth: 4,\n arrowParens: \"avoid\",\n printWidth: 160,\n plugins: [${plugins.map(plugin => `\"${plugin}\"`).join(\", \")}],\n importOrder: [${\n react\n ? `\n \"^react(/.+)?$\",\n \"^react-dom(/.+)?$\",\n \"^react-native(/.+)?$\",`\n : \"\"\n }\n \"<BUILTIN_MODULES>\",\n ${atAlias ? `\\`^@(\\${namespaces.join(\"|\")})/\\`,` : `\"^@[^/]\",`}\n \"<THIRD_PARTY_MODULES>\",\n ...folders.map(folder => [\"\", \\`^@/?\\${folder}(.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr}))?$\\`]).flat(),\n \"\",\n \\`^@/.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr})$\\`,\n \\`^\\\\\\\\.{1,2}/.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr})$\\`,\n \"\",\n \\`^@/.+?\\${assetExtsRegStr}\\${assetQueryRegStr}$\\`,\n \\`^\\\\\\\\.{1,2}/.+?\\${assetExtsRegStr}\\${assetQueryRegStr}$\\`,\n ],\n importOrderParserPlugins: [\"typescript\", \"jsx\", \"decorators-legacy\"],\n importOrderTypeScriptVersion: \"5.0.0\",\n importOrderCaseSensitive: true,\n}\n\nexport default config\n`\n return prettierConfigText\n}\n\n/**\n * 添加 prettier 相关配置\n * 包括安装依赖、创建配置文件等\n */\nexport async function addPrettier() {\n consola.start(\"开始添加 prettier 配置\")\n const packageJson = await readPackageJson()\n const tailwind =\n Object.keys(packageJson.dependencies ?? {}).includes(\"tailwindcss\") || Object.keys(packageJson.devDependencies ?? {}).includes(\"tailwindcss\")\n let atAlias = false\n try {\n const config = await readTsConfig()\n atAlias = Object.keys(config.compilerOptions?.paths ?? {}).some(path => /^@[a-zA-Z]/.test(path))\n } catch (error) {}\n const next = await hasDependency(\"next\")\n const react = await hasDependency(\"react\")\n await writeFile(\"prettier.config.mjs\", originalConfig, \"utf-8\")\n await writeFile(\".prettierrc.mjs\", getPrettierConfig({ tailwind, atAlias, next, react }), \"utf-8\")\n await writeFile(\".prettierignore\", ignoreConfig, \"utf-8\")\n const config2: AddDependenciesConfig = {\n package: [\"prettier\", \"@prettier/plugin-oxc\", \"@ianvs/prettier-plugin-sort-imports\", \"glob\", \"prettier-plugin-organize-imports\"],\n type: \"devDependencies\",\n }\n if (tailwind) (config2.package as string[]).push(\"prettier-plugin-tailwindcss\")\n await addDependency(config2)\n const packageJson2 = await readPackageJson()\n packageJson2.scripts ??= {}\n packageJson2.scripts.format = \"prettier --config
|
|
4
|
+
"sourcesContent": ["import { writeFile } from \"fs/promises\"\nimport consola from \"consola\"\n\nimport { AddDependenciesConfig, addDependency } from \"./addDependency\"\nimport { getDependcy } from \"./getDependcy\"\nimport { hasDependency } from \"./hasDependency\"\nimport { installDependceny } from \"./installDependceny\"\nimport { readPackageJson } from \"./readPackageJson\"\nimport { readTsConfig } from \"./readTsConfig\"\nimport { writePackageJson } from \"./writePackageJson\"\n\nconst originalConfig = `// @ts-check\n\n/**\n * @type {import(\"prettier\").Options}\n */\nconst config = {\n semi: false,\n tabWidth: 4,\n arrowParens: \"avoid\",\n printWidth: 160,\n plugins: [\"@prettier/plugin-oxc\", \"prettier-plugin-organize-imports\"],\n}\n\nexport default config\n`\n\nconst ignoreConfig = `node_modules\npublic\ndist\nbuild\ngenerated\n.next\n.vscode\n.generated\n`\n\n/**\n * prettier 配置生成器参数\n */\nexport type GetPrettierConfigParams = {\n /** 是否使用 tailwind */\n tailwind: boolean\n /** 是否使用了本地 @images 类似的别名 */\n atAlias: boolean\n /** 是否是 next 项目 */\n next: boolean\n /** 是否是 react 项目 */\n react: boolean\n}\n\n/**\n * 生成 prettier 配置文件内容\n * @param params 配置参数\n */\nexport function getPrettierConfig({ tailwind, atAlias, next, react }: GetPrettierConfigParams) {\n const plugins = [\"@prettier/plugin-oxc\", \"@ianvs/prettier-plugin-sort-imports\"]\n\n if (tailwind) plugins.push(\"prettier-plugin-tailwindcss\")\n\n const prettierConfigText = `// @ts-check\n${\n atAlias\n ? `\nimport { readFileSync } from \"fs\"`\n : \"\"\n}\nimport { parse } from \"path\"\nimport { globSync } from \"glob\"\n\n/**\n * 数组去重\n * @template T - 数组的元素类型\n * @param {T[]} array - 输入的数组\n * @return {T[]} 新数组\n */\nfunction unique(array) {\n return Array.from(new Set(array))\n}\n\nconst jsExts = [\".js\", \".jsx\", \".ts\", \".tsx\", \".cjs\", \".mjs\", \".cts\", \".mts\", \".vue\"]\n\nconst assetExts = unique(\n globSync(\"**/*\", { ignore: [\"node_modules/**\"${next ? `, \".next/**\"` : \"\"}], withFileTypes: true, cwd: import.meta.dirname })\n .filter(path => path.isFile() && !jsExts.some(ext => path.name.toLowerCase().endsWith(ext)))\n .map(path => parse(path.name).ext.slice(1))\n .filter(ext => ext !== \"\"),\n)\n\nconst assetExtsRegStr = \\`\\\\\\\\.(\\${assetExts.join(\"|\")}|\\${assetExts.join(\"|\").toUpperCase()})\\`\n\nconst assetQueryRegStr = \"(\\\\\\\\?[a-zA-Z0-9]+)?\"\n${\n atAlias\n ? `\nconst namespaces = unique(\n unique(\n globSync(\"**/package.json\", { withFileTypes: true, cwd: import.meta.dirname })\n .filter(path => path.isFile())\n .map(path => path.fullpath()),\n )\n .map(path => JSON.parse(readFileSync(path, \"utf8\")))\n .map(json =>\n Object.keys({\n ...json.dependencies,\n ...json.devDependencies,\n ...json.peerDependencies,\n ...json.optionalDependencies,\n }),\n )\n .flat()\n .filter(dep => dep.startsWith(\"@\"))\n .map(dep => dep.split(\"/\")[0].slice(1)),\n)\n`\n : \"\"\n}\nconst folders = unique(\n globSync(\"**/*\", { withFileTypes: true, cwd: import.meta.dirname, ignore: [\"node_modules/**\"${next ? `, \".next/**\"` : \"\"}] })\n .filter(path => path.isDirectory())\n .map(path => path.name),\n).sort()\n\n/**\n * @type {import(\"prettier\").Options}\n */\nconst config = {\n semi: false,\n tabWidth: 4,\n arrowParens: \"avoid\",\n printWidth: 160,\n plugins: [${plugins.map(plugin => `\"${plugin}\"`).join(\", \")}],\n importOrder: [${\n react\n ? `\n \"^react(/.+)?$\",\n \"^react-dom(/.+)?$\",\n \"^react-native(/.+)?$\",`\n : \"\"\n }\n \"<BUILTIN_MODULES>\",\n ${atAlias ? `\\`^@(\\${namespaces.join(\"|\")})/\\`,` : `\"^@[^/]\",`}\n \"<THIRD_PARTY_MODULES>\",\n ...folders.map(folder => [\"\", \\`^@/?\\${folder}(.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr}))?$\\`]).flat(),\n \"\",\n \\`^@/.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr})$\\`,\n \\`^\\\\\\\\.{1,2}/.+?(?<!\\${assetExtsRegStr}\\${assetQueryRegStr})$\\`,\n \"\",\n \\`^@/.+?\\${assetExtsRegStr}\\${assetQueryRegStr}$\\`,\n \\`^\\\\\\\\.{1,2}/.+?\\${assetExtsRegStr}\\${assetQueryRegStr}$\\`,\n ],\n importOrderParserPlugins: [\"typescript\", \"jsx\", \"decorators-legacy\"],\n importOrderTypeScriptVersion: \"5.0.0\",\n importOrderCaseSensitive: true,\n}\n\nexport default config\n`\n return prettierConfigText\n}\n\n/**\n * 添加 prettier 相关配置\n * 包括安装依赖、创建配置文件等\n */\nexport async function addPrettier() {\n consola.start(\"开始添加 prettier 配置\")\n const packageJson = await readPackageJson()\n const tailwind =\n Object.keys(packageJson.dependencies ?? {}).includes(\"tailwindcss\") || Object.keys(packageJson.devDependencies ?? {}).includes(\"tailwindcss\")\n let atAlias = false\n try {\n const config = await readTsConfig()\n atAlias = Object.keys(config.compilerOptions?.paths ?? {}).some(path => /^@[a-zA-Z]/.test(path))\n } catch (error) {}\n const next = await hasDependency(\"next\")\n const react = await hasDependency(\"react\")\n await writeFile(\"prettier.config.mjs\", originalConfig, \"utf-8\")\n await writeFile(\".prettierrc.mjs\", getPrettierConfig({ tailwind, atAlias, next, react }), \"utf-8\")\n await writeFile(\".prettierignore\", ignoreConfig, \"utf-8\")\n const config2: AddDependenciesConfig = {\n package: [\"prettier\", \"@prettier/plugin-oxc\", \"@ianvs/prettier-plugin-sort-imports\", \"glob\", \"prettier-plugin-organize-imports\"],\n type: \"devDependencies\",\n }\n if (tailwind) (config2.package as string[]).push(\"prettier-plugin-tailwindcss\")\n await addDependency(config2)\n const packageJson2 = await readPackageJson()\n packageJson2.scripts ??= {}\n packageJson2.scripts.format = \"prettier --config prettier.config.mjs --write . && prettier --config .prettierrc.mjs --write .\"\n await writePackageJson({ data: packageJson2 })\n await installDependceny()\n consola.success(\"添加 prettier 配置成功\")\n}\n"],
|
|
5
5
|
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAA0B;AAC1B,qBAAoB;AAEpB,2BAAqD;AAErD,2BAA8B;AAC9B,+BAAkC;AAClC,6BAAgC;AAChC,0BAA6B;AAC7B,8BAAiC;AAEjC,IAAM,iBAAiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAgBvB,IAAM,eAAe;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA4Bd,SAAS,kBAAkB,EAAE,UAAU,SAAS,MAAM,MAAM,GAA4B;AAC3F,QAAM,UAAU,CAAC,wBAAwB,qCAAqC;AAE9E,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,UAAM,oCAAc,MAAM;AACvC,QAAM,QAAQ,UAAM,oCAAc,OAAO;AACzC,YAAM,2BAAU,uBAAuB,gBAAgB,OAAO;AAC9D,YAAM,2BAAU,mBAAmB,kBAAkB,EAAE,UAAU,SAAS,MAAM,MAAM,CAAC,GAAG,OAAO;AACjG,YAAM,2BAAU,mBAAmB,cAAc,OAAO;AACxD,QAAM,UAAiC;AAAA,IACnC,SAAS,CAAC,YAAY,wBAAwB,uCAAuC,QAAQ,kCAAkC;AAAA,IAC/H,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,SAAS;AAC9B,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
|
@@ -186,7 +186,7 @@ export async function addPrettier() {
|
|
|
186
186
|
await addDependency(config2)
|
|
187
187
|
const packageJson2 = await readPackageJson()
|
|
188
188
|
packageJson2.scripts ??= {}
|
|
189
|
-
packageJson2.scripts.format = "prettier --config
|
|
189
|
+
packageJson2.scripts.format = "prettier --config prettier.config.mjs --write . && prettier --config .prettierrc.mjs --write ."
|
|
190
190
|
await writePackageJson({ data: packageJson2 })
|
|
191
191
|
await installDependceny()
|
|
192
192
|
consola.success("添加 prettier 配置成功")
|