vyriy 0.4.0 → 0.4.3

package/README.md

@@ -78,26 +78,26 @@ Prepares every package inside the `dist/` directory for npm publishing:
 
 Registered presets:
 
-| Key       | Description                                   |
-| --------- | --------------------------------------------- |
-| `base`    | Minimal monorepo with config only             |
-| `library` | Workspaces layout with a sample React package |
+| Key       | Description                                    |
+| --------- | ---------------------------------------------- |
+| `base`    | Minimal monorepo with config only              |
+| `library` | Workspaces layout with a sample React package  |
+| `api`     | Backend API workspace with server/build setup  |
+| `ssr`     | Server-rendered React API with CMS placeholder |
 
 Presets in progress:
 
 | Key    | Direction                      |
 | ------ | ------------------------------ |
-| `api`  | Backend API project            |
 | `rest` | REST API project               |
 | `gql`  | GraphQL API project            |
-| `ssr`  | Server-side rendering project  |
 | `ssg`  | Static site generation project |
 | `spa`  | Single-page application        |
 | `mfe`  | Micro-frontend project         |
 
-Only registered presets are selectable by the wizard today. In-progress presets
-exist as source modules and are expected to become selectable as their generated
-project shape is finalized.
+Registered presets are selectable by the wizard. In-progress presets exist as
+source modules and are expected to become selectable as their generated project
+shape is finalized.
 
 ## Providers
 
@@ -106,7 +106,9 @@ Provider selections add files to the generated project.
 | Preset    | CI/CD providers    | Deploy providers |
 | --------- | ------------------ | ---------------- |
 | `base`    | `gitlab`, `github` | none             |
-| `library` | `gitlab`, `github` | `docker`         |
+| `library` | `gitlab`, `github` | none             |
+| `api`     | `gitlab`, `github` | none             |
+| `ssr`     | `gitlab`, `github` | none             |
 
 ## API
 

package/commands/create/plan/plan.d.ts

