@aerogel/cli 0.0.0-next.926bde19326fe7b6b24b277666936862b64d8295 → 0.0.0-next.a56c0f4966eb71571173f8502f3f36d357ceebc7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/dist/aerogel-cli.cjs.js +1 -1
  2. package/dist/aerogel-cli.cjs.js.map +1 -1
  3. package/dist/aerogel-cli.esm.js +1 -1
  4. package/dist/aerogel-cli.esm.js.map +1 -1
  5. package/package.json +11 -4
  6. package/src/cli.ts +4 -0
  7. package/src/commands/create.test.ts +22 -5
  8. package/src/commands/create.ts +21 -4
  9. package/src/commands/generate-component.test.ts +12 -1
  10. package/src/commands/generate-component.ts +127 -20
  11. package/src/commands/generate-model.test.ts +7 -4
  12. package/src/commands/generate-model.ts +30 -21
  13. package/src/commands/generate-service.test.ts +21 -0
  14. package/src/commands/generate-service.ts +151 -0
  15. package/src/commands/install.test.ts +18 -0
  16. package/src/commands/install.ts +32 -0
  17. package/src/lib/App.ts +65 -3
  18. package/src/lib/Editor.ts +56 -0
  19. package/src/lib/File.ts +6 -0
  20. package/src/lib/Log.mock.ts +2 -1
  21. package/src/lib/Log.ts +6 -4
  22. package/src/lib/utils/app.ts +15 -0
  23. package/src/lib/utils/edit.ts +44 -0
  24. package/src/lib/utils/paths.ts +34 -0
  25. package/src/plugins/Plugin.ts +125 -0
  26. package/src/plugins/Solid.ts +114 -0
  27. package/src/plugins/Soukai.ts +19 -0
  28. package/src/testing/setup.ts +36 -6
  29. package/templates/app/.github/workflows/ci.yml +14 -2
  30. package/templates/app/.vscode/launch.json +16 -0
  31. package/templates/app/.vscode/settings.json +10 -0
  32. package/templates/app/README.md +3 -0
  33. package/templates/app/cypress/cypress.config.ts +16 -0
  34. package/templates/app/index.html +4 -3
  35. package/templates/app/package.json +33 -9
  36. package/templates/app/src/App.vue +5 -3
  37. package/templates/app/src/assets/public/robots.txt +2 -0
  38. package/templates/app/src/main.ts +6 -2
  39. package/templates/app/src/types/globals.d.ts +0 -1
  40. package/templates/app/tailwind.config.js +1 -1
  41. package/templates/app/tsconfig.json +1 -0
  42. package/templates/app/vite.config.ts +14 -6
  43. package/templates/service/[service.name].ts +8 -0
  44. package/.eslintrc.js +0 -7
  45. package/noeldemartin.config.js +0 -4
  46. package/src/lib/utils.test.ts +0 -33
  47. package/src/lib/utils.ts +0 -44
  48. package/templates/app/cypress.config.ts +0 -8
  49. /package/templates/app/src/assets/{styles.css → css/styles.css} +0 -0
