vyriy 0.4.11 → 0.5.1

package/commands/create/index.js

@@ -21,7 +21,7 @@ const mergeFiles = (planOption) => {
         ...getProviderFiles(preset.deploy, planOption.deploy),
     };
 };
-const getSortedFileNames = (files) => Object.keys(files).sort();
+const getSortedFileNames = (files) => Object.keys(files).sort((a, b) => a.localeCompare(b));
 const logFilePlan = (target, files) => {
     console.log(`\nFile plan (${target}):`);
     console.log(' ', getSortedFileNames(files).join('\n  '));
@@ -69,6 +69,28 @@ const verifyProject = async (target) => {
         await exec(`yarn --cwd ${target} check`);
     }
 };
+const installAndVerify = async (target, install, verify) => {
+    if (install) {
+        console.log('Installing dependencies...');
+        await exec(`yarn --cwd ${target} set version berry`);
+        await exec(`yarn --cwd ${target} install`);
+    }
+    else {
+        console.log('Installing dependencies... SKIPPED');
+        console.log('Running checks... SKIPPED');
+        console.log('\nProject files were created.');
+        return 0;
+    }
+    if (verify) {
+        await verifyProject(target);
+    }
+    else {
+        console.log('Running checks... SKIPPED');
+        console.log('\nProject files were created.');
+        return 0;
+    }
+    return 0;
+};
 export const create = async (options) => {
     const { directory, dryRun, overwrite, skipExisting, install, verify } = options;
     const checkEnvCode = await checkEnv();
@@ -107,26 +129,7 @@ export const create = async (options) => {
             return 1;
         }
         writeFiles(target, files, conflictStrategy.overwrite);
-        if (install) {
-            console.log('Installing dependencies...');
-            await exec(`yarn --cwd ${target} set version berry`);
-            await exec(`yarn --cwd ${target} install`);
-        }
-        else {
-            console.log('Installing dependencies... SKIPPED');
-            console.log('Running checks... SKIPPED');
-            console.log('\nProject files were created.');
-            return 0;
-        }
-        if (verify) {
-            await verifyProject(target);
-        }
-        else {
-            console.log('Running checks... SKIPPED');
-            console.log('\nProject files were created.');
-            return 0;
-        }
-        return 0;
+        return installAndVerify(target, install, verify);
     }
     return 1;
 };

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

package/commands/create/preset/api.js

@@ -1,113 +1,16 @@
-import packageJson from '../../../package.json' with { type: 'json' };
 import { base } from './base.js';
+import { apiWorkspaceBaseFiles, baseToolingDeps, buildPackageJson, serverDeps, webpackDeps, workspaceScripts, } from './shared.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',
-            },
-            dependencies: {
-                '@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}`,
-                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-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',
+        ...apiWorkspaceBaseFiles(options.name, options.description),
+        'package.json': buildPackageJson(options, [
+            'workspaces/*',
+        ], workspaceScripts('api'), {
+            ...baseToolingDeps(),
+            ...webpackDeps(),
+            ...serverDeps(),
+        }),
         'workspaces/api/index.ts': `import { server } from '@vyriy/server';
 import { api } from '@vyriy/handler';
 

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

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

package/commands/create/preset/index.js

@@ -6,6 +6,7 @@ import { ssg } from './ssg.js';
 import { spa } from './spa.js';
 import { rest } from './rest.js';
 import { gql } from './gql.js';
+import { mfe } from './mfe.js';
 export const presets = {
     base: {
         name: 'Base',
@@ -47,4 +48,9 @@ export const presets = {
         description: 'Preset for GraphQL API',
         preset: gql,
     },
+    mfe: {
+        name: 'MFE',
+        description: 'Preset for Micro Frontend',
+        preset: mfe,
+    },
 };

package/commands/create/preset/library.js

@@ -1,5 +1,6 @@
 import packageJson from '../../../package.json' with { type: 'json' };
 import { base } from './base.js';
+import { stylelintConfigFile } from './shared.js';
 export const library = {
     files: (options) => {
         const packageScope = options.scope ?? `@${options.name}`;
@@ -90,7 +91,7 @@ export const library = {
                     allowImportingTsExtensions: false,
                 },
             }, null, 2) + '\n',
-            'stylelint.config.ts': "export { default } from '@vyriy/stylelint-config';\n",
+            ...stylelintConfigFile(),
             [`packages/${options.name}/package.json`]: JSON.stringify({
                 name: packageName,
                 version: '0.0.0',