@cherepanov.pavel/shareable-config 1.0.3 → 1.0.5

package/.editorconfig

@@ -6,6 +6,5 @@ indent_size = tab
 tab_width = 2
 end_of_line = lf
 charset = utf-8
-# set later
-# trim_trailing_whitespace = true
-# insert_final_newline = false
+trim_trailing_whitespace = true
+insert_final_newline = true

package/.editorconfig-get.js

@@ -13,7 +13,7 @@ const src = path.join(dirname, fileName);
 const srcFileData = await readFile(src, 'utf8');
 
 copyWithOverride({
-  destFile,
-  srcFileData,
-  fileLabel: fileName,
+	destFile,
+	srcFileData,
+	fileLabel: fileName,
 });

package/.get-all.js

@@ -4,12 +4,12 @@ import { spawnSync } from 'child_process';
 import { readFile } from 'fs/promises';
 
 const commands = [
-  'get-editorconfig',
-  'get-gitattributes',
-  'get-gitignore',
-  'get-extensions',
-  'get-settings',
-  'get-code-snippets',
+	'get-editorconfig',
+	'get-gitattributes',
+	'get-gitignore',
+	'get-extensions',
+	'get-settings',
+	'get-code-snippets',
 ];
 
 let hasError = false;
@@ -17,13 +17,17 @@ let hasError = false;
 const pkg = JSON.parse(await readFile(new URL('./package.json', import.meta.url), 'utf8'));
 
 commands.forEach((cmd) => {
-  const result = spawnSync('npx', ['-p', pkg.name, cmd], { stdio: 'inherit' });
-  if (result.status !== 0) {
-    console.error(`\nОшибка при выполнении команды: ${cmd}`);
-    hasError = true;
-  }
+	const result = spawnSync('npx', [
+		'-p',
+		pkg.name,
+		cmd,
+	], { stdio: 'inherit' });
+	if (result.status !== 0) {
+		console.error(`\nОшибка при выполнении команды: ${cmd}`);
+		hasError = true;
+	}
 });
 
 if (hasError) {
-  process.exit(1);
+	process.exit(1);
 }

package/.gitattributes-get.js

@@ -13,7 +13,7 @@ const src = path.join(dirname, fileName);
 const srcFileData = await readFile(src, 'utf8');
 
 copyWithOverride({
-  destFile,
-  srcFileData,
-  fileLabel: fileName,
+	destFile,
+	srcFileData,
+	fileLabel: fileName,
 });

package/.gitignore-get.js

