create-arui-scripts-app 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+# create-arui-scripts-app
+
+## 1.1.0
+
+### Minor Changes
+
+-   [#566](https://github.com/core-ds/arui-scripts/pull/566) [`d5de571`](https://github.com/core-ds/arui-scripts/commit/d5de571bf16582ad78258d3b35acbc08d7da42a4) Thanks [@dmitrbrvsk](https://github.com/dmitrbrvsk)! - добавлена возможность подключать пакет arui-presets-lint (https://github.com/core-ds/arui-presets-lint/tree/master/packages/arui-presets-lint)
+
+## 1.0.0
+
+### Major Changes
+
+-   [#552](https://github.com/core-ds/arui-scripts/pull/552) [`3658e49`](https://github.com/core-ds/arui-scripts/commit/3658e49b0b752c592e738726aa8056569e28e19b) Thanks [@dmitrbrvsk](https://github.com/dmitrbrvsk)! - Добавлен пакет `create-arui-scripts-app` для генерации нового приложения через CLI. В `arui-scripts` CLI был переведен на commander.

package/README.md

@@ -35,7 +35,7 @@ npx create-arui-scripts-app my-app --yes
 - `--css-modules` / `--no-css-modules` - CSS-модули
 - `--client-port` / `--server-port` - порты клиента и сервера
 - `--docker-registry` / `--presets` - docker registry и preset
-- `--polyfills` / `--react-compiler` / `--install` - и соответствующие `--no-*`
+- `--polyfills` / `--react-compiler` / `--lint` / `--install` - и соответствующие `--no-*`
 
 ## Что настраивает мастер
 
@@ -44,15 +44,24 @@ npx create-arui-scripts-app my-app --yes
 - SSR-сервер на **Hapi** с рендерингом приложения (`renderToString`) и гидрацией на клиенте
 - транспилятор (**swc** / babel / tsc) и тест-раннер (**Jest** / Vitest)
 - CSS-модули, полифилы (`core-js`), `experimentalReactCompiler`, docker registry, preset
+- опционально **arui-presets-lint** (eslint, prettier, stylelint, knip, secretlint, lefthook)
 - опциональная установка зависимостей сразу после генерации
 
+Пример с линтерами:
+
+```bash
+npx create-arui-scripts-app my-app --yes --lint --install
+```
+
 ## Результат
 
 Генерируются `package.json`, `arui-scripts.config.ts`, `tsconfig.json`, клиентская точка входа,
 пример компонента со стилями и тестом, `global-definitions.d.ts`, `.gitignore`, `README.md`,
 `.yarnrc.yml` (с `nodeLinker: node-modules`),
-а также в зависимости от ответов - серверная точка входа на Hapi, store на RTK, полифилы и
-`vitest.config.ts`.
+а также в зависимости от ответов - серверная точка входа на Hapi, store на RTK, полифилы,
+`vitest.config.ts` и конфиги `arui-presets-lint` (`eslint.config.mts`, `knip.ts`,
+`.secretlintrc.json`, `lefthook.yml`).
 
 Дальнейшая сборка и запуск через команды `arui-scripts` в созданном проекте.
 См. [документацию arui-scripts](../arui-scripts/README.md).
+При подключении lint: `yarn lint` / `yarn lint:fix`.

package/build/build-context.js

@@ -23,6 +23,7 @@ const VERSIONS = {
     tsJest: '^29.1.0',
     typesJest: '^29.5.0',
     vitest: '^4.1.5',
+    aruiPresetsLint: '^11.0.0',
 };
 function buildContext(answers, aruiScriptsVersion) {
     const dependencies = {
@@ -63,6 +64,9 @@ function buildContext(answers, aruiScriptsVersion) {
     else {
         devDependencies.vitest = VERSIONS.vitest;
     }
+    if (answers.useLint) {
+        devDependencies['arui-presets-lint'] = VERSIONS.aruiPresetsLint;
+    }
     return {
         name: answers.name,
         useRtk: answers.useRtk,
@@ -76,6 +80,7 @@ function buildContext(answers, aruiScriptsVersion) {
         presets: answers.presets.trim(),
         polyfills: answers.polyfills,
         reactCompiler: answers.reactCompiler,
+        useLint: answers.useLint,
         aruiScriptsVersion,
         dependencies,
         devDependencies,

package/build/build-file-map.js

@@ -7,6 +7,7 @@ const app_styles_template_1 = require("./templates/app-styles.template");
 const app_test_template_1 = require("./templates/app-test.template");
 const arui_scripts_config_template_1 = require("./templates/arui-scripts-config.template");
 const client_entry_template_1 = require("./templates/client-entry.template");
+const lint_template_1 = require("./templates/lint.template");
 const misc_template_1 = require("./templates/misc.template");
 const package_json_template_1 = require("./templates/package-json.template");
 const server_entry_template_1 = require("./templates/server-entry.template");
@@ -29,7 +30,7 @@ function buildFileMap(ctx) {
         [`${client}/index.tsx`]: (0, client_entry_template_1.clientEntryTemplate)(ctx),
         [`${client}/components/app.tsx`]: (0, app_component_template_1.appComponentTemplate)(ctx),
         [`${client}/components/${(0, app_styles_template_1.appStylesFileName)(ctx)}`]: (0, app_styles_template_1.appStylesTemplate)(ctx),
-        [`${client}/components/__tests__/app.test.tsx`]: (0, app_test_template_1.appTestTemplate)(ctx),
+        [`${client}/components/__tests__/app.test.ts`]: (0, app_test_template_1.appTestTemplate)(ctx),
     };
     if (!ctx.clientOnly) {
         files['src/server/index.tsx'] = (0, server_entry_template_1.serverEntryTemplate)(ctx);
@@ -45,5 +46,11 @@ function buildFileMap(ctx) {
         files[`${client}/store/hooks.ts`] = (0, store_template_1.storeHooksTemplate)();
         files[`${client}/store/counter-slice.ts`] = (0, store_template_1.counterSliceTemplate)();
     }
+    if (ctx.useLint) {
+        files['eslint.config.mts'] = (0, lint_template_1.eslintConfigTemplate)();
+        files['knip.ts'] = (0, lint_template_1.knipConfigTemplate)();
+        files['.secretlintrc.json'] = (0, lint_template_1.secretlintConfigTemplate)();
+        files['lefthook.yml'] = (0, lint_template_1.lefthookConfigTemplate)();
+    }
     return files;
 }

package/build/create-program.js

@@ -41,6 +41,8 @@ function createProgram(onInit = defaultInitHandler) {
         .option('--no-polyfills', 'Без полифилов')
         .option('--react-compiler', 'Включить experimentalReactCompiler')
         .option('--no-react-compiler', 'Выключить experimentalReactCompiler')
+        .option('--lint', 'Подключить arui-presets-lint')
+        .option('--no-lint', 'Без arui-presets-lint')
         .option('--install', 'Установить зависимости после генерации')
         .option('--no-install', 'Не устанавливать зависимости')
         .showHelpAfterError('(используйте --help для справки)')
@@ -96,6 +98,9 @@ function mapOptsToFlags(opts) {
     if (typeof opts.reactCompiler === 'boolean') {
         flags.reactCompiler = opts.reactCompiler;
     }
+    if (typeof opts.lint === 'boolean') {
+        flags.useLint = opts.lint;
+    }
     if (typeof opts.install === 'boolean') {
         flags.install = opts.install;
     }

package/build/defaults.d.ts

@@ -14,6 +14,7 @@ export type CliFlags = {
     presets?: string;
     polyfills?: boolean;
     reactCompiler?: boolean;
+    useLint?: boolean;
     install?: boolean;
 };
 export declare function defaultAnswers(name: string): InitAnswers;

package/build/defaults.js

@@ -17,6 +17,7 @@ function defaultAnswers(name) {
         presets: '',
         polyfills: false,
         reactCompiler: false,
+        useLint: false,
         install: false,
     };
 }
@@ -33,6 +34,7 @@ const ANSWER_FLAG_KEYS = [
     'presets',
     'polyfills',
     'reactCompiler',
+    'useLint',
     'install',
 ];
 function hasAnswerFlags(flags) {
@@ -42,7 +44,7 @@ function hasAnswerFlags(flags) {
 function answersFromFlags(defaultName, flags) {
     var _a, _b;
     const base = defaultAnswers(((_a = flags.name) === null || _a === void 0 ? void 0 : _a.trim()) || defaultName);
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, base), (flags.useRtk === undefined ? {} : { useRtk: flags.useRtk })), (flags.clientOnly === undefined ? {} : { clientOnly: flags.clientOnly })), (flags.codeLoader === undefined ? {} : { codeLoader: flags.codeLoader })), (flags.testRunner === undefined ? {} : { testRunner: flags.testRunner })), (flags.cssModules === undefined ? {} : { cssModules: flags.cssModules })), (flags.clientServerPort === undefined
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, base), (flags.useRtk === undefined ? {} : { useRtk: flags.useRtk })), (flags.clientOnly === undefined ? {} : { clientOnly: flags.clientOnly })), (flags.codeLoader === undefined ? {} : { codeLoader: flags.codeLoader })), (flags.testRunner === undefined ? {} : { testRunner: flags.testRunner })), (flags.cssModules === undefined ? {} : { cssModules: flags.cssModules })), (flags.clientServerPort === undefined
         ? {}
-        : { clientServerPort: flags.clientServerPort })), (flags.serverPort === undefined ? {} : { serverPort: flags.serverPort })), (flags.dockerRegistry === undefined ? {} : { dockerRegistry: flags.dockerRegistry })), (flags.presets === undefined ? {} : { presets: flags.presets })), (flags.polyfills === undefined ? {} : { polyfills: flags.polyfills })), (flags.reactCompiler === undefined ? {} : { reactCompiler: flags.reactCompiler })), (flags.install === undefined ? {} : { install: flags.install })), { name: (((_b = flags.name) === null || _b === void 0 ? void 0 : _b.trim()) || defaultName).trim() });
+        : { clientServerPort: flags.clientServerPort })), (flags.serverPort === undefined ? {} : { serverPort: flags.serverPort })), (flags.dockerRegistry === undefined ? {} : { dockerRegistry: flags.dockerRegistry })), (flags.presets === undefined ? {} : { presets: flags.presets })), (flags.polyfills === undefined ? {} : { polyfills: flags.polyfills })), (flags.reactCompiler === undefined ? {} : { reactCompiler: flags.reactCompiler })), (flags.useLint === undefined ? {} : { useLint: flags.useLint })), (flags.install === undefined ? {} : { install: flags.install })), { name: (((_b = flags.name) === null || _b === void 0 ? void 0 : _b.trim()) || defaultName).trim() });
 }