package/templates/app/.vscode/settings.json ADDED
@@ -0,0 +1,10 @@
1
+ {
2
+ "emeraldwalk.runonsave": {
3
+ "commands": [
4
+ {
5
+ "match": ".*",
6
+ "cmd": "npx prettier-eslint ${file} --write"
7
+ }
8
+ ]
9
+ }
10
+ }
package/templates/app/README.md ADDED
@@ -0,0 +1,3 @@
1
+ # <% app.name %>
2
+
3
+ App created with [AerogelJS](https://aerogel.js.org)
package/templates/app/cypress/cypress.config.ts ADDED
@@ -0,0 +1,16 @@
1
+ import install from '@aerogel/cypress/dist/plugin';
2
+ import { defineConfig } from 'cypress';
3
+
4
+ export default defineConfig({
5
+ e2e: {
6
+ baseUrl: 'http://localhost:5001',
7
+ video: false,
8
+ retries: {
9
+ runMode: 3,
10
+ openMode: 0,
11
+ },
12
+ setupNodeEvents(on) {
13
+ install(on);
14
+ },
15
+ },
16
+ });
package/templates/app/index.html CHANGED
@@ -3,10 +3,11 @@
3
3
  <head>
4
4
  <meta charset="UTF-8" />
5
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
6
- <title><% app.name %></title>
6
+ <title>{{ app.name }}</title>
7
+ {{ socialMeta() }}
7
8
  </head>
8
- <body class="h-full w-full">
9
- <div id="app" class="h-full"></div>
9
+ <body class="h-full w-full text-base font-normal leading-tight text-gray-900 antialiased">
10
+ <div id="app" class="loading h-full"></div>
10
11
  <script type="module" src="./src/main.ts"></script>
11
12
  </body>
12
13
  </html>
package/templates/app/package.json CHANGED
@@ -5,9 +5,11 @@
5
5
  "scripts": {
6
6
  "build": "vite build",
7
7
  "cy:dev": "concurrently --kill-others \"npm run test:serve-app\" \"npm run cy:open\"",
8
- "cy:open": "cypress open --e2e --browser chromium",
9
- "cy:run": "cypress run",
8
+ "cy:open": "cypress open --config-file ./cypress/cypress.config.ts --e2e --browser chromium",
9
+ "cy:run": "cypress run --config-file ./cypress/cypress.config.ts",
10
10
  "cy:test": "start-server-and-test test:serve-app http-get://localhost:5001 cy:run",
11
+ "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\"",
12
+ "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\"",
11
13
  "dev": "vite",
12
14
  "lint": "noeldemartin-lint src",
13
15
  "test": "vitest --run",
@@ -15,28 +17,50 @@
15
17
  "test:serve-app": "vite --port 5001"
16
18
  },
17
19
  "dependencies": {
18
- "@aerogel/core": "next",
19
- "@aerogel/plugin-i18n": "next",
20
+ "@aerogel/core": "<% &dependencies.aerogelCore %>",
21
+ "@aerogel/plugin-i18n": "<% &dependencies.aerogelPluginI18n %>",
22
+ "@aerogel/plugin-soukai": "<% &dependencies.aerogelPluginSoukai %>",
20
23
  "@intlify/unplugin-vue-i18n": "^0.12.2",
24
+ "@noeldemartin/utils": "next",
21
25
  "@tailwindcss/forms": "^0.5.3",
22
26
  "@tailwindcss/typography": "^0.5.9",
27
+ "soukai": "next",
23
28
  "tailwindcss": "^3.3.2",
24
29
  "vue": "^3.3.0",
25
30
  "vue-i18n": "9.3.0-beta.19"
26
31
  },
27
32
  "devDependencies": {
28
- "@aerogel/cli": "next",
29
- "@aerogel/cypress": "next",
30
- "@aerogel/vite": "next",
31
- "@noeldemartin/utils": "0.4.0-next.ac00beaecf32bb02ed8e335225d7948d946d73bd",
33
+ "@aerogel/cli": "<% &dependencies.aerogelCli %>",
34
+ "@aerogel/cypress": "<% &dependencies.aerogelCypress %>",
35
+ "@aerogel/vite": "<% &dependencies.aerogelVite %>",
36
+ "@iconify/json": "^2.2.134",
37
+ "@noeldemartin/eslint-config-vue": "next",
38
+ "@noeldemartin/scripts": "next",
32
39
  "@total-typescript/ts-reset": "^0.4.2",
33
40
  "@types/node": "^20.3.1",
34
41
  "autoprefixer": "^10.4.14",
35
42
  "concurrently": "^8.2.0",
36
43
  "cypress": "^12.17.0",
44
+ "eslint": "^8.40.0",
45
+ "prettier": "^2.8.8",
46
+ "prettier-eslint-cli": "^7.1.0",
47
+ "prettier-plugin-tailwindcss": "^0.2.8",
37
48
  "start-server-and-test": "^2.0.0",
49
+ "unplugin-icons": "^0.16.3",
38
50
  "unplugin-vue-components": "^0.24.1",
39
51
  "vite": "^4.3.0",
40
- "vitest": "^0.33.0"
52
+ "vitest": "^0.33.0",
53
+ "vue-tsc": "^1.8.15"
54
+ },
55
+ "eslintConfig": {
56
+ "extends": [
57
+ "@noeldemartin/eslint-config-vue"
58
+ ]
59
+ },
60
+ "prettier": {
61
+ "plugins": [
62
+ "prettier-plugin-tailwindcss"
63
+ ],
64
+ "printWidth": 120
41
65
  }
42
66
  }
