@aerogel/cli 0.0.0-next.59bf5f7cc06e728d0cf6c00de28f1da48d7d6b8e → 0.0.0-next.b85327579d32f21c6a9fa21142f0165cdd320d7e

package/src/plugins/Solid.ts

@@ -0,0 +1,65 @@
+import { Node, SyntaxKind } from 'ts-morph';
+import type { ArrayLiteralExpression, SourceFile } from 'ts-morph';
+
+import Plugin from '@/plugins/Plugin';
+import Shell from '@/lib/Shell';
+import Log from '@/lib/Log';
+import { findDescendant } from '@/lib/utils/edit';
+import { isLinkedLocalApp } from '@/lib/utils/app';
+import { packagePath } from '@/lib/utils/paths';
+import type { Editor } from '@/lib/Editor';
+
+export class Solid extends Plugin {
+
+    constructor() {
+        super('solid');
+    }
+
+    protected async updateFiles(editor: Editor): Promise<void> {
+        await this.updateTailwindConfig(editor);
+        await super.updateFiles(editor);
+    }
+
+    protected async installNpmDependencies(): Promise<void> {
+        await Shell.run('npm install soukai-solid@next');
+        await super.installNpmDependencies();
+    }
+
+    protected async updateTailwindConfig(editor: Editor): Promise<void> {
+        await Log.animate('Updating tailwind configuration', async () => {
+            const tailwindConfig = editor.requireSourceFile('tailwind.config.js');
+            const contentArray = this.getTailwindContentArray(tailwindConfig);
+            const contentValue = isLinkedLocalApp()
+                ? `'${packagePath('plugin-solid')}/dist/**/*.js'`
+                : '\'./node_modules/@aerogel/plugin-solid/dist/**/*.js\'';
+
+            if (!contentArray) {
+                return Log.fail(`
+                    Could not find content array in tailwind config, please add the following manually:
+
+                    ${contentValue}
+                `);
+            }
+
+            contentArray.addElement(contentValue);
+
+            await editor.save(tailwindConfig);
+        });
+    }
+
+    protected getTailwindContentArray(tailwindConfig: SourceFile): ArrayLiteralExpression | null {
+        const contentAssignment = findDescendant(tailwindConfig, {
+            guard: Node.isPropertyAssignment,
+            validate: (propertyAssignment) => propertyAssignment.getName() === 'content',
+            skip: SyntaxKind.JSDoc,
+        });
+        const contentArray = contentAssignment?.getInitializer();
+
+        if (!Node.isArrayLiteralExpression(contentArray)) {
+            return null;
+        }
+
+        return contentArray;
+    }
+
+}

package/src/plugins/Soukai.ts

@@ -0,0 +1,19 @@
+import Plugin from '@/plugins/Plugin';
+import Shell from '@/lib/Shell';
+
+export class Soukai extends Plugin {
+
+    constructor() {
+        super('soukai');
+    }
+
+    protected async installNpmDependencies(): Promise<void> {
+        await Shell.run('npm install soukai@next');
+        await super.installNpmDependencies();
+    }
+
+    protected getBootstrapConfig(): string {
+        return 'soukai({ models: import.meta.glob(\'@/models/*\', { eager: true }) })';
+    }
+
+}

package/src/testing/setup.ts

@@ -24,16 +24,41 @@ beforeEach(() => {
     Shell.mock();
 });
 
+vi.mock('@/lib/utils/app', async () => {
+    const original = (await vi.importActual('@/lib/utils/app')) as object;
+
+    return {
+        ...original,
+        isLocalApp: () => false,
+        isLinkedLocalApp: () => false,
+    };
+});
+
+vi.mock('@/lib/utils/edit', async () => {
+    const original = (await vi.importActual('@/lib/utils/edit')) as object;
+
+    return {
+        ...original,
+        editFiles: () => false,
+    };
+});
+
 // TODO find out why these need to be mocked