package/build/install-dependencies.d.ts

@@ -1,3 +1,5 @@
 export type PackageManager = 'yarn' | 'npm';
 export declare function detectPackageManager(): PackageManager;
 export declare function installDependencies(targetDir: string, packageManager?: PackageManager): Promise<void>;
+export declare function hasGitRepository(targetDir: string): boolean;
+export declare function installLefthook(targetDir: string): Promise<void>;

package/build/install-dependencies.js

@@ -5,17 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectPackageManager = detectPackageManager;
 exports.installDependencies = installDependencies;
+exports.hasGitRepository = hasGitRepository;
+exports.installLefthook = installLefthook;
 const child_process_1 = require("child_process");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const shelljs_1 = __importDefault(require("shelljs"));
 function detectPackageManager() {
     return shelljs_1.default.which('yarn') ? 'yarn' : 'npm';
 }
-function installDependencies(targetDir, packageManager = detectPackageManager()) {
-    const args = packageManager === 'yarn' ? [] : ['install'];
+function runCommand(command, args, cwd) {
     return new Promise((resolve, reject) => {
         var _a, _b;
-        const child = (0, child_process_1.spawn)(packageManager, args, {
-            cwd: targetDir,
+        const child = (0, child_process_1.spawn)(command, args, {
+            cwd,
             stdio: ['ignore', 'pipe', 'pipe'],
             // для windows
             shell: process.platform === 'win32',
@@ -32,8 +35,18 @@ function installDependencies(targetDir, packageManager = detectPackageManager())
                 resolve();
             }
             else {
-                reject(new Error(`${packageManager} ${args.join(' ')} завершился с кодом ${code}\n${output.trim()}`));
+                reject(new Error(`${command} ${args.join(' ')} завершился с кодом ${code}\n${output.trim()}`));
             }
         });
     });
 }
+function installDependencies(targetDir, packageManager = detectPackageManager()) {
+    const args = packageManager === 'yarn' ? [] : ['install'];
+    return runCommand(packageManager, args, targetDir);
+}
+function hasGitRepository(targetDir) {
+    return fs_1.default.existsSync(path_1.default.join(targetDir, '.git'));
+}
+function installLefthook(targetDir) {
+    return runCommand('npx', ['--no-install', 'lefthook', 'install'], targetDir);
+}

package/build/questions.js

@@ -114,6 +114,14 @@ function getQuestions(defaultName, prefill = {}) {
             active: 'да',
             inactive: 'нет',
         },
+        {
+            type: unlessAnswered('useLint', 'toggle'),
+            name: 'useLint',
+            message: 'Подключить arui-presets-lint',
+            initial: false,
+            active: 'да',
+            inactive: 'нет',
+        },
         {
             type: unlessAnswered('install', 'toggle'),
             name: 'install',

package/build/run.js

@@ -67,10 +67,32 @@ function runInit() {
                 spinner.fail(chalk_1.default.red('Не удалось установить зависимости'));
                 throw error;
             }
+            if (initAnswers.useLint) {
+                yield tryInstallLefthook(targetDir);
+            }
         }
         printNextSteps(targetDir, baseCwd, initAnswers, packageManager);
     });
 }
