vyriy 0.4.4 → 0.4.7

package/commands/create/preset/ssg.js

@@ -51,7 +51,6 @@ export const ssg = {
                 '@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'],
@@ -59,7 +58,6 @@ export const ssg = {
                 '@vyriy/webpack-config': `^${packageJson.version}`,
                 '@vyriy/script': `^${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'],
@@ -82,84 +80,84 @@ export const ssg = {
         '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';
+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);
-    });
+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';
-  `,
+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';
+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);
-    });
+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 PageProps = {
+  content: string;
+};
 
-  export type PageType = FC<PageProps>;
-  `,
+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>;
-  `,
+export const Page: PageType = ({ content }) => <div className="content">{content}</div>;
+`,
         'packages/components/page/styles.scss': `.content {
-    display: block;
-  }
-  `,
+  display: block;
+}
+`,
         'packages/components/page/page.test.tsx': `import { renderToStaticMarkup } from 'react-dom/server';
-  import { describe, expect, it } from '@jest/globals';
+import { describe, expect, it } from '@jest/globals';
 
-  import { Page } from './page.js';
+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>');
-    });
+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.',
-      });
-    },
-  };
-  `,
+  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';
+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.',
-      });
+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/ssg/bin/build.sh': `#!/usr/bin/env sh
 
 set -e
@@ -187,29 +185,29 @@ yarn exec sass packages/components/page/styles.scss "$distdir/styles.css" --no-s
 PROJECT_CWD="$distdir" NODE_ENV=production LOG_LEVEL=info "$PWD/node_modules/.bin/tsx" $scriptdir/index.tsx
 `,
         'workspaces/ssg/doc.mdx': `import { Meta, Markdown } from '@storybook/addon-docs/blocks';
-  import ReadMe from './README.md?raw';
+import ReadMe from './README.md?raw';
 
-  <Meta title="Workspaces/SSG" />
+<Meta title="Workspaces/SSG" />
 
-  <Markdown>{ReadMe}</Markdown>
-  `,
+<Markdown>{ReadMe}</Markdown>
+`,
         'workspaces/ssg/README.md': `# ${options.name} SSG\n\n${options.description}\n`,
         'workspaces/ssg/webpack.config.ts': `import { path } from '@vyriy/path';
-  import { ssr, external } from '@vyriy/webpack-config';
-
-  export default ssr(
-    '@w/ssg',
-    {
-      path: path('dist', 'ssg'),
-      filename: 'index.js',
-      library: { type: 'commonjs2' },
-    },
-    (config) => ({
-      ...config,
-      externals: [external({ allowlist: [/^@p/, /^@w/, /^@vyriy/] })],
-    }),
-  );
-  `,
+import { ssr, external } from '@vyriy/webpack-config';
+
+export default ssr(
+  '@w/ssg',
+  {
+    path: path('dist', 'ssg'),
+    filename: 'index.js',
+    library: { type: 'commonjs2' },
+  },
+  (config) => ({
+    ...config,
+    externals: [external({ allowlist: [/^@p/, /^@w/, /^@vyriy/] })],
+  }),
+);
+`,
         'workspaces/ssg/package.json': JSON.stringify({
             name: '@w/ssg',
             type: 'module',

package/commands/create/preset/ssr.js

@@ -51,7 +51,6 @@ export const ssr = {
                 '@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'],
@@ -60,7 +59,6 @@ export const ssr = {
                 '@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'],

package/commands/types.d.ts

@@ -1,12 +1,11 @@
 export type Command = () => Promise<number>;
-export type Node = () => {
+export type EnvironmentCheckResult = {
     ok: boolean;
     message: string;
 };
-export type Yarn = () => Promise<{
-    ok: boolean;
-    message: string;
-}>;
+export type Node = () => EnvironmentCheckResult;
+export type Corepack = () => Promise<EnvironmentCheckResult>;
+export type Yarn = () => Promise<EnvironmentCheckResult>;
 export type CreateOptions = {
     readonly directory: string;
     readonly dryRun: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vyriy",
-  "version": "0.4.4",
+  "version": "0.4.7",
   "description": "Interactive project master for calm cloud-ready applications.",
   "type": "module",
   "bin": "./bin/vyriy.js",
@@ -13,6 +13,7 @@
     "@types/react-dom": "^19.2.3",
     "cross-env": "^10.1.0",
     "eslint": "^10.4.0",
+    "graphql": "^16.14.0",
     "husky": "^9.1.7",
     "jest": "^30.4.2",
     "npm-run-all2": "^9.0.1",
@@ -25,13 +26,9 @@
     "stylelint": "^17.12.0",
     "tsx": "^4.22.3",
     "typescript": "^6.0.3",
-    "webpack": "^5.107.2",
     "webpack-cli": "^7.0.2"
   },
   "peerDependenciesMeta": {
-    "@storybook/react-webpack5": {
-      "optional": true
-    },
     "@types/react": {
       "optional": true
     },
@@ -44,6 +41,9 @@
     "eslint": {
       "optional": true
     },
+    "graphql": {
+      "optional": true
+    },
     "husky": {
       "optional": true
     },
@@ -80,9 +80,6 @@
     "typescript": {
       "optional": true
     },
-    "webpack": {
-      "optional": true
-    },
     "webpack-cli": {
       "optional": true
     }