+vi.mock('@/lib/utils/paths', async () => {
+    const original = (await vi.importActual('@/lib/utils/paths')) as object;
+
+    function basePath(path: string = '') {
+        return resolve(__dirname, '../../', path);
+    }
 
-vi.mock('@/lib/utils', async () => {
-    const utils = (await vi.importActual('@/lib/utils')) as object;
+    function packagePath(packageName: string) {
+        return basePath(`../${packageName}`);
+    }
 
     return {
-        ...utils,
-        basePath(path: string = '') {
-            return resolve(__dirname, '../../', path);
-        },
+        ...original,
+        basePath,
+        packagePath,
     };
 });
 

package/templates/app/.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+    extends: ['@noeldemartin/eslint-config-vue'],
+};

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

@@ -0,0 +1,16 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "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

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

package/templates/app/cypress.config.ts

@@ -1,8 +1,12 @@
+import install from '@aerogel/cypress/dist/plugin';
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
     e2e: {
         baseUrl: 'http://localhost:5001',
         video: false,
+        setupNodeEvents(on) {
+            install(on);
+        },
     },
 });

package/templates/app/index.html

@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title><% app.name %></title>
     </head>
-    <body class="h-full w-full">
+    <body class="h-full w-full text-base font-normal leading-tight text-gray-900 antialiased">
         <div id="app" class="h-full"></div>
         <script type="module" src="./src/main.ts"></script>
     </body>

package/templates/app/package.json

@@ -8,6 +8,8 @@
         "cy:open": "cypress open --e2e --browser chromium",
         "cy:run": "cypress run",
         "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",
         "test": "vitest --run",
@@ -15,30 +17,38 @@
         "test:serve-app": "vite --port 5001"
     },
     "dependencies": {
-        "@aerogel/core": "<% #local %>file:<% &local.aerogelPath %>/core<% /local %><% ^local %>next<% /local %>",
-        "@aerogel/plugin-i18n": "<% #local %>file:<% &local.aerogelPath %>/plugin-i18n<% /local %><% ^local %>next<% /local %>",
-        "@aerogel/plugin-soukai": "<% #local %>file:<% &local.aerogelPath %>/plugin-soukai<% /local %><% ^local %>next<% /local %>",
+        "@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": "<% #local %>file:<% &local.aerogelPath %>/cli<% /local %><% ^local %>next<% /local %>",
-        "@aerogel/cypress": "<% #local %>file:<% &local.aerogelPath %>/cypress<% /local %><% ^local %>next<% /local %>",
-        "@aerogel/vite": "<% #local %>file:<% &local.aerogelPath %>/vite<% /local %><% ^local %>next<% /local %>",
+        "@aerogel/cli": "<% &dependencies.aerogelCli %>",
+        "@aerogel/cypress": "<% &dependencies.aerogelCypress %>",
+        "@aerogel/vite": "<% &dependencies.aerogelVite %>",
+        "@noeldemartin/eslint-config-vue": "next",
+        "@noeldemartin/scripts": "next",
         "@total-typescript/ts-reset": "^0.4.2",
         "@types/node": "^20.3.1",
         "autoprefixer": "^10.4.14",
         "concurrently": "^8.2.0",
         "cypress": "^12.17.0",
+        "eslint": "^8.40.0",
+        "prettier": "^2.8.8",
+        "prettier-eslint-cli": "^7.1.0",
+        "prettier-plugin-tailwindcss": "^0.2.8",
         "start-server-and-test": "^2.0.0",
         "unplugin-icons": "^0.16.3",
         "unplugin-vue-components": "^0.24.1",
         "vite": "^4.3.0",
-        "vitest": "^0.33.0"
+        "vitest": "^0.33.0",
+        "vue-tsc": "^1.8.15"
     }
 }

package/templates/app/prettier.config.js

@@ -0,0 +1,5 @@
+/** @type {import('prettier').Config} */
+module.exports = {
+    plugins: [require('prettier-plugin-tailwindcss')],
+    printWidth: 120,
+};

package/templates/app/src/App.vue

@@ -1,7 +1,9 @@
 <template>
     <AGAppLayout>
         <main class="flex flex-grow flex-col items-center justify-center bg-blue-50">
-            <h1 class="text-4xl font-semibold">{{ $t('home.title') }}</h1>
+            <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>

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

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

package/templates/app/tailwind.config.js

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

package/templates/app/vite.config.ts

@@ -9,7 +9,6 @@ export default {
     plugins: [
         Aerogel(),
         Components({
-            dirs: ['src/pages'],
             dts: false,
             resolvers: [AerogelResolver(), IconsResolver()],
         }),

package/templates/service/[service.name].ts

@@ -0,0 +1,8 @@
+import { Service } from '@aerogel/core';
+import { facade } from '@noeldemartin/utils';
+
+export class <% service.name %>Service extends Service {
+
+}
+
+export default facade(new <% service.name %>Service());