@@ -10,38 +10,41 @@ const fileName = '.gitignore';
 const destFile = path.join(process.cwd(), fileName);
 
 async function getGitignoreFileData(framework) {
-  const dirname = path.dirname(fileURLToPath(import.meta.url));
-  const src = path.join(dirname, '.npmignore');
-  const srcFileData = await readFile(src, 'utf8');
-
-  const [commonData] = srcFileData.split(/^#\s*\w+/mu);
-
-  if (!framework) {
-    return commonData.trim();
-  }
-
-  const sections = srcFileData.split(/^#\s*/mu).slice(1);
-  const matchedSection = sections.find((section) => {
-    const [header] = section.split('\n');
-    return header.trim().toLowerCase() === framework;
-  });
-
-  if (matchedSection) {
-    const [header, ...body] = matchedSection.split('\n');
-    return `${commonData.trim()}\n\n# ${header}\n${body.join('\n').trim()}`.trim();
-  }
-  // Если не найдено — только общий контент
-  return commonData.trim();
+	const dirname = path.dirname(fileURLToPath(import.meta.url));
+	const src = path.join(dirname, '.npmignore');
+	const srcFileData = await readFile(src, 'utf8');
+
+	const [commonData] = srcFileData.split(/^#\s*\w+/mu);
+
+	if (!framework) {
+		return commonData.trim();
+	}
+
+	const sections = srcFileData.split(/^#\s*/mu).slice(1);
+	const matchedSection = sections.find((section) => {
+		const [header] = section.split('\n');
+		return header.trim().toLowerCase() === framework;
+	});
+
+	if (matchedSection) {
+		const [
+			header,
+			...body
+		] = matchedSection.split('\n');
+		return `${commonData.trim()}\n\n# ${header}\n${body.join('\n').trim()}`.trim();
+	}
+	// Если не найдено — только общий контент
+	return commonData.trim();
 }
 
 try {
-  const { repositoryFramework } = await getEnvs();
-  const srcFileData = await getGitignoreFileData(repositoryFramework);
-  await copyWithOverride({
-    destFile,
-    srcFileData,
-    fileLabel: fileName,
-  });
+	const { repositoryFramework } = await getEnvs();
+	const srcFileData = await getGitignoreFileData(repositoryFramework);
+	await copyWithOverride({
+		destFile,
+		srcFileData,
+		fileLabel: fileName,
+	});
 } catch (err) {
-  console.error('Ошибка:', err.message);
+	console.error('Ошибка:', err.message);
 }

package/.vscode/.code-snippets-get.js

@@ -8,42 +8,45 @@ import { getHeader } from '../utils/file-header.js';
 import { getSrcJSONFileData } from '../utils/file.js';
 import { getEnvs } from '../utils/env.js';
 
-const fileNames = ['vue.code-snippets', 'all-files.code-snippets'];
+const fileNames = [
+	'vue.code-snippets',
+	'all-files.code-snippets',
+];
 
 try {
-  const {
-    isRepositoryUseTypescript: isTs,
-  } = await getEnvs();
+	const {
+		isRepositoryUseTypescript: isTs,
+	} = await getEnvs();
 
-  fileNames.forEach(async (fileName) => {
-    const srcFileData = await getSrcJSONFileData({
-      fileName,
-      isTs,
-      removeDuplicateKeys: fileName === 'vue.code-snippets',
-    });
+	fileNames.forEach(async (fileName) => {
+		const srcFileData = await getSrcJSONFileData({
+			fileName,
+			isTs,
+			removeDuplicateKeys: fileName === 'vue.code-snippets',
+		});
 
-    const destFile = path.join(process.cwd(), `.vscode/${fileName}`);
-    let destFileData;
-    let isDestFileHaveOverride;
-    try {
-      destFileData = await readFile(destFile, 'utf8');
-      isDestFileHaveOverride = destFileData.includes('// override');
-    } catch (err) {}
+		const destFile = path.join(process.cwd(), `.vscode/${fileName}`);
+		let destFileData;
+		let isDestFileHaveOverride;
+		try {
+			destFileData = await readFile(destFile, 'utf8');
+			isDestFileHaveOverride = destFileData.includes('// override');
+		} catch (err) {}
 
-    let result;
-    if (isDestFileHaveOverride) {
-      result = await mergeWithOverride(srcFileData, destFileData);
-    } else {
-      result = srcFileData;
-    }
+		let result;
+		if (isDestFileHaveOverride) {
+			result = await mergeWithOverride(srcFileData, destFileData);
+		} else {
+			result = srcFileData;
+		}
 
-    await outputFile(destFile, `${getHeader()}${result}`);
-    if (isDestFileHaveOverride) {
-      console.info(`${fileName} обновлён с учётом override`);
-    } else {
-      console.info(`${fileName} пересоздан`);
-    }
-  });
+		await outputFile(destFile, `${getHeader()}${result}`);
+		if (isDestFileHaveOverride) {
+			console.info(`${fileName} обновлён с учётом override`);
+		} else {
+			console.info(`${fileName} пересоздан`);
+		}
+	});
 } catch (err) {
-  console.error('Ошибка:', err.message);
+	console.error('Ошибка:', err.message);
 }

package/.vscode/extensions.json

@@ -1,25 +1,25 @@
 {
-  "recommendations": [
-    // "eamodio.gitlens",
+	"recommendations": [
+		// "eamodio.gitlens",
 
-    // typescript
-    "johnsoncodehk.vscode-tsconfig-helper",
-    // typescript
-    "yoavbls.pretty-ts-errors",
-    "vue.volar",
-    "mrmlnc.vscode-scss",
-    "ms-azuretools.vscode-containers",
-    // "redhat.vscode-yaml",
-    "savh.json5-kit",
+		// typescript
+		"johnsoncodehk.vscode-tsconfig-helper",
+		// typescript
+		"yoavbls.pretty-ts-errors",
+		"vue.volar",
+		"mrmlnc.vscode-scss",
+		"ms-azuretools.vscode-containers",
+		// "redhat.vscode-yaml",
+		"savh.json5-kit",
 
-    "editorconfig.editorconfig",
-    "dbaeumer.vscode-eslint",
-    "stylelint.vscode-stylelint",
+		"editorconfig.editorconfig",
+		"dbaeumer.vscode-eslint",
+		"stylelint.vscode-stylelint",
 
-    "streetsidesoftware.code-spell-checker",
-    "streetsidesoftware.code-spell-checker-russian"
+		"streetsidesoftware.code-spell-checker",
+		"streetsidesoftware.code-spell-checker-russian",
 
 		// need to check that it's working well
 		// iulian-radu-at.find-unused-exports
-  ],
+	],
 }

package/.vscode/extensions.json-get.js

@@ -12,32 +12,32 @@ const fileName = 'extensions.json';
 const destFile = path.join(process.cwd(), `.vscode/${fileName}`);
 
 try {
-  const {
-    isRepositoryUseTypescript: isTs,
-  } = await getEnvs();
-  const baseContent = await getSrcJSONFileData({
-    fileName,
-    isTs,
-  });
-  let overrideContent;
-  try {
-    const fileData = await readFile(destFile, 'utf8');
-    overrideContent = fileData.includes('// override') ? fileData : undefined;
-  } catch (err) {}
+	const {
+		isRepositoryUseTypescript: isTs,
+	} = await getEnvs();
+	const baseContent = await getSrcJSONFileData({
+		fileName,
+		isTs,
+	});
+	let overrideContent;
+	try {
+		const fileData = await readFile(destFile, 'utf8');
+		overrideContent = fileData.includes('// override') ? fileData : undefined;
+	} catch (err) {}
 
-  let result;
-  if (overrideContent) {
-    result = await mergeWithOverride(baseContent, overrideContent);
-  } else {
-    result = baseContent;
-  }
+	let result;
+	if (overrideContent) {
+		result = await mergeWithOverride(baseContent, overrideContent);
+	} else {
+		result = baseContent;
+	}
 
-  await outputFile(destFile, `${getHeader()}${result}`);
-  if (overrideContent) {
-    console.info(`${fileName} обновлён с учётом override`);
-  } else {
-    console.info(`${fileName} пересоздан`);
-  }
+	await outputFile(destFile, `${getHeader()}${result}`);
+	if (overrideContent) {
+		console.info(`${fileName} обновлён с учётом override`);
+	} else {
+		console.info(`${fileName} пересоздан`);
+	}
 } catch (err) {
-  console.error('Ошибка:', err.message);
+	console.error('Ошибка:', err.message);
 }

package/.vscode/settings.json

@@ -1,42 +1,53 @@
 {
+	"editor.renderWhitespace": "selection",
+	"editor.tabSize": 2,
 	"editor.linkedEditing": true,
-  "editor.suggestSelection": "recentlyUsed",
+	"editor.suggestSelection": "recentlyUsed",
 	"git.blame.editorDecoration.enabled": true,
 
 	"explorer.fileNesting.enabled": true,
 	"explorer.fileNesting.patterns": {
 		"frontend-configs.env.json5": "eslint.config.*s, stylelint.config.*s, .editorconfig",
-    ".env.*.local": ".env.*",
-    ".gitignore": ".gitattributes, lefthook.yml",
-    // ".gitlab-ci.yml": "Dockerfile, .releaserc.template.yaml",
-    "package.json": ".npmrc, package-lock.json",
-    "README.md": "*.md",
-    // typescript
-    "tsconfig.json": "tsconfig.*.json, *.d.ts"
+		".env.*.local": ".env.*",
+		".gitignore": ".gitattributes, lefthook.yml",
+		// ".gitlab-ci.yml": "Dockerfile, .releaserc.template.yaml",
+		"package.json": ".npmrc, package-lock.json",
+		"README.md": "*.md",
+		// typescript
+		"tsconfig.json": "tsconfig.*.json, *.d.ts",
 	},
 
 	"javascript.preferences.importModuleSpecifier": "non-relative",
-  // typescript
-  "typescript.preferences.importModuleSpecifier": "non-relative",
-  // typescript
-  "typescript.tsdk": "./node_modules/typescript/lib",
-  // typescript
-  "typescript.enablePromptUseWorkspaceTsdk": true,
+	// typescript
+	"typescript.preferences.importModuleSpecifier": "non-relative",
+	// typescript
+	"typescript.tsdk": "./node_modules/typescript/lib",
+	// typescript
+	"typescript.enablePromptUseWorkspaceTsdk": true,
 
 	"json.validate.enable": false,
-  "editor.formatOnSave": false,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit",
-    "source.fixAll.stylelint": "explicit",
-  },
+	"editor.formatOnSave": false,
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": "explicit",
+		"source.fixAll.stylelint": "explicit",
+	},
+	"eslint.validate": [
+		"javascript",
+		"typescript",
+		"html",
+		"vue",
+		"json",
+		"jsonc",
+		"json5",
+	],
 	// "stylelint.validate": [
-  //   "css",
-  //   "scss",
-  //   "vue"
-  // ],
-
+	//   "css",
+	//   "scss",
+	//   "vue"
+	// ],
+	"cSpell.language": "en,ru",
 	"cSpell.words": [
-			"Cherepanov",
-			"Pavel"
+		"Cherepanov",
+		"Pavel",
 	],
-}
+}

package/.vscode/settings.json-get.js

@@ -12,32 +12,32 @@ const fileName = 'settings.json';
 const destFile = path.join(process.cwd(), `.vscode/${fileName}`);
 
 try {
-  const {
-    isRepositoryUseTypescript: isTs,
-  } = await getEnvs();
-  const baseContent = await getSrcJSONFileData({
-    fileName,
-    isTs,
-  });
-  let overrideContent;
-  try {
-    const fileData = await readFile(destFile, 'utf8');
-    overrideContent = fileData.includes('// override') ? fileData : undefined;
-  } catch (err) {}
+	const {
+		isRepositoryUseTypescript: isTs,
+	} = await getEnvs();
+	const baseContent = await getSrcJSONFileData({
+		fileName,
+		isTs,
+	});
+	let overrideContent;
+	try {
+		const fileData = await readFile(destFile, 'utf8');
+		overrideContent = fileData.includes('// override') ? fileData : undefined;
+	} catch (err) {}
 
-  let result;
-  if (overrideContent) {
-    result = await mergeWithOverride(baseContent, overrideContent);
-  } else {
-    result = baseContent;
-  }
+	let result;
+	if (overrideContent) {
+		result = await mergeWithOverride(baseContent, overrideContent);
+	} else {
+		result = baseContent;
+	}
 
-  await outputFile(destFile, `${getHeader()}${result}`);
-  if (overrideContent) {
-    console.info(`${fileName} обновлён с учётом override`);
-  } else {
-    console.info(`${fileName} пересоздан`);
-  }
+	await outputFile(destFile, `${getHeader()}${result}`);
+	if (overrideContent) {
+		console.info(`${fileName} обновлён с учётом override`);
+	} else {
+		console.info(`${fileName} пересоздан`);
+	}
 } catch (err) {
-  console.error('Ошибка:', err.message);
+	console.error('Ошибка:', err.message);
 }

package/env.json5.set.js

@@ -5,7 +5,7 @@ import { getEnvs, setEnvs } from './utils/env.js';
 
 let envs = {};
 try {
-  envs = await getEnvs();
+	envs = await getEnvs();
 } catch (err) {}
 
 envs.isRepositoryUseTypescript = await askTypescript();

package/jsconfig.json

@@ -1,9 +1,6 @@
 {
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./*"]
-    }
-  },
-  "exclude": ["node_modules"]
+	"compilerOptions": {
+		"baseUrl": "."
+	},
+	"exclude": ["node_modules"]
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@cherepanov.pavel/shareable-config",
 	"description": "setup for new repositories",
-	"version": "1.0.3",
+	"version": "1.0.5",
 	"type": "module",
 	"devEngines": {
 		"packageManager": {
@@ -41,6 +41,14 @@
 		"get-settings": "./.vscode/settings.json-get.js",
 		"get-code-snippets": "./.vscode/.code-snippets-get.js"
 	},
+	"scripts": {
+		"lint": "run-p -lc lint:js lint:css",
+		"lint:fix": "run-p -lc lint:js:fix lint:css:fix lint:types",
+		"lint:js": "eslint",
+		"lint:js:fix": "npm run lint:js -- --fix",
+		"lint:css": "stylelint \"./**/*.{css,vue}\" --ignore-path .gitignore --formatter verbose",
+		"lint:css:fix": "npm run lint:css:files -- --fix"
+	},
 	"dependencies": {
 		"@eslint/compat": "2.1.0",
 		"@stylistic/eslint-plugin": "5.10.0",
@@ -48,6 +56,7 @@
 		"@typescript-eslint/eslint-plugin": "^8.66.0",
 		"@typescript-eslint/parser": "^8.66.0",
 		"eslint": "^10.8.1",
+		"eslint-plugin-jsonc": "^3.4.1",
 		"eslint-plugin-vue": "^10.10.0",
 		"fs-extra": "^11.4.0",
 		"globals": "^17.9.0",

package/tools/eslint-config/configs/global.js

@@ -1,26 +1,29 @@
 import { defineConfig } from 'eslint/config';
-import { includeIgnoreFile } from '@eslint/compat';
+import { includeIgnoreFile } from '@eslint/config-helpers';
 import path from 'path';
 import globals from 'globals';
 
 const gitignorePath = path.join(process.cwd(), '.gitignore');
 
 export default defineConfig([
-  includeIgnoreFile(gitignorePath),
-  {
-    name: 'Additional .gitignore patterns',
-    ignores: [
-      'public/js/*',
-      '**/*.code-snippets'
-    ],
-  },
-  {
-    files: ['**/*.*js', '**/*.*vue'],
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...globals.node,
-      },
-    },
-  },
+	includeIgnoreFile(gitignorePath),
+	{
+		name: 'Additional .gitignore patterns',
+		ignores: [
+			'public/js/*',
+			'**/*.code-snippets',
+		],
+	},
+	{
+		files: [
+			'**/*.*js',
+			'**/*.*vue',
+		],
+		languageOptions: {
+			globals: {
+				...globals.browser,
+				...globals.node,
+			},
+		},
+	},
 ]);

package/tools/eslint-config/configs/javascript.js

@@ -4,18 +4,18 @@ import { jsRules } from '../rules/javascript/index.js';
 import { jsFormatting } from '../rules/stylistic/index.js';
 
 export default {
-  files: ['**/*.*js'],
-  plugins: {
-    '@stylistic': stylisticPlugin,
-  },
-  languageOptions: {
-    sourceType: 'module',
-    parserOptions: {
-      sourceType: 'module',
-    },
-  },
-  rules: {
-    ...jsRules,
-    ...jsFormatting,
-  },
+	files: ['**/*.*js'],
+	plugins: {
+		'@stylistic': stylisticPlugin,
+	},
+	languageOptions: {
+		sourceType: 'module',
+		parserOptions: {
+			sourceType: 'module',
+		},
+	},
+	rules: {
+		...jsRules,
+		...jsFormatting,
+	},
 };