@aerogel/cli 0.0.0-next.0d1cf82f9dfbe1d3e7ec5644f85f97a43c8c2334 → 0.0.0-next.0e2d8a67669c6e544c855fc0bbdb8c845fdfb340

package/src/plugins/Solid.ts

@@ -1,34 +1,27 @@
 import File from '@aerogel/cli/lib/File';
 import Log from '@aerogel/cli/lib/Log';
 import Plugin from '@aerogel/cli/plugins/Plugin';
-import Shell from '@aerogel/cli/lib/Shell';
-import { isLinkedLocalApp } from '@aerogel/cli/lib/utils/app';
-import { packagePath } from '@aerogel/cli/lib/utils/paths';
+import { addNpmDependency } from '@aerogel/cli/utils/package';
 import type { Editor } from '@aerogel/cli/lib/Editor';
 
-export class Solid extends Plugin {
+export default class Solid extends Plugin {
 
     constructor() {
         super('solid');
     }
 
     protected override async updateFiles(editor: Editor): Promise<void> {
-        await this.updateTailwindConfig(editor, {
-            content: isLinkedLocalApp()
-                ? `'${packagePath('plugin-solid')}/dist/**/*.js'`
-                : '\'./node_modules/@aerogel/plugin-solid/dist/**/*.js\'',
-        });
-
         await this.updateNpmScripts(editor);
         await this.updateGitIgnore();
         await super.updateFiles(editor);
     }
 
-    protected override async installNpmDependencies(): Promise<void> {
-        await Shell.run('npm install soukai-solid@next --save-exact');
-        await Shell.run('npm install @noeldemartin/solid-utils@next --save-exact');
-        await Shell.run('npm install @solid/community-server@7.1.6 --save-dev -E');
-        await super.installNpmDependencies();
+    protected override addNpmDependencies(): void {
+        addNpmDependency('soukai-solid', 'next');
+        addNpmDependency('@noeldemartin/solid-utils', 'next');
+        addNpmDependency('@solid/community-server', '7.1.6', true);
+
+        super.addNpmDependencies();
     }
 
     protected async updateNpmScripts(editor: Editor): Promise<void> {

package/src/plugins/Soukai.ts

@@ -1,15 +1,16 @@
 import Plugin from '@aerogel/cli/plugins/Plugin';
-import Shell from '@aerogel/cli/lib/Shell';
+import { addNpmDependency } from '@aerogel/cli/utils/package';
 
-export class Soukai extends Plugin {
+export default class Soukai extends Plugin {
 
     constructor() {
         super('soukai');
     }
 
-    protected override async installNpmDependencies(): Promise<void> {
-        await Shell.run('npm install soukai@next --save-exact');
-        await super.installNpmDependencies();
+    protected override addNpmDependencies(): void {
+        addNpmDependency('soukai', 'next');
+
+        super.addNpmDependencies();
     }
 
     protected override getBootstrapConfig(): string {

package/src/testing/setup.ts

@@ -48,6 +48,12 @@ vi.mock('@aerogel/cli/lib/utils/edit', async () => {
     };
 });
 
+vi.mock('simple-git', () => ({
+    simpleGit: () => ({
+        clone: () => Promise.resolve(),
+    }),
+}));
+
 // TODO find out why these need to be mocked
 vi.mock('@aerogel/cli/lib/utils/paths', async () => {
     const original = (await vi.importActual('@aerogel/cli/lib/utils/paths')) as object;

package/src/utils/package.ts

@@ -0,0 +1,23 @@
+import { arraySorted } from '@noeldemartin/utils';
+
+import File from '@aerogel/cli/lib/File';
+
+export function addNpmDependency(name: string, version: string, development: boolean = false): void {
+    const packageJson = (JSON.parse(File.read('package.json') ?? '{}') ?? {}) as {
+        dependencies?: Record<string, string>;
+        devDependencies?: Record<string, string>;
+    };
+    const dependencies = (development ? packageJson?.devDependencies : packageJson?.dependencies) ?? {};
+    const dependencyNames = arraySorted(Object.keys(dependencies).concat(name));
+    const index = dependencyNames.indexOf(name);
+    const previousDependency = dependencyNames[index - 1] ?? '';
+
+    File.replace(
+        'package.json',
+        `"${previousDependency}": "${dependencies[previousDependency]}",`,
+        `
+            "${previousDependency}": "${dependencies[previousDependency]}",
+            "${name}": "${version}",
+        `,
+    );
+}

package/src/commands/generate-overrides.ts

@@ -1,85 +0,0 @@
-import { arrayFrom } from '@noeldemartin/utils';
-
-import Command from '@aerogel/cli/commands/Command';
-import File from '@aerogel/cli/lib/File';
-import Log from '@aerogel/cli/lib/Log';
-import Template from '@aerogel/cli/lib/Template';
-import { templatePath } from '@aerogel/cli/lib/utils/paths';
-import type { CommandOptions } from '@aerogel/cli/commands/Command';
-
-export interface Options {
-    story?: boolean;
-}
-
-export class GenerateOverridesCommand extends Command {
-
-    protected static override command: string = 'generate:overrides';
-    protected static override description: string = 'Generate AerogelJS component overrides';
-
-    protected static override options: CommandOptions = {
-        story: {
-            description: 'Create overrides story using Histoire',
-            type: 'boolean',
-        },
-    };
-
-    private options: Options;
-
-    constructor(options: Options = {}) {
-        super();
-
-        this.options = options;
-    }
-
-    protected override async run(): Promise<void> {
-        this.assertAerogelOrDirectory('src/components');
-        this.assertHistoireInstalled();
-
-        const files = new Set<string>();
-
-        await this.createComponents(files);
-        await this.createStory(files);
-
-        const filesList = arrayFrom(files)
-            .map((file) => `- ${file}`)
-            .join('\n');
-
-        Log.info(`Overrides created successfully! The following files were created:\n\n${filesList}`);
-        Log.info('\nRemember to declare your components in main.ts and main.histoire.ts!');
-    }
-
-    protected assertHistoireInstalled(): void {
-        if (!this.options.story) {
-            return;
-        }
-
-        if (!File.contains('package.json', '"histoire"') && !File.contains('package.json', '"@aerogel/histoire"')) {
-            Log.fail(`
-                Histoire is not installed yet! You can install it running:
-                npx gel install histoire
-            `);
-        }
-    }
-
-    protected async createComponents(files: Set<string>): Promise<void> {
-        await Log.animate('Creating components', async () => {
-            if (File.exists('src/components/ModalWrapper.vue')) {
-                Log.fail('ModalWrapper component already exists!');
-            }
-
-            Template.instantiate(templatePath('overrides'), 'src').forEach((file) => files.add(file));
-        });
-    }
-
-    protected async createStory(files: Set<string>): Promise<void> {
-        if (!this.options.story) {
-            return;
-        }
-
-        await Log.animate('Creating story', async () => {
-            Template.instantiate(templatePath('overrides-story'), 'src/components/overrides/').forEach((file) =>
-                files.add(file));
-        });
-    }
-
-}

package/templates/app/.github/workflows/ci.yml

@@ -1,29 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-    ci:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-            - uses: actions/setup-node@v4
-              with:
-                  node-version-file: '.nvmrc'
-            - run: npm ci
-            - run: npm run lint
-            - run: npm run build
-            - run: npm run test:ci
-            - run: npm run cy:test-snapshots:ci
-            - name: Upload Cypress screenshots
-              uses: actions/upload-artifact@v4
-              if: ${{ failure() }}
-              with:
-                  name: cypress_screenshots
-                  path: cypress/screenshots
-            - name: Upload Cypress snapshots
-              uses: actions/upload-artifact@v4
-              if: ${{ failure() }}
-              with:
-                  name: cypress_snapshots
-                  path: cypress/snapshots

package/templates/app/.gitignore.template

@@ -1,2 +0,0 @@
-/dist
-/node_modules

package/templates/app/.nvmrc

@@ -1 +0,0 @@
-v22.9.0

package/templates/app/.vscode/launch.json

@@ -1,17 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "runtimeVersion": "22.14.0",
-            "request": "launch",
-            "name": "Debug Current Test File",
-            "autoAttachChildProcesses": true,
-            "skipFiles": ["<node_internals>/**", "**/node_modules/**"],
-            "program": "${workspaceRoot}/node_modules/vitest/vitest.mjs",
-            "args": ["run", "${fileBasenameNoExtension}"],
-            "smartStep": true,
-            "console": "integratedTerminal"
-        }
-    ]
-}

package/templates/app/.vscode/settings.json

@@ -1,10 +0,0 @@
-{
-    "emeraldwalk.runonsave": {
-        "commands": [
-            {
-                "match": ".*",
-                "cmd": "npx prettier-eslint ${file} --write"
-            }
-        ]
-    }
-}

package/templates/app/cypress/cypress.config.ts

@@ -1,14 +0,0 @@
-import { setupAerogelNodeEvents } from '@aerogel/cypress/config';
-import { defineConfig } from 'cypress';
-
-export default defineConfig({
-    e2e: {
-        baseUrl: 'http://localhost:5001',
-        video: false,
-        retries: {
-            runMode: 3,
-            openMode: 0,
-        },
-        setupNodeEvents: setupAerogelNodeEvents,
-    },
-});

package/templates/app/cypress/e2e/app.cy.ts

@@ -1,9 +0,0 @@
-describe('App', () => {
-
-    beforeEach(() => cy.visit('/'));
-
-    it('Shows get started link', () => {
-        cy.see('Get started');
-    });
-
-});

package/templates/app/cypress/support/e2e.ts

@@ -1 +0,0 @@
-import '@aerogel/cypress/support';

package/templates/app/cypress/tsconfig.json

@@ -1,11 +0,0 @@
-{
-    "extends": "@tsconfig/node22/tsconfig.json",
-    "include": ["**/*.ts"],
-    "compilerOptions": {
-        "baseUrl": ".",
-        "module": "ESNext",
-        "moduleResolution": "Bundler",
-        "lib": ["DOM"],
-        "types": ["node", "cypress"]
-    }
-}

package/templates/app/index.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" class="h-full w-full">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>{{ app.name }}</title>
-        {{ socialMeta() }}
-    </head>
-    <body class="h-full w-full text-base font-normal leading-tight text-gray-900 antialiased">
-        <div id="app" class="loading h-full"></div>
-        <script type="module" src="./src/main.ts"></script>
-    </body>
-</html>

package/templates/app/package.json

@@ -1,66 +0,0 @@
-{
-    "name": "<% app.slug %>",
-    "version": "0.0.0",
-    "private": true,
-    "type": "module",
-    "scripts": {
-        "build": "vite build",
-        "cy:dev": "concurrently --kill-others \"npm run test:serve-app\" \"npm run cy:open\"",
-        "cy:open": "cypress open --config-file ./cypress/cypress.config.ts --e2e --browser chromium",
-        "cy:run": "cypress run --config-file ./cypress/cypress.config.ts",
-        "cy:test": "start-server-and-test test:serve-app http-get://localhost:5001 cy:run",
-        "cy:test-snapshots": "docker run -it -u `id -u ${whoami}` -e CYPRESS_SNAPSHOTS=true -v ./:/app -w /app cypress/base:18.16.0 sh -c \"npx cypress install && npm run cy:test\"",
-        "cy:test-snapshots:ci": "docker run -e CYPRESS_SNAPSHOTS=true -v ./:/app -w /app cypress/base:18.16.0 sh -c \"npx cypress install && npm run cy:test\"",
-        "dev": "vite",
-        "lint": "noeldemartin-lint src cypress",
-        "test": "vitest --run",
-        "test:ci": "vitest --run --reporter verbose",
-        "test:serve-app": "vite --port 5001 --mode testing"
-    },
-    "dependencies": {
-        "@aerogel/core": "<% &dependencies.aerogelCore %>",
-        "@aerogel/plugin-i18n": "<% &dependencies.aerogelPluginI18n %>",
-        "@aerogel/plugin-soukai": "<% &dependencies.aerogelPluginSoukai %>",
-        "@intlify/unplugin-vue-i18n": "^0.12.2",
-        "@noeldemartin/utils": "next",
-        "@tailwindcss/forms": "^0.5.3",
-        "@tailwindcss/typography": "^0.5.9",
-        "soukai": "next",
-        "tailwindcss": "^3.3.2",
-        "vue": "^3.3.0",
-        "vue-i18n": "9.3.0-beta.19"
-    },
-    "devDependencies": {
-        "@aerogel/cli": "<% &dependencies.aerogelCli %>",
-        "@aerogel/cypress": "<% &dependencies.aerogelCypress %>",
-        "@aerogel/vite": "<% &dependencies.aerogelVite %>",
-        "@iconify/json": "^2.2.134",
-        "@noeldemartin/eslint-config-vue": "next",
-        "@noeldemartin/scripts": "next",
-        "@total-typescript/ts-reset": "^0.4.2",
-        "@tsconfig/node22": "^22.0.1",
-        "@types/node": "^20.3.1",
-        "@vue/tsconfig": "^0.7.0",
-        "autoprefixer": "^10.4.14",
-        "concurrently": "^8.2.0",
-        "cypress": "^14.2.0",
-        "start-server-and-test": "^2.0.0",
-        "typescript": "^5.8.2",
-        "unplugin-icons": "^0.16.3",
-        "unplugin-vue-components": "^0.24.1",
-        "vite": "^6.2.2",
-        "vitest": "^3.0.9",
-        "vue-tsc": "^2.2.8"
-    },
-    "eslintConfig": {
-        "extends": [
-            "@noeldemartin/eslint-config-vue"
-        ]
-    },
-    "prettier": {
-        "printWidth": 120,
-        "plugins": [
-            "prettier-plugin-tailwindcss"
-        ]
-    }
-}

package/templates/app/postcss.config.js

@@ -1,6 +0,0 @@
-export default {
-    plugins: {
-        tailwindcss: {},
-        autoprefixer: {},
-    },
-};

package/templates/app/src/App.vue

@@ -1,12 +0,0 @@
-<template>
-    <AGAppLayout class="bg-blue-50">
-        <main class="flex flex-grow flex-col items-center justify-center">
-            <h1 class="text-4xl font-semibold">
-                {{ $t('home.title') }}
-            </h1>
-            <a href="https://aerogel.js.org" target="_blank" class="mt-2 underline opacity-75 hover:opacity-100">
-                {{ $t('home.getStarted') }}
-            </a>
-        </main>
-    </AGAppLayout>
-</template>

package/templates/app/src/assets/css/main.css

@@ -1,3 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;

package/templates/app/src/assets/public/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow:

package/templates/app/src/lang/en.yaml

@@ -1,3 +0,0 @@
-home:
-  title: Aerogel
-  getStarted: Get started

package/templates/app/src/main.test.ts

@@ -1,9 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-describe('App', () => {
-
-    it('works', () => {
-        expect(true).toBe(true);
-    });
-
-});

package/templates/app/src/main.ts

@@ -1,13 +0,0 @@
-import i18n from '@aerogel/plugin-i18n';
-import soukai from '@aerogel/plugin-soukai';
-import { bootstrap } from '@aerogel/core';
-
-import './assets/css/main.css';
-import App from './App.vue';
-
-bootstrap(App, {
-    plugins: [
-        i18n({ messages: import.meta.glob('@/lang/*.yaml') }),
-        soukai({ models: import.meta.glob(['@/models/*', '!**/*.test.ts'], { eager: true }) }),
-    ],
-});

package/templates/app/src/types/globals.d.ts

@@ -1,2 +0,0 @@
-/// <reference types="vite/client" />
-/// <reference types="vue-i18n" />

package/templates/app/src/types/shims.d.ts

@@ -1,7 +0,0 @@
-declare module '*.vue' {
-    import type { ComponentOptions } from 'vue';
-
-    const component: ComponentOptions;
-
-    export default component;
-}

package/templates/app/src/types/ts-reset.d.ts

@@ -1 +0,0 @@
-/// <reference types="@total-typescript/ts-reset" />

package/templates/app/tailwind.config.js

@@ -1,5 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-    content: ['./index.html', './src/**/*.{vue,ts}', '<% &contentPath %>'],
-    plugins: [require('@tailwindcss/forms'), require('@tailwindcss/typography')],
-};

package/templates/app/tsconfig.json

@@ -1,12 +0,0 @@
-{
-    "extends": "@vue/tsconfig/tsconfig.dom.json",
-    "compilerOptions": {
-        "baseUrl": ".",
-        "module": "ESNext",
-        "moduleResolution": "Bundler",
-        "paths": {
-            "@/*": ["./src/*"]
-        }
-    },
-    "include": ["src/**/*.ts", "src/**/*.vue"]
-}

package/templates/app/vite.config.ts

@@ -1,31 +0,0 @@
-import { URL, fileURLToPath } from 'node:url';
-
-import Aerogel, { AerogelResolver } from '@aerogel/vite';
-import Components from 'unplugin-vue-components/vite';
-import I18n from '@intlify/unplugin-vue-i18n/vite';
-import Icons from 'unplugin-icons/vite';
-import IconsResolver from 'unplugin-icons/resolver';
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-    build: { sourcemap: true },
-    publicDir: fileURLToPath(new URL('./src/assets/public/', import.meta.url)),
-    plugins: [
-        Aerogel({ name: '<% app.name %>' }),
-        Components({
-            dts: false,
-            resolvers: [AerogelResolver(), IconsResolver()],
-        }),
-        I18n({ include: fileURLToPath(new URL('./src/lang/**/*.yaml', import.meta.url)) }),
-        Icons({
-            iconCustomizer(_, __, props) {
-                props['aria-hidden'] = 'true';
-            },
-        }),
-    ],
-    resolve: {
-        alias: {
-            '@': fileURLToPath(new URL('./src', import.meta.url)),
-        },
-    },
-});

package/templates/component-button/[component.name].vue

@@ -1,42 +0,0 @@
-<template>
-    <AGHeadlessButton :class="variantClasses" :disabled="disabled">
-        <slot />
-    </AGHeadlessButton>
-</template>
-
-<script setup lang="ts">
-import { Colors, booleanProp, enumProp, removeInteractiveClasses } from '@aerogel/core';
-import { computed } from 'vue';
-
-const props = defineProps({
-    color: enumProp(Colors, Colors.Primary),
-    disabled: booleanProp(),
-});
-
-const colorClasses = computed(() => {
-    switch (props.color) {
-        case Colors.Secondary:
-            // Add your custom color classes here.
-            return '';
-        case Colors.Clear:
-            // Add your custom color classes here.
-            return '';
-        case Colors.Danger:
-            // Add your custom color classes here.
-            return '';
-        case Colors.Primary:
-        default:
-            // Add your custom color classes here.
-            return '';
-    }
-});
-
-const variantClasses = computed(() => {
-    if (props.disabled) {
-        // Add additional classes for disabled state here.
-        return removeInteractiveClasses(colorClasses.value);
-    }
-
-    return colorClasses.value;
-});
-</script>

package/templates/component-button-story/[component.name].story.vue

@@ -1,77 +0,0 @@
-<template>
-    <Story :layout="{ type: 'grid' }">
-        <Variant title="Playground">
-            <<% component.name %> :color="color">
-                {{ content }}
-            </<% component.name %>>
-
-            <template #controls>
-                <HstText v-model="content" title="Content" />
-                <HstSelect v-model="color" title="Color" :options="colorOptions" />
-            </template>
-        </Variant>
-
-        <Variant title="Default">
-            <<% component.name %>>
-                Click me!
-            </<% component.name %>>
-        </Variant>
-
-        <Variant title="Hover">
-            <<% component.name %> class=":hover">
-                Click me!
-            </<% component.name %>>
-        </Variant>
-
-        <Variant title="Focus">
-            <<% component.name %> class=":focus :focus-visible">
-                Click me!
-            </<% component.name %>>
-        </Variant>
-
-        <Variant title="Disabled">
-            <<% component.name %> disabled>
-                You can't click me
-            </<% component.name %>>
-        </Variant>
-
-        <Variant title="Colors" :layout="{ width: '300px' }">
-            <div class="flex items-center gap-2">
-                <<% component.name %> color="primary">
-                    Primary
-                </<% component.name %>>
-                <<% component.name %> color="secondary">
-                    Secondary
-                </<% component.name %>>
-                <<% component.name %> color="danger">
-                    Danger
-                </<% component.name %>>
-                <<% component.name %> color="clear">
-                    Clear
-                </<% component.name %>>
-            </div>
-        </Variant>
-    </Story>
-</template>
-
-<script setup lang="ts">
-import { Colors } from '@aerogel/core';
-import { invert } from '@noeldemartin/utils';
-import { ref } from 'vue';
-import type { Color } from '@aerogel/core';
-
-const content = ref('Click me!');
-const color = ref<Color>(Colors.Primary);
-const colorOptions = invert(Colors);
-</script>
-
-<style>
-.story-<% component.slug %> {
-    grid-template-columns: repeat(2, 300px) !important;
-}
-
-.story-<% component.slug %> .variant-playground,
-.story-<% component.slug %> .variant-colors{
-    grid-column: 1 / -1;
-}
-</style>