vyriy 0.4.4 → 0.4.7

package/README.md

@@ -78,22 +78,17 @@ 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  |
-| `api`     | Backend API workspace with server/build setup  |
-| `ssr`     | Server-rendered React API with CMS placeholder |
-| `ssg`     | Static site generation workspace               |
-| `spa`     | Single-page application                        |
-
-Presets in progress:
-
-| Key    | Direction              |
-| ------ | ---------------------- |
-| `rest` | REST API project       |
-| `gql`  | GraphQL API project    |
-| `mfe`  | Micro-frontend project |
+| Key       | Description                                       |
+| --------- | ------------------------------------------------- |
+| `base`    | Preset to create minimal monorepo with configs    |
+| `library` | Preset to create js/react library                 |
+| `api`     | Preset to create simple API                       |
+| `ssr`     | Preset to create Server Side Rendering (SSR) API  |
+| `ssg`     | Preset to create Static site generation (SSG)     |
+| `spa`     | Preset to create Single-page application (SPA)    |
+| `rest`    | Preset to create simple REST API                  |
+| `gql`     | Preset to create GraphQL API                      |
+| `mfe`     | Preset to create Micro-frontend (MFE) application |
 
 Registered presets are selectable by the wizard. In-progress presets exist as
 source modules and are expected to become selectable as their generated project

package/commands/check-env.js

@@ -2,6 +2,7 @@ import { exec as processExec } from 'node:child_process';
 import { promisify } from 'node:util';
 import packageJson from '../package.json' with { type: 'json' };
 const exec = promisify(processExec);
+const yarnStableHint = 'Try:\n  corepack enable\n  corepack prepare yarn@stable --activate';
 const node = () => {
     const majorVersion = Number.parseInt(process.versions.node.split('.')[0]);
     const minimumMajorVersion = Number.parseInt(packageJson.engines.node.match(/(\d+)/)?.[0]);
@@ -18,6 +19,39 @@ const node = () => {
         message: `Vyriy requires Node.js >= ${minimumMajorVersion}.\n\nCurrent version: ${process.versions.node}\n\nPlease upgrade Node.js and run the command again.`,
     };
 };
+const corepack = async () => {
+    let currentVersion;
+    try {
+        const { stdout } = await exec('corepack --version');
+        currentVersion = stdout.trim();
+    }
+    catch {
+        return {
+            ok: false,
+            message: `Corepack was not found.\n\nVyriy uses Corepack to install Yarn stable.\n\nInstall a Node.js distribution that includes Corepack and run the command again.`,
+        };
+    }
+    return {
+        ok: true,
+        message: `Corepack ${currentVersion}`,
+    };
+};
+const activateYarnStable = async () => {
+    try {
+        await exec('corepack enable');
+        await exec('corepack prepare yarn@stable --activate');
+    }
+    catch {
+        return {
+            ok: false,
+            message: `Corepack could not activate Yarn stable.\n\n${yarnStableHint}`,
+        };
+    }
+    return {
+        ok: true,
+        message: 'Yarn stable activated',
+    };
+};
 const yarn = async () => {
     const minimumMajorVersion = Number.parseInt(packageJson.packageManager.match(/(\d+)/)?.[0]);
     let currentVersion;
@@ -28,7 +62,7 @@ const yarn = async () => {
     catch {
         return {
             ok: false,
-            message: `Yarn was not found.\n\nVyriy requires Yarn >= ${minimumMajorVersion}.\n\nTry:\n  corepack enable\n  yarn set version stable`,
+            message: `Yarn was not found.\n\nVyriy requires Yarn >= ${minimumMajorVersion}.\n\n${yarnStableHint}`,
         };
     }
     const majorVersion = Number.parseInt(currentVersion.match(/(\d+)/)?.[0]);
@@ -40,7 +74,7 @@ const yarn = async () => {
     }
     return {
         ok: false,
-        message: `Vyriy requires Yarn >= ${minimumMajorVersion}.\n\nCurrent version: ${currentVersion}\n\nTry:\n  corepack enable\n  yarn set version stable`,
+        message: `Vyriy requires Yarn >= ${minimumMajorVersion}.\n\nCurrent version: ${currentVersion}\n\n${yarnStableHint}`,
     };
 };
 export const checkEnv = async () => {
@@ -53,7 +87,28 @@ export const checkEnv = async () => {
         console.error(nodeResults.message);
         return 1;
     }
-    const yarnResults = await yarn();
+    const corepackResults = await corepack();
+    if (corepackResults.ok) {
+        console.log(' ', corepackResults.message);
+    }
+    else {
+        console.error(corepackResults.message);
+        return 1;
+    }
+    let yarnResults = await yarn();
+    if (yarnResults.ok) {
+        console.log(' ', yarnResults.message);
+        return 0;
+    }
+    const yarnStableResults = await activateYarnStable();
+    if (yarnStableResults.ok) {
+        console.log(' ', yarnStableResults.message);
+    }
+    else {
+        console.error(yarnStableResults.message);
+        return 1;
+    }
+    yarnResults = await yarn();
     if (yarnResults.ok) {
         console.log(' ', yarnResults.message);
     }

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: "ssr" | "base" | "api" | "library" | "ssg" | "spa";
+    preset: "ssr" | "base" | "rest" | "api" | "library" | "gql" | "ssg" | "spa";
     scope: string | undefined;
     ci: import("../preset/types.js").CiProvider | undefined;
     deploy: import("../preset/types.js").DeployProvider | undefined;

package/commands/create/preset/api.js

@@ -48,7 +48,6 @@ export const api = {
                 '@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'],
@@ -57,7 +56,6 @@ export const api = {
                 '@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',