@@ -2,7 +2,7 @@ export declare const plan: (dirName: string, appPath: string) => Promise<{
     name: string;
     description: string;
     target: string;
-    preset: "base" | "library";
+    preset: "ssr" | "base" | "api" | "library";
     scope: string | undefined;
     ci: import("../preset/types.js").CiProvider | undefined;
     deploy: import("../preset/types.js").DeployProvider | undefined;

package/commands/create/preset/api.js

@@ -1,16 +1,168 @@
+import packageJson from '../../../package.json' with { type: 'json' };
 import { base } from './base.js';
 export const api = {
     files: (options) => ({
         ...base.files(options),
+        'package.json': JSON.stringify({
+            name: options.name,
+            version: '0.0.0',
+            description: options.description,
+            private: true,
+            type: 'module',
+            agents: './AGENTS.md',
+            packageManager: packageJson.packageManager,
+            engines: {
+                node: packageJson.engines.node,
+            },
+            workspaces: [
+                'workspaces/*',
+            ],
+            scripts: {
+                storybook: 'cross-env STORYBOOK_DISABLE_TELEMETRY=1 storybook dev -p 6006 --disable-telemetry',
+                check: 'run-s lint build test',
+                fix: "run-s 'fix:*'",
+                start: "run-p 'start:*'",
+                lint: "run-s 'lint:*'",
+                build: "run-s 'build:*'",
+                test: "run-s 'test:*'",
+                'fix:prettier': 'prettier . --write',
+                'fix:eslint': 'eslint . --fix',
+                'start:api': 'sh workspaces/api/bin/start.sh',
+                'lint:ts': 'tsc',
+                'lint:prettier': 'prettier . --check',
+                'lint:eslint': 'eslint .',
+                'build:api': 'rimraf dist && sh workspaces/api/bin/build.sh',
+                'build:storybook': 'cross-env STORYBOOK_DISABLE_TELEMETRY=1 storybook build --quiet --disable-telemetry',
+                'test:jest': 'jest',
+                postinstall: 'husky',
+            },
+            devDependencies: {
+                '@vyriy/typescript-config': `^${packageJson.version}`,
+                typescript: packageJson.peerDependencies.typescript,
+                '@vyriy/prettier-config': `^${packageJson.version}`,
+                prettier: packageJson.peerDependencies.prettier,
+                '@vyriy/eslint-config': `^${packageJson.version}`,
+                eslint: packageJson.peerDependencies.eslint,
+                '@vyriy/jest-config': `^${packageJson.version}`,
+                jest: packageJson.peerDependencies.jest,
+                '@vyriy/storybook-config': `^${packageJson.version}`,
+                storybook: packageJson.peerDependencies.storybook,
+                '@vyriy/path': `^${packageJson.version}`,
+                vyriy: `^${packageJson.version}`,
+                husky: packageJson.peerDependencies.husky,
+                'npm-run-all2': packageJson.peerDependencies['npm-run-all2'],
+                'cross-env': packageJson.peerDependencies['cross-env'],
+                rimraf: packageJson.peerDependencies.rimraf,
+                '@vyriy/webpack-config': `^${packageJson.version}`,
+                '@vyriy/handler': `^${packageJson.version}`,
+                '@vyriy/server': `^${packageJson.version}`,
+                tsx: packageJson.peerDependencies.tsx,
+                webpack: packageJson.peerDependencies.webpack,
+                'webpack-cli': packageJson.peerDependencies['webpack-cli'],
+            },
+        }, null, 2) + '\n',
+        'workspaces/api/bin/build.sh': `#!/usr/bin/env sh
+
+set -e
+
+scriptdir="$PWD/workspaces/api";
+
+NODE_ENV=production npx webpack --config $scriptdir/webpack.config.ts
+
+cp $scriptdir/package.json dist/api/package.json
+npm pkg delete "type" --prefix dist/api
+npm pkg delete "private" --prefix dist/api
+`,
+        'workspaces/api/bin/start.sh': `#!/usr/bin/env sh
+
+set -e
+
+scriptdir="$PWD/workspaces/api";
+
+NODE_ENV=production LOG_LEVEL=info tsx $scriptdir/index.ts
+`,
+        'workspaces/api/doc.mdx': `import { Meta, Markdown } from '@storybook/addon-docs/blocks';
+import ReadMe from './README.md?raw';
+
+<Meta title="Workspaces/API" />
+
+<Markdown>{ReadMe}</Markdown>
+`,
+        'workspaces/api/README.md': `# ${options.name} API\n\n${options.description}\n`,
+        'workspaces/api/webpack.config.ts': `import { path } from '@vyriy/path';
+import { ssr, external } from '@vyriy/webpack-config';
+
+export default ssr(
+  '@w/api',
+  {
+    path: path('dist', 'api'),
+    filename: 'index.js',
+    library: { type: 'commonjs2' },
+  },
+  (config) => ({
+    ...config,
+    externals: [external({ allowlist: [/^@p/, /^@w/, /^@vyriy/] })],
+  }),
+);
+`,
+        'workspaces/api/package.json': JSON.stringify({
+            name: '@w/api',
+            type: 'module',
+            private: true,
+        }, null, 2) + '\n',
+        'workspaces/api/index.ts': `import { server } from '@vyriy/server';
+import { api } from '@vyriy/handler';
+
+server(
+  api(async (event) =>
+    Promise.resolve({
+      statusCode: 200,
+      body: JSON.stringify({
+        path: event.path,
+      }),
+    }),
+  ),
+);
+`,
+        'workspaces/api/index.test.ts': `import { describe, expect, it, jest } from '@jest/globals';
+
+const apiMock = jest.fn((handler) => ({
+  handler,
+}));
+const serverMock = jest.fn();
+
+jest.mock('@vyriy/handler', () => ({
+  api: apiMock,
+}));
+
+jest.mock('@vyriy/server', () => ({
+  server: serverMock,
+}));
+
+describe('workspaces/api/index.ts', () => {
+  it('starts the server with a handler that returns the request path', async () => {
+    await import('./index.js');
+
+    expect(apiMock).toHaveBeenCalledTimes(1);
+    expect(serverMock).toHaveBeenCalledTimes(1);
+    expect(serverMock).toHaveBeenCalledWith(apiMock.mock.results[0]?.value);
+
+    const handler = apiMock.mock.calls[0]?.[0] as (event: {
+      path: string;
+    }) => Promise<{ statusCode: number; body: string }>;
+
+    await expect(handler({ path: '/healthcheck' })).resolves.toEqual({
+      statusCode: 200,
+      body: JSON.stringify({
+        path: '/healthcheck',
+      }),
+    });
+  });
+});
+`,
     }),
     ci: {
-        github: {
-            '.gitlab-ci.yml': 'code',
-        },
-    },
-    deploy: {
-        docker: {
-            Dockerfile: 'code',
-        },
+        ...base.ci,
     },
+    deploy: {},
 };

package/commands/create/preset/base.js

@@ -53,8 +53,8 @@ export const base = {
                 'npm-run-all2': packageJson.peerDependencies['npm-run-all2'],
                 'cross-env': packageJson.peerDependencies['cross-env'],
             },
-        }, null, 2),
-        'README.md': `# ${name}\n\n${description}`,
+        }, null, 2) + '\n',
+        'README.md': `# ${name}\n\n${description}\n`,
         'doc.mdx': `import { Meta, Markdown } from '@storybook/addon-docs/blocks';
 import ReadMe from './README.md?raw';
 
@@ -152,9 +152,9 @@ export default {
                 'workspaces/**/*.tsx',
                 '*.ts',
             ],
-        }, null, 2),
+        }, null, 2) + '\n',
         'prettier.config.ts': "export { default } from '@vyriy/prettier-config';\n",
-        '.prettierignore': 'node_modules\ndist\ncoverage\nstorybook-static\n',
+        '.prettierignore': 'node_modules\ndist\ncoverage\nstorybook-static\nconsumer\n',
         'eslint.config.ts': "export { default } from '@vyriy/eslint-config';\n",
         'jest.config.ts': "export { default } from '@vyriy/jest-config';\n",
     }),

package/commands/create/preset/index.d.ts

@@ -9,4 +9,14 @@ export declare const presets: {
         description: string;
         preset: import("./types.js").Preset;
     };
+    api: {
+        name: string;
+        description: string;
+        preset: import("./types.js").Preset;
+    };
+    ssr: {
+        name: string;
+        description: string;
+        preset: import("./types.js").Preset;
+    };
 };

package/commands/create/preset/index.js

@@ -1,5 +1,7 @@
 import { base } from './base.js';
 import { library } from './library.js';
+import { api } from './api.js';
+import { ssr } from './ssr.js';
 export const presets = {
     base: {
         name: 'Base',
@@ -11,4 +13,14 @@ export const presets = {
         description: 'Preset to generate JS/React library',
         preset: library,
     },
+    api: {
+        name: 'API',
+        description: 'Preset to generate simple API',
+        preset: api,
+    },
+    ssr: {
+        name: 'SSR',
+        description: 'Preset to generate simple Server Side Rendering (SSR) API',
+        preset: ssr,
+    },
 };

package/commands/create/preset/library.js

@@ -68,7 +68,7 @@ export const library = {
                     stylelint: packageJson.peerDependencies.stylelint,
                     rimraf: packageJson.peerDependencies.rimraf,
                 },
-            }, null, 2),
+            }, null, 2) + '\n',
             'tsconfig.build.json': JSON.stringify({
                 extends: './tsconfig.json',
                 include: [
@@ -89,7 +89,7 @@ export const library = {
                     declaration: true,
                     allowImportingTsExtensions: false,
                 },
-            }, null, 2),
+            }, null, 2) + '\n',
             'stylelint.config.ts': "export { default } from '@vyriy/stylelint-config';\n",
             [`packages/${options.name}/package.json`]: JSON.stringify({
                 name: packageName,
@@ -104,7 +104,7 @@ export const library = {
                 peerDependencies: {
                     react: packageJson.peerDependencies.react,
                 },
-            }, null, 2),
+            }, null, 2) + '\n',
             [`packages/${options.name}/README.md`]: `# ${packageName}\n\n${options.description}\n`,
             [`packages/${options.name}/doc.mdx`]: `import { Meta, Markdown } from '@storybook/addon-docs/blocks';
 import ReadMe from './README.md?raw';
@@ -128,8 +128,8 @@ import type { ButtonType } from './types.js';
 
 import './button.scss';
 
-export const Button: ButtonType = ({ className, type = 'button', variant = 'primary', ...props }) => (
-  <button className={cn('button', \`button--\${variant}\`, className)} type={type} {...props} />
+export const Button: ButtonType = ({ className, variant = 'primary', ...props }) => (
+  <button type="button" className={cn('button', \`button--\${variant}\`, className)} {...props} />
 );
 `,
             [`packages/${options.name}/index.test.ts`]: `import { describe, expect, it } from '@jest/globals';
@@ -173,13 +173,38 @@ const meta = {
   args: {
     children: 'Button',
   },
+  argTypes: {
+    children: {
+      control: 'text',
+      description: 'Button label.',
+      table: {
+        type: { summary: 'ReactNode' },
+      },
+    },
+    variant: {
+      control: 'select',
+      options: ['primary', 'secondary'],
+      description: 'Visual style of the button.',
+      table: {
+        type: { summary: "'primary' | 'secondary'" },
+        defaultValue: { summary: 'primary' },
+      },
+    },
+    className: {
+      table: { disable: true },
+    },
+  },
 } satisfies Meta<typeof Button>;
 
 export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const Primary: Story = {};
+export const Primary: Story = {
+  args: {
+    variant: 'primary',
+  },
+};
 
 export const Secondary: Story = {
   args: {

package/commands/create/preset/ssr.js

@@ -1,16 +1,325 @@
+import packageJson from '../../../package.json' with { type: 'json' };
 import { base } from './base.js';
 export const ssr = {
     files: (options) => ({
         ...base.files(options),
+        'package.json': JSON.stringify({
+            name: options.name,
+            version: '0.0.0',
+            description: options.description,
+            private: true,
+            type: 'module',
+            agents: './AGENTS.md',
+            packageManager: packageJson.packageManager,
+            engines: {
+                node: packageJson.engines.node,
+            },
+            workspaces: [
+                'packages/*',
+                'workspaces/*',
+            ],
+            scripts: {
+                storybook: 'cross-env STORYBOOK_DISABLE_TELEMETRY=1 storybook dev -p 6006 --disable-telemetry',
+                check: 'run-s lint build test',
+                fix: "run-s 'fix:*'",
+                start: "run-p 'start:*'",
+                lint: "run-s 'lint:*'",
+                build: "run-s 'build:*'",
+                test: "run-s 'test:*'",
+                'fix:prettier': 'prettier . --write',
+                'fix:eslint': 'eslint . --fix',
+                'fix:stylelint': 'stylelint "**/*.{css,scss}" --fix',
+                'start:api': 'sh workspaces/api/bin/start.sh',
+                'lint:ts': 'tsc',
+                'lint:prettier': 'prettier . --check',
+                'lint:eslint': 'eslint .',
+                'lint:stylelint': 'stylelint "**/*.{css,scss}"',
+                'build:api': 'rimraf dist && sh workspaces/api/bin/build.sh',
+                'build:storybook': 'cross-env STORYBOOK_DISABLE_TELEMETRY=1 storybook build --quiet --disable-telemetry',
+                'test:jest': 'jest',
+                postinstall: 'husky',
+            },
+            devDependencies: {
+                '@vyriy/typescript-config': `^${packageJson.version}`,
+                typescript: packageJson.peerDependencies.typescript,
+                '@vyriy/prettier-config': `^${packageJson.version}`,
+                prettier: packageJson.peerDependencies.prettier,
+                '@vyriy/eslint-config': `^${packageJson.version}`,
+                eslint: packageJson.peerDependencies.eslint,
+                '@vyriy/jest-config': `^${packageJson.version}`,
+                jest: packageJson.peerDependencies.jest,
+                '@vyriy/storybook-config': `^${packageJson.version}`,
+                storybook: packageJson.peerDependencies.storybook,
+                '@vyriy/path': `^${packageJson.version}`,
+                vyriy: `^${packageJson.version}`,
+                husky: packageJson.peerDependencies.husky,
+                'npm-run-all2': packageJson.peerDependencies['npm-run-all2'],
+                'cross-env': packageJson.peerDependencies['cross-env'],
+                rimraf: packageJson.peerDependencies.rimraf,
+                '@vyriy/webpack-config': `^${packageJson.version}`,
+                '@vyriy/handler': `^${packageJson.version}`,
+                '@vyriy/server': `^${packageJson.version}`,
+                tsx: packageJson.peerDependencies.tsx,
+                webpack: packageJson.peerDependencies.webpack,
+                'webpack-cli': packageJson.peerDependencies['webpack-cli'],
+                react: packageJson.peerDependencies.react,
+                'react-dom': packageJson.peerDependencies['react-dom'],
+                '@types/react': packageJson.peerDependencies['@types/react'],
+                '@types/react-dom': packageJson.peerDependencies['@types/react-dom'],
+                '@vyriy/stylelint-config': `^${packageJson.version}`,
+                '@vyriy/cn': `^${packageJson.version}`,
+                '@vyriy/html': `^${packageJson.version}`,
+                stylelint: packageJson.peerDependencies.stylelint,
+                sass: packageJson.peerDependencies.sass,
+            },
+        }, null, 2) + '\n',
+        'stylelint.config.ts': "export { default } from '@vyriy/stylelint-config';\n",
+        'assets.d.ts': "declare module '*.scss';\n",
+        'packages/components/package.json': JSON.stringify({
+            name: '@p/components',
+            private: true,
+            type: 'module',
+        }, null, 2) + '\n',
+        'packages/components/index.ts': "export * from './page/index.js';\n",
+        'packages/components/index.test.tsx': `import { describe, expect, it } from '@jest/globals';
+
+import { Page } from './index.js';
+import { Page as PageImplementation } from './page/index.js';
+
+describe('packages/components/page', () => {
+  it('re-exports the page component', () => {
+    expect(Page).toBe(PageImplementation);
+  });
+});
+`,
+        'packages/components/page/index.ts': `export * from './page.js';
+export type * from './types.js';
+`,
+        'packages/components/page/index.test.ts': `import { describe, expect, it } from '@jest/globals';
+
+import { Page } from './index.js';
+import { Page as PageImplementation } from './page.js';
+
+describe('packages/components/page', () => {
+  it('re-exports the page component', () => {
+    expect(Page).toBe(PageImplementation);
+  });
+});
+`,
+        'packages/components/page/types.ts': `import { FC } from 'react';
+
+export type PageProps = {
+  content: string;
+};
+
+export type PageType = FC<PageProps>;
+`,
+        'packages/components/page/page.tsx': `import type { PageType } from './types.js';
+
+export const Page: PageType = ({ content }) => <div className="content">{content}</div>;
+`,
+        'packages/components/page/styles.scss': `.content {
+  display: block;
+}
+`,
+        'packages/components/page/page.test.tsx': `import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from '@jest/globals';
+
+import { Page } from './page.js';
+
+describe('packages/components/page/page', () => {
+  it('renders content inside the page content container', () => {
+    expect(renderToStaticMarkup(<Page content="Page body" />)).toBe('<div class="content">Page body</div>');
+  });
+});
+`,
+        'packages/services/package.json': JSON.stringify({
+            name: '@p/services',
+            private: true,
+            type: 'module',
+        }, null, 2) + '\n',
+        'packages/services/cms/index.ts': `export const cms = {
+  getContent: async () => {
+    // Placeholder for fetching content from a CMS
+    return Promise.resolve({
+      title: 'Sample Content',
+      body: 'This is a sample content fetched from the CMS.',
+    });
+  },
+};
+`,
+        'packages/services/cms/index.test.ts': `import { describe, expect, it } from '@jest/globals';
+
+import { cms } from './index.js';
+
+describe('packages/services/cms', () => {
+  it('returns content for rendering a page', async () => {
+    await expect(cms.getContent()).resolves.toEqual({
+      title: 'Sample Content',
+      body: 'This is a sample content fetched from the CMS.',
+    });
+  });
+});
+`,
+        'workspaces/api/bin/build.sh': `#!/usr/bin/env sh
+
+set -e
+
+scriptdir="$PWD/workspaces/api";
+distdir="$PWD/dist/api";
+
+NODE_ENV=production npx webpack --config $scriptdir/webpack.config.ts
+
+yarn exec sass packages/components/page/styles.scss "$distdir/styles.css" --no-source-map --style=compressed
+cp $scriptdir/package.json "$distdir/package.json"
+npm pkg delete "type" --prefix "$distdir"
+npm pkg delete "private" --prefix "$distdir"
+`,
+        'workspaces/api/bin/start.sh': `#!/usr/bin/env sh
+
+set -e
+
+scriptdir="$PWD/workspaces/api";
+distdir="$PWD/dist/api";
+
+mkdir -p "$distdir"
+yarn exec sass packages/components/page/styles.scss "$distdir/styles.css" --no-source-map
+
+PROJECT_CWD="$distdir" NODE_ENV=production LOG_LEVEL=info "$PWD/node_modules/.bin/tsx" $scriptdir/index.tsx
+`,
+        'workspaces/api/doc.mdx': `import { Meta, Markdown } from '@storybook/addon-docs/blocks';
+import ReadMe from './README.md?raw';
+
+<Meta title="Workspaces/API" />
+
+<Markdown>{ReadMe}</Markdown>
+`,
+        'workspaces/api/README.md': `# ${options.name} API\n\n${options.description}\n`,
+        'workspaces/api/webpack.config.ts': `import { path } from '@vyriy/path';
+import { ssr, external } from '@vyriy/webpack-config';
+
+export default ssr(
+  '@w/api',
+  {
+    path: path('dist', 'api'),
+    filename: 'index.js',
+    library: { type: 'commonjs2' },
+  },
+  (config) => ({
+    ...config,
+    externals: [external({ allowlist: [/^@p/, /^@w/, /^@vyriy/] })],
+  }),
+);
+`,
+        'workspaces/api/package.json': JSON.stringify({
+            name: '@w/api',
+            type: 'module',
+            private: true,
+        }, null, 2) + '\n',
+        'workspaces/api/index.tsx': `import { readFileSync } from 'node:fs';
+import { renderToString } from 'react-dom/server';
+
+import { server } from '@vyriy/server';
+import { api } from '@vyriy/handler';
+import { html, minify } from '@vyriy/html';
+import { path } from '@vyriy/path';
+
+import { cms } from '@p/services/cms';
+import { Page } from '@p/components';
+
+const dashboardStyles = readFileSync(path('styles.css'), 'utf8');
+
+server(
+  api(async () => {
+    const content = await cms.getContent();
+
+    return {
+      statusCode: 200,
+      headers: {
+        'content-type': 'text/html; charset=utf-8',
+      },
+      body: minify(
+        html({
+          htmlAttributes: 'lang="en"',
+          title: \`<title>\${content.title}</title>\`,
+          meta: '<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />',
+          style: \`<style>\${dashboardStyles.trim()}</style>\`,
+          body: renderToString(<Page content={content.body} />),
+        }),
+      ),
+    };
+  }),
+);
+`,
+        'workspaces/api/index.test.tsx': `import { describe, expect, it, jest } from '@jest/globals';
+
+const apiMock = jest.fn((handler) => ({
+  handler,
+}));
+const getContentMock = jest.fn(() =>
+  Promise.resolve({
+    title: 'Sample Content',
+    body: 'This is a sample content fetched from the CMS.',
+  }),
+);
+const nodeFs = jest.requireActual<typeof import('node:fs')>('node:fs');
+const readFileSyncMock = jest.fn<(path: string | URL, encoding: 'utf8') => string>(
+  () => '.content { display: block; }',
+);
+const serverMock = jest.fn();
+
+jest.mock('node:fs', () => ({
+  ...nodeFs,
+  readFileSync: readFileSyncMock,
+}));
+
+jest.mock('@vyriy/handler', () => ({
+  api: apiMock,
+}));
+
+jest.mock('@vyriy/server', () => ({
+  server: serverMock,
+}));
+
+jest.mock('@p/services/cms', () => ({
+  cms: {
+    getContent: getContentMock,
+  },
+}));
+
+describe('workspaces/api/index.tsx', () => {
+  it('starts the server with a handler that returns rendered page HTML', async () => {
+    await import('./index.js');
+
+    expect(apiMock).toHaveBeenCalledTimes(1);
+    expect(serverMock).toHaveBeenCalledTimes(1);
+    expect(serverMock).toHaveBeenCalledWith(apiMock.mock.results[0]?.value);
+
+    const handler = apiMock.mock.calls[0]?.[0] as () => Promise<{
+      statusCode: number;
+      headers: Record<string, string>;
+      body: string;
+    }>;
+
+    const response = await handler();
+
+    expect(response).toEqual({
+      statusCode: 200,
+      headers: {
+        'content-type': 'text/html; charset=utf-8',
+      },
+      body: expect.stringContaining('<title>Sample Content</title>'),
+    });
+    expect(response.body).toContain('<style>.content { display: block; }</style>');
+    expect(response.body).toContain('This is a sample content fetched from the CMS.');
+    expect(readFileSyncMock).toHaveBeenCalledWith(expect.stringContaining('styles.css'), 'utf8');
+    expect(getContentMock).toHaveBeenCalledTimes(1);
+  });
+});
+`,
     }),
     ci: {
-        github: {
-            '.gitlab-ci.yml': 'code',
-        },
-    },
-    deploy: {
-        docker: {
-            Dockerfile: 'code',
-        },
+        ...base.ci,
     },