+function tryInstallLefthook(targetDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!(0, install_dependencies_1.hasGitRepository)(targetDir)) {
+            console.log(`  ${chalk_1.default.dim('lefthook: пропущено (нет .git). После git init выполните: npx --no-install lefthook install')}`);
+            return;
+        }
+        const spinner = (0, ora_1.default)({ text: 'Устанавливаю git-хуки lefthook…', color: 'cyan' }).start();
+        try {
+            yield (0, install_dependencies_1.installLefthook)(targetDir);
+            spinner.succeed(chalk_1.default.green('Git-хуки lefthook установлены'));
+        }
+        catch (error) {
+            spinner.fail(chalk_1.default.yellow('Не удалось установить lefthook'));
+            if (error instanceof Error && error.message) {
+                console.log(`  ${chalk_1.default.dim(error.message)}`);
+            }
+        }
+    });
+}
 function resolveAnswers(defaultName, flags) {
     return __awaiter(this, void 0, void 0, function* () {
         const base = (0, defaults_1.answersFromFlags)(defaultName, flags);
@@ -136,6 +158,9 @@ function mergePromptAnswers(base, answers) {
     if (answers.reactCompiler !== undefined) {
         merged.reactCompiler = Boolean(answers.reactCompiler);
     }
+    if (answers.useLint !== undefined) {
+        merged.useLint = Boolean(answers.useLint);
+    }
     if (answers.install !== undefined) {
         merged.install = Boolean(answers.install);
     }
@@ -153,6 +178,7 @@ function printSuccess(context, targetDir, fileCount) {
         chalk_1.default.dim(context.clientOnly ? 'clientOnly' : 'SSR'),
         chalk_1.default.dim(context.codeLoader),
         chalk_1.default.dim(context.testRunner),
+        ...(context.useLint ? [chalk_1.default.dim('lint')] : []),
     ].join(chalk_1.default.dim(' · '));
     console.log();
     console.log(`  ${chalk_1.default.green('✔')} ${chalk_1.default.bold('Готово!')} ${chalk_1.default.dim(`проект «${context.name}» создан`)}`);
@@ -181,6 +207,12 @@ function printNextSteps(targetDir, baseCwd, answers, packageManager) {
     if (!answers.install) {
         steps.push(installCommand);
     }
+    if (answers.useLint && (!answers.install || !(0, install_dependencies_1.hasGitRepository)(targetDir))) {
+        steps.push('npx --no-install lefthook install');
+    }
+    if (answers.useLint) {
+        steps.push(packageManager === 'yarn' ? 'yarn lint' : 'npm run lint');
+    }
     steps.push(startCommand);
     console.log();
     console.log(`  ${chalk_1.default.bold('Дальше')}`);

package/build/templates/app-component.template.js

@@ -1,42 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appComponentTemplate = appComponentTemplate;
+function tsString(value) {
+    return `'${value.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
+}
 function appComponentTemplate(ctx) {
     const styleImport = ctx.cssModules
         ? "import styles from './app.module.css';"
         : "import './app.css';";
     const rootClass = ctx.cssModules ? '{styles.root}' : "'app'";
     const titleClass = ctx.cssModules ? '{styles.title}' : "'app__title'";
+    const appNameLiteral = tsString(ctx.name);
     const coreImports = `import { Button } from '@alfalab/core-components/button';
 import { Gap } from '@alfalab/core-components/gap';
 import { Typography } from '@alfalab/core-components/typography';`;
     const view = (count) => `        <div className=${rootClass}>
             <Typography.Title view='medium' tag='h1' className=${titleClass}>
-                {${JSON.stringify(ctx.name)}}
+                {appName}
             </Typography.Title>
-
             <Gap size={16} />
-
             <Typography.Text view='primary-medium'>Счетчик: {${count}}</Typography.Text>
-
             <Gap size={16} />`;
     if (ctx.useRtk) {
         return `import React from 'react';
 
 ${coreImports}
 
-import { useAppDispatch, useAppSelector } from '../store/hooks';
 import { decrement, increment } from '../store/counter-slice';
+import { useAppDispatch, useAppSelector } from '../store/hooks';
 
 ${styleImport}
 
+const appName = ${appNameLiteral};
+
 export function App() {
     const count = useAppSelector((state) => state.counter.value);
     const dispatch = useAppDispatch();
 
     return (
 ${view('count')}
-
             <Button view='accent' size={48} onClick={() => dispatch(increment())}>
                 +1
             </Button>{' '}
@@ -54,12 +56,13 @@ ${coreImports}
 
 ${styleImport}
 
+const appName = ${appNameLiteral};
+
 export function App() {
     const [count, setCount] = useState(0);
 
     return (
 ${view('count')}
-
             <Button view='accent' size={48} onClick={() => setCount((prev) => prev + 1)}>
                 +1
             </Button>{' '}

package/build/templates/app-styles.template.js

@@ -8,24 +8,22 @@ function appStylesFileName(ctx) {
 function appStylesTemplate(ctx) {
     if (ctx.cssModules) {
         return `.root {
-    padding: 16px;
-    font-family: sans-serif;
+    padding: var(--gap-16);
 }
 
 .title {
-    margin: 0 0 12px;
-    font-size: 24px;
+    margin: var(--gap-0) var(--gap-0) var(--gap-12);
+    @mixin headline_small;
 }
 `;
     }
     return `.app {
-    padding: 16px;
-    font-family: sans-serif;
+    padding: var(--gap-16);
 }
 
 .app__title {
-    margin: 0 0 12px;
-    font-size: 24px;
+    margin: var(--gap-0) var(--gap-0) var(--gap-12);
+    @mixin headline_small;
 }
 `;
 }

package/build/templates/arui-scripts-config.template.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aruiScriptsConfigTemplate = aruiScriptsConfigTemplate;
-// Безопасная вставка строки в конфиг
+// Безопасная вставка строки в конфиг (одинарные кавычки как у prettier)
 function tsString(value) {
-    return JSON.stringify(value);
+    return `'${value.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
 }
 function aruiScriptsConfigTemplate(ctx) {
     const lines = [];

package/build/templates/client-entry.template.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.clientEntryTemplate = clientEntryTemplate;
 const HMR_BLOCK = `if (process.env.NODE_ENV !== 'production' && module.hot) {
     module.hot.accept('./components/app', () => {
-        // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
-        const NextApp = require('./components/app').App;
+        const mod = require('./components/app') as { App: typeof App };
 
-        render(NextApp);
+        render(mod.App);
     });
 }
 `;

package/build/templates/lint.template.d.ts

@@ -0,0 +1,4 @@
+export declare function eslintConfigTemplate(): string;
+export declare function knipConfigTemplate(): string;
+export declare function secretlintConfigTemplate(): string;
+export declare function lefthookConfigTemplate(): string;

package/build/templates/lint.template.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.eslintConfigTemplate = eslintConfigTemplate;
+exports.knipConfigTemplate = knipConfigTemplate;
+exports.secretlintConfigTemplate = secretlintConfigTemplate;
+exports.lefthookConfigTemplate = lefthookConfigTemplate;
+function eslintConfigTemplate() {
+    return `import { defineConfig, eslintConfig, TYPESCRIPT_SCRIPTS_SCOPE } from 'arui-presets-lint/eslint';
+
+export default defineConfig(eslintConfig, [
+    {
+        languageOptions: {
+            parserOptions: {
+                projectService: {
+                    allowDefaultProject: [
+                        'arui-scripts.config.ts',
+                        'eslint.config.mts',
+                        'knip.ts',
+                        'vitest.config.ts',
+                    ],
+                },
+            },
+        },
+        files: [TYPESCRIPT_SCRIPTS_SCOPE],
+    },
+]);
+`;
+}
+function knipConfigTemplate() {
+    return `import baseConfig from 'arui-presets-lint/knip';
+
+export default {
+    ...baseConfig,
+    // ts-jest подключается через jest.preset arui-scripts, прямых импортов в коде нет
+    ignoreDependencies: [...baseConfig.ignoreDependencies, 'ts-jest'],
+};
+`;
+}
+function secretlintConfigTemplate() {
+    return `${JSON.stringify({
+        rules: [
+            {
+                id: '@secretlint/secretlint-rule-preset-recommend',
+            },
+        ],
+    }, null, 4)}\n`;
+}
+function lefthookConfigTemplate() {
+    return `extends:
+    - ./node_modules/arui-presets-lint/lefthook/index.yml
+`;
+}

package/build/templates/misc.template.js

@@ -57,6 +57,13 @@ defaultSemverRangePrefix: ""
 }
 function readmeTemplate(ctx) {
     const testCommand = ctx.testRunner === 'jest' ? 'arui-scripts test' : 'arui-scripts test:vitest';
+    const lintSection = ctx.useLint
+        ? `
+    yarn lint         - eslint, stylelint, prettier, knip, secretlint
+    yarn lint:fix    - автофикс eslint/stylelint + format
+    yarn format       - prettier
+`
+        : '';
     return `# ${ctx.name}
 
 Проект создан с помощью arui-scripts.
@@ -65,8 +72,7 @@ function readmeTemplate(ctx) {
 
     arui-scripts start - запуск dev-сервера
     arui-scripts build - production-сборка
-    ${testCommand}${' '.repeat(Math.max(1, 20 - testCommand.length))}- запуск тестов
-
+    ${testCommand}${' '.repeat(Math.max(1, 20 - testCommand.length))}- запуск тестов${lintSection}
 ## Установка
 
     yarn install

package/build/templates/package-json.template.js

@@ -18,6 +18,19 @@ function packageJsonTemplate(ctx) {
     if (ctx.dockerRegistry) {
         scripts['docker-build'] = 'arui-scripts docker-build';
     }
+    if (ctx.useLint) {
+        scripts['lint:styles'] = 'arui-presets-lint styles --max-warnings=0';
+        scripts['lint:scripts'] = 'arui-presets-lint scripts --max-warnings=0';
+        scripts.format = 'arui-presets-lint format';
+        scripts['format:check'] = 'arui-presets-lint format:check';
+        scripts['lint:unused'] = 'arui-presets-lint knip';
+        scripts['lint:unused:fix'] = 'arui-presets-lint knip --fix';
+        scripts['lint:secrets'] = 'arui-presets-lint secretlint';
+        scripts.lint =
+            'yarn lint:styles && yarn lint:scripts && yarn format:check && yarn lint:unused && yarn lint:secrets';
+        scripts['lint:fix'] =
+            'yarn lint:styles --fix && yarn lint:scripts --fix && yarn format && yarn lint:secrets';
+    }
     const pkg = {
         name: ctx.name,
         version: '0.1.0',
@@ -27,6 +40,11 @@ function packageJsonTemplate(ctx) {
             node: '>=24.11.1',
         },
     };
+    if (ctx.useLint) {
+        pkg.prettier = 'arui-presets-lint/prettier';
+        pkg.stylelint = { extends: 'arui-presets-lint/stylelint' };
+        pkg.commitlint = { extends: './node_modules/arui-presets-lint/commitlint' };
+    }
     if (ctx.testRunner === 'jest') {
         pkg.jest = { preset: 'arui-scripts' };
     }

package/build/templates/server-entry.template.js

@@ -6,38 +6,17 @@ function serverEntryTemplate(ctx) {
     const storeImport = ctx.useRtk ? "\nimport { makeStore } from '../client/store';" : '';
     const renderPageFn = ctx.useRtk
         ? `function renderPage(appHtml: string, assets: Assets, preloadedState: string): string {
-    const css = assets.css
-        .map((href) => '<link rel="stylesheet" href="/' + href + '" />')
-        .join('');
-    const js = assets.js.map((src) => '<script src="/' + src + '"></script>').join('');
-    const state = '<script>window.__PRELOADED_STATE__ = ' + preloadedState + ';</script>';
+    const css = assets.css.map((href) => \`<link rel="stylesheet" href="/\${href}" />\`).join('');
+    const js = assets.js.map((src) => \`<script src="/\${src}"></script>\`).join('');
+    const state = \`<script>window.__PRELOADED_STATE__ = \${preloadedState};</script>\`;
 
-    return (
-        '<!DOCTYPE html><html lang="ru"><head><meta charset="utf-8" /><base href="/" />' +
-        css +
-        '</head><body><div id="react-app">' +
-        appHtml +
-        '</div>' +
-        state +
-        js +
-        '</body></html>'
-    );
+    return \`<!DOCTYPE html><html lang="ru"><head><meta charset="utf-8" /><base href="/" />\${css}</head><body><div id="react-app">\${appHtml}</div>\${state}\${js}</body></html>\`;
 }`
         : `function renderPage(appHtml: string, assets: Assets): string {
-    const css = assets.css
-        .map((href) => '<link rel="stylesheet" href="/' + href + '" />')
-        .join('');
-    const js = assets.js.map((src) => '<script src="/' + src + '"></script>').join('');
+    const css = assets.css.map((href) => \`<link rel="stylesheet" href="/\${href}" />\`).join('');
+    const js = assets.js.map((src) => \`<script src="/\${src}"></script>\`).join('');
 
-    return (
-        '<!DOCTYPE html><html lang="ru"><head><meta charset="utf-8" /><base href="/" />' +
-        css +
-        '</head><body><div id="react-app">' +
-        appHtml +
-        '</div>' +
-        js +
-        '</body></html>'
-    );
+    return \`<!DOCTYPE html><html lang="ru"><head><meta charset="utf-8" /><base href="/" />\${css}</head><body><div id="react-app">\${appHtml}</div>\${js}</body></html>\`;
 }`;
     const handlerBody = ctx.useRtk
         ? `            const assets = await readAssetsManifest();
@@ -55,12 +34,11 @@ function serverEntryTemplate(ctx) {
             const appHtml = renderToString(<App />);
 
             return renderPage(appHtml, assets);`;
-    return `import path from 'path';
-
+    return `import React from 'react';
+import { renderToString } from 'react-dom/server';${reduxImport}
 import Hapi from '@hapi/hapi';
 import Inert from '@hapi/inert';
-import React from 'react';
-import { renderToString } from 'react-dom/server';${reduxImport}
+import path from 'node:path';
 
 import { readAssetsManifest } from '@alfalab/scripts-server';
 
@@ -106,10 +84,10 @@ ${handlerBody}
     });
 
     await server.start();
-    // eslint-disable-next-line no-console
-    console.log('Server is listening on ' + server.info.uri);
+    // eslint-disable-next-line no-console -- стартовый лог dev-сервера
+    console.log(\`Server is listening on \${server.info.uri}\`);
 }
 
-start();
+void start();
 `;
 }

package/build/templates/store.template.js

@@ -57,7 +57,7 @@ const counterSlice = createSlice({
     },
 });
 
-export const { increment, decrement } = counterSlice.actions;
+export const { decrement, increment } = counterSlice.actions;
 export const counterReducer = counterSlice.reducer;
 `;
 }

package/build/templates/tsconfig.template.js

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsconfigTemplate = tsconfigTemplate;
 function tsconfigTemplate(ctx) {
-    const types = ctx.testRunner === 'jest' ? ['jest', 'node', 'webpack-env'] : ['node', 'webpack-env'];
-    const tsconfig = {
-        extends: 'arui-scripts/tsconfig.json',
-        include: ['global-definitions.d.ts', 'src/**/*.ts', 'src/**/*.tsx'],
-        compilerOptions: {
-            types,
-        },
-    };
-    return `${JSON.stringify(tsconfig, null, 4)}\n`;
+    const types = ctx.testRunner === 'jest'
+        ? '["jest", "node", "webpack-env"]'
+        : '["node", "webpack-env"]';
+    return `{
+    "extends": "arui-scripts/tsconfig.json",
+    "include": ["global-definitions.d.ts", "src/**/*.ts", "src/**/*.tsx"],
+    "compilerOptions": {
+        "types": ${types}
+    }
+}
+`;
 }

package/build/types.d.ts

@@ -13,6 +13,7 @@ export type InitAnswers = {
     presets: string;
     polyfills: boolean;
     reactCompiler: boolean;
+    useLint: boolean;
     install: boolean;
 };
 export type TemplateContext = {
@@ -28,6 +29,7 @@ export type TemplateContext = {
     presets: string;
     polyfills: boolean;
     reactCompiler: boolean;
+    useLint: boolean;
     aruiScriptsVersion: string;
     dependencies: Record<string, string>;
     devDependencies: Record<string, string>;

package/build/versions.d.ts

@@ -1,4 +1,4 @@
 /** Версия arui-scripts, которую scaffold кладёт в package.json нового проекта.
  * Генерируется скриптом scripts/sync-arui-scripts-version.js при сборке.
  */
-export declare const DEFAULT_ARUI_SCRIPTS_VERSION = "23.2.0";
+export declare const DEFAULT_ARUI_SCRIPTS_VERSION = "23.3.1";

package/build/versions.js

@@ -4,4 +4,4 @@ exports.DEFAULT_ARUI_SCRIPTS_VERSION = void 0;
 /** Версия arui-scripts, которую scaffold кладёт в package.json нового проекта.
  * Генерируется скриптом scripts/sync-arui-scripts-version.js при сборке.
  */
-exports.DEFAULT_ARUI_SCRIPTS_VERSION = '23.2.0';
+exports.DEFAULT_ARUI_SCRIPTS_VERSION = '23.3.1';

package/package.json

@@ -1,56 +1,56 @@
 {
-    "name": "create-arui-scripts-app",
-    "version": "1.0.0",
-    "description": "CLI для генерации нового react приложения на arui-scripts",
-    "license": "MPL-2.0",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/core-ds/arui-scripts.git"
-    },
-    "bugs": {
-        "url": "https://github.com/core-ds/arui-scripts/issues"
-    },
-    "homepage": "https://github.com/core-ds/arui-scripts/tree/master/packages/create-arui-scripts-app#readme",
-    "bin": "./bin/create-arui-scripts-app.js",
-    "main": "./build/run.js",
-    "typings": "./build/run.d.ts",
-    "files": [
-        "assets",
-        "bin",
-        "build"
-    ],
-    "scripts": {
-        "sync:version": "node ./scripts/sync-arui-scripts-version.js",
-        "build": "yarn sync:version && tsc --project tsconfig.json",
-        "test": "jest",
-        "lint:scripts": "arui-presets-lint scripts",
-        "format": "arui-presets-lint format",
-        "format:check": "arui-presets-lint format:check",
-        "lint": "yarn lint:scripts && yarn format:check",
-        "lint:fix": "yarn lint:scripts --fix && yarn format",
-        "audit": "yarn npm audit --severity high --environment production"
-    },
-    "dependencies": {
-        "chalk": "^2.4.2",
-        "commander": "^12",
-        "fs-extra": "6.0.1",
-        "ora": "^5",
-        "prompts": "^2.4.2",
-        "shelljs": "0.8.5",
-        "validate-npm-package-name": "^5.0.1"
-    },
-    "devDependencies": {
-        "@types/fs-extra": "^9.0.13",
-        "@types/jest": "^29.5.14",
-        "@types/node": "^20.19.0",
-        "@types/prompts": "^2.4.9",
-        "@types/shelljs": "^0.8.12",
-        "@types/validate-npm-package-name": "^3.0.3",
-        "jest": "28.1.3",
-        "ts-jest": "28.0.8",
-        "typescript": "6.0.2"
-    },
-    "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-    }
-}
+  "name": "create-arui-scripts-app",
+  "version": "1.1.0",
+  "description": "CLI для генерации нового react приложения на arui-scripts",
+  "license": "MPL-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/core-ds/arui-scripts.git"
+  },
+  "bugs": {
+    "url": "https://github.com/core-ds/arui-scripts/issues"
+  },
+  "homepage": "https://github.com/core-ds/arui-scripts/tree/master/packages/create-arui-scripts-app#readme",
+  "bin": "./bin/create-arui-scripts-app.js",
+  "main": "./build/run.js",
+  "typings": "./build/run.d.ts",
+  "files": [
+    "assets",
+    "bin",
+    "build"
+  ],
+  "scripts": {
+    "sync:version": "node ./scripts/sync-arui-scripts-version.js",
+    "build": "yarn sync:version && tsc --project tsconfig.json",
+    "test": "jest",
+    "lint:scripts": "arui-presets-lint scripts",
+    "format": "arui-presets-lint format",
+    "format:check": "arui-presets-lint format:check",
+    "lint": "yarn lint:scripts && yarn format:check",
+    "lint:fix": "yarn lint:scripts --fix && yarn format",
+    "audit": "yarn npm audit --severity high --environment production"
+  },
+  "dependencies": {
+    "chalk": "^2.4.2",
+    "commander": "^12",
+    "fs-extra": "6.0.1",
+    "ora": "^5",
+    "prompts": "^2.4.2",
+    "shelljs": "0.8.5",
+    "validate-npm-package-name": "^5.0.1"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^9.0.13",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^20.19.0",
+    "@types/prompts": "^2.4.9",
+    "@types/shelljs": "^0.8.12",
+    "@types/validate-npm-package-name": "^3.0.3",
+    "jest": "28.1.3",
+    "ts-jest": "28.0.8",
+    "typescript": "6.0.2"
+  },
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  }
+}