create-arui-scripts-app 1.0.0 → 1.2.0

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

@@ -3,64 +3,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serverEntryTemplate = serverEntryTemplate;
 function serverEntryTemplate(ctx) {
     const reduxImport = ctx.useRtk ? "\nimport { Provider } from 'react-redux';" : '';
+    const routerImport = ctx.useRouter ? "\nimport { StaticRouter } from 'react-router';" : '';
     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 appJsx = (() => {
+        let inner = '<App />';
+        if (ctx.useRtk) {
+            inner = `<Provider store={store}>
+                    ${inner}
+                </Provider>`;
+        }
+        if (ctx.useRouter) {
+            inner = `<StaticRouter location={location}>
+                    ${inner}
+                </StaticRouter>`;
+        }
+        return inner;
+    })();
     const handlerBody = ctx.useRtk
         ? `            const assets = await readAssetsManifest();
             const store = makeStore();
             const appHtml = renderToString(
-                <Provider store={store}>
-                    <App />
-                </Provider>,
+                ${appJsx},
             );
             // Экранируем символ "<", чтобы через состояние нельзя было внедрить теги в HTML
             const preloadedState = JSON.stringify(store.getState()).replace(/</g, '\\\\u003c');
 
             return renderPage(appHtml, assets, preloadedState);`
         : `            const assets = await readAssetsManifest();
-            const appHtml = renderToString(<App />);
+            const appHtml = renderToString(${appJsx});
 
             return renderPage(appHtml, assets);`;
-    return `import path from 'path';
-
+    const routePath = ctx.useRouter ? '/{path*}' : '/';
+    const locationLine = ctx.useRouter
+        ? `
+            const location = request.url.pathname;`
+        : '';
+    return `import React from 'react';
+import { renderToString } from 'react-dom/server';${reduxImport}${routerImport}
 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';
 
@@ -99,17 +95,17 @@ async function start() {
 
     server.route({
         method: 'GET',
-        path: '/',
-        handler: async () => {
+        path: '${routePath}',
+        handler: async (${ctx.useRouter ? 'request' : ''}) => {${locationLine}
 ${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,13 @@
 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

@@ -1,11 +1,14 @@
 export type CodeLoader = 'swc' | 'babel' | 'tsc';
 export type TestRunner = 'jest' | 'vitest';
+export type E2eFramework = 'cypress' | 'playwright' | 'none';
 export type InitAnswers = {
     name: string;
     useRtk: boolean;
     clientOnly: boolean;
     codeLoader: CodeLoader;
     testRunner: TestRunner;
+    e2eFramework: E2eFramework;
+    useRouter: boolean;
     cssModules: boolean;
     clientServerPort: number;
     serverPort: number;
@@ -13,6 +16,7 @@ export type InitAnswers = {
     presets: string;
     polyfills: boolean;
     reactCompiler: boolean;
+    useLint: boolean;
     install: boolean;
 };
 export type TemplateContext = {
@@ -21,6 +25,8 @@ export type TemplateContext = {
     clientOnly: boolean;
     codeLoader: CodeLoader;
     testRunner: TestRunner;
+    e2eFramework: E2eFramework;
+    useRouter: boolean;
     cssModules: boolean;
     clientServerPort: number;
     serverPort: number;
@@ -28,6 +34,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.5.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.5.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.2.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"
+  }
+}