+    deploy: {},
 };

package/commands/create/prompt/scope.js

@@ -1,2 +1,2 @@
 import { prompt } from './prompt.js';
-export const scope = async (question, preset, name) => preset === 'base' ? undefined : prompt(question, 'Package scope', `@${name}`);
+export const scope = async (question, preset, name) => preset === 'library' ? prompt(question, 'Package scope', `@${name}`) : undefined;

package/commands/dist.js

@@ -60,6 +60,9 @@ const getPackageMain = async (packageDirectory, packageJson, javaScriptFiles) =>
     if (javaScriptFiles.includes('index.js')) {
         return 'index.js';
     }
+    if (getPackageBinFiles(packageJson).length > 0) {
+        return undefined;
+    }
     return javaScriptFiles[0];
 };
 const createExportTarget = (javaScriptFile) => {
@@ -174,9 +177,18 @@ const getPackageBinFiles = (packageJson) => {
     }
     return [];
 };
+const toPackageLocalPath = (filePath) => filePath.replace(/^\.\//, '');
+const removePackageBinDeclarationFiles = async (packageDirectory, packageJson) => {
+    for (const binFile of getPackageBinFiles(packageJson)) {
+        const declarationFilePath = path.join(packageDirectory, toPackageLocalPath(binFile).replace(/\.js$/, '.d.ts'));
+        if (await hasFile(declarationFilePath)) {
+            await unlink(declarationFilePath);
+        }
+    }
+};
 const makePackageBinsExecutable = async (packageDirectory, packageJson) => {
     for (const binFile of getPackageBinFiles(packageJson)) {
-        const binFilePath = path.join(packageDirectory, binFile.replace(/^\.\//, ''));
+        const binFilePath = path.join(packageDirectory, toPackageLocalPath(binFile));
         if (await hasFile(binFilePath)) {
             await chmod(binFilePath, 0o755);
         }
@@ -214,6 +226,7 @@ const distPackage = async (packageJsonPath, rootPackageJson) => {
     await removeEmptyJavaScriptFiles(packageDirectory);
     await removeMissingJavaScriptExports(packageDirectory);
     await removeEmptyJavaScriptFiles(packageDirectory);
+    await removePackageBinDeclarationFiles(packageDirectory, packageJson);
     const javaScriptFiles = await getJavaScriptFiles(packageDirectory);
     await copyLicense(packageDirectory);
     await copyReadme(packageDirectory);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vyriy",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "description": "Interactive project master for calm cloud-ready applications.",
   "type": "module",
   "bin": "./bin/vyriy.js",
@@ -20,9 +20,13 @@
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
     "rimraf": "^6.1.3",
+    "sass": "^1.100.0",
     "storybook": "^10.4.1",
     "stylelint": "^17.12.0",
-    "typescript": "^6.0.3"
+    "tsx": "^4.22.3",
+    "typescript": "^6.0.3",
+    "webpack": "^5.107.2",
+    "webpack-cli": "^7.0.2"
   },
   "peerDependenciesMeta": {
     "@storybook/react-webpack5": {
@@ -61,14 +65,26 @@
     "rimraf": {
       "optional": true
     },
+    "sass": {
+      "optional": true
+    },
     "storybook": {
       "optional": true
     },
     "stylelint": {
       "optional": true
     },
+    "tsx": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
+    },
+    "webpack": {
+      "optional": true
+    },
+    "webpack-cli": {
+      "optional": true
     }
   },
   "agents": "./AGENTS.md",
@@ -77,314 +93,5 @@
     "type": "git",
     "url": "https://github.com/evheniy/vyriy",
     "directory": "packages/vyriy"
-  },
-  "main": "./bin/vyriy.js",
-  "types": "./bin/vyriy.d.ts",
-  "exports": {
-    ".": {
-      "types": "./bin/vyriy.d.ts",
-      "import": "./bin/vyriy.js",
-      "default": "./bin/vyriy.js"
-    },
-    "./bin/vyriy": {
-      "types": "./bin/vyriy.d.ts",
-      "import": "./bin/vyriy.js",
-      "default": "./bin/vyriy.js"
-    },
-    "./bin/vyriy.js": {
-      "types": "./bin/vyriy.d.ts",
-      "import": "./bin/vyriy.js",
-      "default": "./bin/vyriy.js"
-    },
-    "./cli/args": {
-      "types": "./cli/args.d.ts",
-      "import": "./cli/args.js",
-      "default": "./cli/args.js"
-    },
-    "./cli/args.js": {
-      "types": "./cli/args.d.ts",
-      "import": "./cli/args.js",
-      "default": "./cli/args.js"
-    },
-    "./cli/cli": {
-      "types": "./cli/cli.d.ts",
-      "import": "./cli/cli.js",
-      "default": "./cli/cli.js"
-    },
-    "./cli/cli.js": {
-      "types": "./cli/cli.d.ts",
-      "import": "./cli/cli.js",
-      "default": "./cli/cli.js"
-    },
-    "./cli/index": {
-      "types": "./cli/index.d.ts",
-      "import": "./cli/index.js",
-      "default": "./cli/index.js"
-    },
-    "./cli/index.js": {
-      "types": "./cli/index.d.ts",
-      "import": "./cli/index.js",
-      "default": "./cli/index.js"
-    },
-    "./commands/check-env": {
-      "types": "./commands/check-env.d.ts",
-      "import": "./commands/check-env.js",
-      "default": "./commands/check-env.js"
-    },
-    "./commands/check-env.js": {
-      "types": "./commands/check-env.d.ts",
-      "import": "./commands/check-env.js",
-      "default": "./commands/check-env.js"
-    },
-    "./commands/create/index": {
-      "types": "./commands/create/index.d.ts",
-      "import": "./commands/create/index.js",
-      "default": "./commands/create/index.js"
-    },
-    "./commands/create/index.js": {
-      "types": "./commands/create/index.d.ts",
-      "import": "./commands/create/index.js",
-      "default": "./commands/create/index.js"
-    },
-    "./commands/create/plan/index": {
-      "types": "./commands/create/plan/index.d.ts",
-      "import": "./commands/create/plan/index.js",
-      "default": "./commands/create/plan/index.js"
-    },
-    "./commands/create/plan/index.js": {
-      "types": "./commands/create/plan/index.d.ts",
-      "import": "./commands/create/plan/index.js",
-      "default": "./commands/create/plan/index.js"
-    },
-    "./commands/create/plan/plan": {
-      "types": "./commands/create/plan/plan.d.ts",
-      "import": "./commands/create/plan/plan.js",
-      "default": "./commands/create/plan/plan.js"
-    },
-    "./commands/create/plan/plan.js": {
-      "types": "./commands/create/plan/plan.d.ts",
-      "import": "./commands/create/plan/plan.js",
-      "default": "./commands/create/plan/plan.js"
-    },
-    "./commands/create/plan/question": {
-      "types": "./commands/create/plan/question.d.ts",
-      "import": "./commands/create/plan/question.js",
-      "default": "./commands/create/plan/question.js"
-    },
-    "./commands/create/plan/question.js": {
-      "types": "./commands/create/plan/question.d.ts",
-      "import": "./commands/create/plan/question.js",
-      "default": "./commands/create/plan/question.js"
-    },
-    "./commands/create/preset/api": {
-      "types": "./commands/create/preset/api.d.ts",
-      "import": "./commands/create/preset/api.js",
-      "default": "./commands/create/preset/api.js"
-    },
-    "./commands/create/preset/api.js": {
-      "types": "./commands/create/preset/api.d.ts",
-      "import": "./commands/create/preset/api.js",
-      "default": "./commands/create/preset/api.js"
-    },
-    "./commands/create/preset/base": {
-      "types": "./commands/create/preset/base.d.ts",
-      "import": "./commands/create/preset/base.js",
-      "default": "./commands/create/preset/base.js"
-    },
-    "./commands/create/preset/base.js": {
-      "types": "./commands/create/preset/base.d.ts",
-      "import": "./commands/create/preset/base.js",
-      "default": "./commands/create/preset/base.js"
-    },
-    "./commands/create/preset/gql": {
-      "types": "./commands/create/preset/gql.d.ts",
-      "import": "./commands/create/preset/gql.js",
-      "default": "./commands/create/preset/gql.js"
-    },
-    "./commands/create/preset/gql.js": {
-      "types": "./commands/create/preset/gql.d.ts",
-      "import": "./commands/create/preset/gql.js",
-      "default": "./commands/create/preset/gql.js"
-    },
-    "./commands/create/preset/index": {
-      "types": "./commands/create/preset/index.d.ts",
-      "import": "./commands/create/preset/index.js",
-      "default": "./commands/create/preset/index.js"
-    },
-    "./commands/create/preset/index.js": {
-      "types": "./commands/create/preset/index.d.ts",
-      "import": "./commands/create/preset/index.js",
-      "default": "./commands/create/preset/index.js"
-    },
-    "./commands/create/preset/library": {
-      "types": "./commands/create/preset/library.d.ts",
-      "import": "./commands/create/preset/library.js",
-      "default": "./commands/create/preset/library.js"
-    },
-    "./commands/create/preset/library.js": {
-      "types": "./commands/create/preset/library.d.ts",
-      "import": "./commands/create/preset/library.js",
-      "default": "./commands/create/preset/library.js"
-    },
-    "./commands/create/preset/mfe": {
-      "types": "./commands/create/preset/mfe.d.ts",
-      "import": "./commands/create/preset/mfe.js",
-      "default": "./commands/create/preset/mfe.js"
-    },
-    "./commands/create/preset/mfe.js": {
-      "types": "./commands/create/preset/mfe.d.ts",
-      "import": "./commands/create/preset/mfe.js",
-      "default": "./commands/create/preset/mfe.js"
-    },
-    "./commands/create/preset/rest": {
-      "types": "./commands/create/preset/rest.d.ts",
-      "import": "./commands/create/preset/rest.js",
-      "default": "./commands/create/preset/rest.js"
-    },
-    "./commands/create/preset/rest.js": {
-      "types": "./commands/create/preset/rest.d.ts",
-      "import": "./commands/create/preset/rest.js",
-      "default": "./commands/create/preset/rest.js"
-    },
-    "./commands/create/preset/spa": {
-      "types": "./commands/create/preset/spa.d.ts",
-      "import": "./commands/create/preset/spa.js",
-      "default": "./commands/create/preset/spa.js"
-    },
-    "./commands/create/preset/spa.js": {
-      "types": "./commands/create/preset/spa.d.ts",
-      "import": "./commands/create/preset/spa.js",
-      "default": "./commands/create/preset/spa.js"
-    },
-    "./commands/create/preset/ssg": {
-      "types": "./commands/create/preset/ssg.d.ts",
-      "import": "./commands/create/preset/ssg.js",
-      "default": "./commands/create/preset/ssg.js"
-    },
-    "./commands/create/preset/ssg.js": {
-      "types": "./commands/create/preset/ssg.d.ts",
-      "import": "./commands/create/preset/ssg.js",
-      "default": "./commands/create/preset/ssg.js"
-    },
-    "./commands/create/preset/ssr": {
-      "types": "./commands/create/preset/ssr.d.ts",
-      "import": "./commands/create/preset/ssr.js",
-      "default": "./commands/create/preset/ssr.js"
-    },
-    "./commands/create/preset/ssr.js": {
-      "types": "./commands/create/preset/ssr.d.ts",
-      "import": "./commands/create/preset/ssr.js",
-      "default": "./commands/create/preset/ssr.js"
-    },
-    "./commands/create/prompt/conflict-strategy": {
-      "types": "./commands/create/prompt/conflict-strategy.d.ts",
-      "import": "./commands/create/prompt/conflict-strategy.js",
-      "default": "./commands/create/prompt/conflict-strategy.js"
-    },
-    "./commands/create/prompt/conflict-strategy.js": {
-      "types": "./commands/create/prompt/conflict-strategy.d.ts",
-      "import": "./commands/create/prompt/conflict-strategy.js",
-      "default": "./commands/create/prompt/conflict-strategy.js"
-    },
-    "./commands/create/prompt/index": {
-      "types": "./commands/create/prompt/index.d.ts",
-      "import": "./commands/create/prompt/index.js",
-      "default": "./commands/create/prompt/index.js"
-    },
-    "./commands/create/prompt/index.js": {
-      "types": "./commands/create/prompt/index.d.ts",
-      "import": "./commands/create/prompt/index.js",
-      "default": "./commands/create/prompt/index.js"
-    },
-    "./commands/create/prompt/preset": {
-      "types": "./commands/create/prompt/preset.d.ts",
-      "import": "./commands/create/prompt/preset.js",
-      "default": "./commands/create/prompt/preset.js"
-    },
-    "./commands/create/prompt/preset.js": {
-      "types": "./commands/create/prompt/preset.d.ts",
-      "import": "./commands/create/prompt/preset.js",
-      "default": "./commands/create/prompt/preset.js"
-    },
-    "./commands/create/prompt/prompt": {
-      "types": "./commands/create/prompt/prompt.d.ts",
-      "import": "./commands/create/prompt/prompt.js",
-      "default": "./commands/create/prompt/prompt.js"
-    },
-    "./commands/create/prompt/prompt.js": {
-      "types": "./commands/create/prompt/prompt.d.ts",
-      "import": "./commands/create/prompt/prompt.js",
-      "default": "./commands/create/prompt/prompt.js"
-    },
-    "./commands/create/prompt/provider": {
-      "types": "./commands/create/prompt/provider.d.ts",
-      "import": "./commands/create/prompt/provider.js",
-      "default": "./commands/create/prompt/provider.js"
-    },
-    "./commands/create/prompt/provider.js": {
-      "types": "./commands/create/prompt/provider.d.ts",
-      "import": "./commands/create/prompt/provider.js",
-      "default": "./commands/create/prompt/provider.js"
-    },
-    "./commands/create/prompt/resolve-option": {
-      "types": "./commands/create/prompt/resolve-option.d.ts",
-      "import": "./commands/create/prompt/resolve-option.js",
-      "default": "./commands/create/prompt/resolve-option.js"
-    },
-    "./commands/create/prompt/resolve-option.js": {
-      "types": "./commands/create/prompt/resolve-option.d.ts",
-      "import": "./commands/create/prompt/resolve-option.js",
-      "default": "./commands/create/prompt/resolve-option.js"
-    },
-    "./commands/create/prompt/scope": {
-      "types": "./commands/create/prompt/scope.d.ts",
-      "import": "./commands/create/prompt/scope.js",
-      "default": "./commands/create/prompt/scope.js"
-    },
-    "./commands/create/prompt/scope.js": {
-      "types": "./commands/create/prompt/scope.d.ts",
-      "import": "./commands/create/prompt/scope.js",
-      "default": "./commands/create/prompt/scope.js"
-    },
-    "./commands/dist": {
-      "types": "./commands/dist.d.ts",
-      "import": "./commands/dist.js",
-      "default": "./commands/dist.js"
-    },
-    "./commands/dist.js": {
-      "types": "./commands/dist.d.ts",
-      "import": "./commands/dist.js",
-      "default": "./commands/dist.js"
-    },
-    "./commands/help": {
-      "types": "./commands/help.d.ts",
-      "import": "./commands/help.js",
-      "default": "./commands/help.js"
-    },
-    "./commands/help.js": {
-      "types": "./commands/help.d.ts",
-      "import": "./commands/help.js",
-      "default": "./commands/help.js"
-    },
-    "./commands/index": {
-      "types": "./commands/index.d.ts",
-      "import": "./commands/index.js",
-      "default": "./commands/index.js"
-    },
-    "./commands/index.js": {
-      "types": "./commands/index.d.ts",
-      "import": "./commands/index.js",
-      "default": "./commands/index.js"
-    },
-    "./commands/version": {
-      "types": "./commands/version.d.ts",
-      "import": "./commands/version.js",
-      "default": "./commands/version.js"
-    },
-    "./commands/version.js": {
-      "types": "./commands/version.d.ts",
-      "import": "./commands/version.js",
-      "default": "./commands/version.js"
-    }
   }
 }

package/bin/vyriy.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};