package/templates/app/src/App.vue CHANGED
@@ -1,7 +1,9 @@
1
1
  <template>
2
- <AGAppLayout>
3
- <main class="flex flex-grow flex-col items-center justify-center bg-blue-50">
4
- <h1 class="text-4xl font-semibold">{{ $t('home.title') }}</h1>
2
+ <AGAppLayout class="bg-blue-50">
3
+ <main class="flex flex-grow flex-col items-center justify-center">
4
+ <h1 class="text-4xl font-semibold">
5
+ {{ $t('home.title') }}
6
+ </h1>
5
7
  <a href="https://aerogel.js.org" target="_blank" class="mt-2 underline opacity-75 hover:opacity-100">
6
8
  {{ $t('home.getStarted') }}
7
9
  </a>
package/templates/app/src/assets/public/robots.txt ADDED
@@ -0,0 +1,2 @@
1
+ User-agent: *
2
+ Disallow:
package/templates/app/src/main.ts CHANGED
@@ -1,9 +1,13 @@
1
1
  import i18n from '@aerogel/plugin-i18n';
2
+ import soukai from '@aerogel/plugin-soukai';
2
3
  import { bootstrapApplication } from '@aerogel/core';
3
4
 
4
- import './assets/styles.css';
5
+ import './assets/css/styles.css';
5
6
  import App from './App.vue';
6
7
 
7
8
  bootstrapApplication(App, {
8
- plugins: [i18n({ messages: import.meta.glob('@/lang/*.yaml') })],
9
+ plugins: [
10
+ i18n({ messages: import.meta.glob('@/lang/*.yaml') }),
11
+ soukai({ models: import.meta.glob('@/models/*', { eager: true }) }),
12
+ ],
9
13
  });
package/templates/app/src/types/globals.d.ts CHANGED
@@ -1,3 +1,2 @@
1
1
  /// <reference types="vite/client" />
2
- /// <reference types="vue-router" />
3
2
  /// <reference types="vue-i18n" />
package/templates/app/tailwind.config.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /** @type {import('tailwindcss').Config} */
2
2
  module.exports = {
3
- content: ['./index.html', './src/**/*.{vue,ts}', './node_modules/@aerogel/core/dist/**/*.js'],
3
+ content: ['./index.html', './src/**/*.{vue,ts}', '<% &contentPath %>'],
4
4
  plugins: [require('@tailwindcss/forms'), require('@tailwindcss/typography')],
5
5
  };
package/templates/app/tsconfig.json CHANGED
@@ -6,6 +6,7 @@
6
6
  "strict": true,
7
7
  "jsx": "preserve",
8
8
  "noUncheckedIndexedAccess": true,
9
+ "skipLibCheck": true,
9
10
  "resolveJsonModule": true,
10
11
  "esModuleInterop": true,
11
12
  "lib": ["esnext", "dom"],
package/templates/app/vite.config.ts CHANGED
@@ -1,16 +1,24 @@
1
1
  import Aerogel, { AerogelResolver } from '@aerogel/vite';
2
2
  import Components from 'unplugin-vue-components/vite';
3
3
  import I18n from '@intlify/unplugin-vue-i18n/vite';
4
+ import Icons from 'unplugin-icons/vite';
5
+ import IconsResolver from 'unplugin-icons/resolver';
6
+ import { defineConfig } from 'vitest/config';
4
7
  import { resolve } from 'path';
5
8
 
6
- export default {
9
+ export default defineConfig({
10
+ publicDir: resolve(__dirname, './src/assets/public/'),
7
11
  plugins: [
8
- I18n({ include: resolve(__dirname, './src/lang/**/*.yaml') }),
9
- Aerogel(),
12
+ Aerogel({ name: '<% app.name %>' }),
10
13
  Components({
11
- dirs: ['src/pages'],
12
14
  dts: false,
13
- resolvers: [AerogelResolver()],
15
+ resolvers: [AerogelResolver(), IconsResolver()],
16
+ }),
17
+ I18n({ include: resolve(__dirname, './src/lang/**/*.yaml') }),
18
+ Icons({
19
+ iconCustomizer(_, __, props) {
20
+ props['aria-hidden'] = 'true';
21
+ },
14
22
  }),
15
23
  ],
16
24
  resolve: {
@@ -18,4 +26,4 @@ export default {
18
26
  '@': resolve(__dirname, './src'),
19
27
  },
20
28
  },
21
- };
29
+ });
package/templates/service/[service.name].ts ADDED
@@ -0,0 +1,8 @@
1
+ import { Service } from '@aerogel/core';
2
+ import { facade } from '@noeldemartin/utils';
3
+
4
+ export class <% service.name %>Service extends Service {
5
+
6
+ }
7
+
8
+ export default facade(new <% service.name %>Service());
package/.eslintrc.js DELETED
@@ -1,7 +0,0 @@
1
- module.exports = {
2
- env: {
3
- browser: true,
4
- es2021: true,
5
- },
6
- extends: ['@noeldemartin/eslint-config-typescript'],
7
- };
package/noeldemartin.config.js DELETED
@@ -1,4 +0,0 @@
1
- /** @type {import('@noeldemartin/scripts').Config} */
2
- module.exports = {
3
- external: ['fs', '@noeldemartin/utils', 'chalk', 'child_process', 'commander', 'mustache', 'path', 'readline'],
4
- };
package/src/lib/utils.test.ts DELETED
@@ -1,33 +0,0 @@
1
- import { describe, expect, it } from 'vitest';
2
-
3
- import { formatCodeBlock } from './utils';
4
-
5
- describe('Utils', () => {
6
-
7
- it('Formats code blocks', () => {
8
- // Arrange
9
- const raw = `
10
-
11
- const foo = 'bar';
12
-
13
- if (foo) {
14
- doSomething();
15
- }
16
-
17
- `;
18
- const formatted = [
19
- 'const foo = \'bar\';', //
20
- '', //
21
- 'if (foo) {', //
22
- ' doSomething();', //
23
- '}', //
24
- ].join('\n');
25
-
26
- // Act
27
- const actual = formatCodeBlock(raw);
28
-
29
- // Assert
30
- expect(actual).toEqual(formatted);
31
- });
32
-
33
- });
package/src/lib/utils.ts DELETED
@@ -1,44 +0,0 @@
1
- import { resolve } from 'path';
2
-
3
- export interface FormatCodeBlockOptions {
4
- indent?: number;
5
- }
6
-
7
- export function basePath(path: string): string {
8
- return resolve(__dirname, '../', path);
9
- }
10
-
11
- export function formatCodeBlock(code: string, options: FormatCodeBlockOptions = {}): string {
12
- const lines = code.split('\n');
13
- const indent = options.indent ?? 0;
14
- let originalIndent = 0;
15
- let formatted = '';
16
-
17
- for (const line of lines) {
18
- const trimmedLine = line.trim();
19
- const isEmptyLine = trimmedLine.length === 0;
20
-
21
- if (formatted.length === 0) {
22
- if (isEmptyLine) {
23
- continue;
24
- }
25
-
26
- originalIndent = line.indexOf(trimmedLine[0] ?? '');
27
- formatted += `${' '.repeat(indent)}${trimmedLine}\n`;
28
-
29
- continue;
30
- }
31
-
32
- if (isEmptyLine) {
33
- formatted += '\n';
34
-
35
- continue;
36
- }
37
-
38
- const lineIndent = line.indexOf(trimmedLine[0] ?? '');
39
-
40
- formatted += `${' '.repeat(indent + lineIndent - originalIndent)}${trimmedLine}\n`;
41
- }
42
-
43
- return formatted.trimEnd();
44
- }
package/templates/app/cypress.config.ts DELETED
@@ -1,8 +0,0 @@
1
- import { defineConfig } from 'cypress';
2
-
3
- export default defineConfig({
4
- e2e: {
5
- baseUrl: 'http://localhost:5001',
6
- video: false,
7
- },
8
- });