@springmicro/cli 0.1.8 → 0.2.0-alpha.0

package/README.md

@@ -26,7 +26,7 @@ $ npm install -g @springmicro/cli
 $ springmicro COMMAND
 running command...
 $ springmicro (--version)
-@springmicro/cli/0.1.8 win32-x64 node-v18.17.1
+@springmicro/cli/0.2.0-alpha.0 win32-x64 node-v20.15.0
 $ springmicro --help [COMMAND]
 USAGE
   $ springmicro COMMAND
@@ -81,7 +81,7 @@ EXAMPLES
   $ springmicro add auth
 ```
 
-_See code: [src/commands/add/auth.ts](https://github.com/SpringMicro1/springmicrohost-js/blob/v0.1.8/src/commands/add/auth.ts)_
+_See code: [src/commands/add/auth.ts](https://github.com/SpringMicro1/springmicrohost-js/blob/v0.2.0-alpha.0/src/commands/add/auth.ts)_
 
 ## `springmicro help [COMMAND]`
 
@@ -101,7 +101,7 @@ DESCRIPTION
   Display help for springmicro.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.0/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.5/src/commands/help.ts)_
 
 ## `springmicro init PROJECTTYPE`
 
@@ -124,7 +124,7 @@ EXAMPLES
   $ springmicro init astro -n example
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/SpringMicro1/springmicrohost-js/blob/v0.1.8/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/SpringMicro1/springmicrohost-js/blob/v0.2.0-alpha.0/src/commands/init/index.ts)_
 
 ## `springmicro init astro`
 
@@ -144,7 +144,7 @@ EXAMPLES
   $ springmicro init astro -n <project-name>
 ```
 
-_See code: [src/commands/init/astro.ts](https://github.com/SpringMicro1/springmicrohost-js/blob/v0.1.8/src/commands/init/astro.ts)_
+_See code: [src/commands/init/astro.ts](https://github.com/SpringMicro1/springmicrohost-js/blob/v0.2.0-alpha.0/src/commands/init/astro.ts)_
 
 ## `springmicro plugins`
 
@@ -167,7 +167,7 @@ EXAMPLES
   $ springmicro plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.2.3/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.4/src/commands/plugins/index.ts)_
 
 ## `springmicro plugins add PLUGIN`
 
@@ -241,7 +241,7 @@ EXAMPLES
   $ springmicro plugins inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.2.3/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.4/src/commands/plugins/inspect.ts)_
 
 ## `springmicro plugins install PLUGIN`
 
@@ -290,7 +290,7 @@ EXAMPLES
     $ springmicro plugins install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.2.3/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.4/src/commands/plugins/install.ts)_
 
 ## `springmicro plugins link PATH`
 
@@ -320,7 +320,7 @@ EXAMPLES
   $ springmicro plugins link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.2.3/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.4/src/commands/plugins/link.ts)_
 
 ## `springmicro plugins remove [PLUGIN]`
 
@@ -361,7 +361,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.2.3/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.4/src/commands/plugins/reset.ts)_
 
 ## `springmicro plugins uninstall [PLUGIN]`
 
@@ -389,7 +389,7 @@ EXAMPLES
   $ springmicro plugins uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.2.3/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.4/src/commands/plugins/uninstall.ts)_
 
 ## `springmicro plugins unlink [PLUGIN]`
 
@@ -433,7 +433,7 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.2.3/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.4/src/commands/plugins/update.ts)_
 <!-- commandsstop -->
 
 - [`springmicro help [COMMAND]`](#springmicro-help-command)

package/dist/commands/init/astro.js

@@ -5,6 +5,7 @@ import { tailwindConfigMjs, globalsCSS, libUtils, componentsJSON } from '../../d
 import chalk from 'chalk';
 import { logStep } from '../../log/index.js';
 import { checkUnixShellAndSpawn } from '../../utils/shell.js';
+import { replaceHeadContents } from '../../data/astro/replace.js';
 export default class Astro extends Command {
     static step = 1;
     static totalSteps = 2;
@@ -38,6 +39,7 @@ export default class Astro extends Command {
         const libUtilsPath = path.join(name, 'src', 'lib');
         const libUtilsFilePath = path.join(libUtilsPath, 'utils.ts');
         const publicFontsDirPath = path.join(name, 'public', 'fonts');
+        const baseHeadPath = path.join(name, 'src', 'components', 'BaseHead.astro');
         const tsConfig = JSON.parse(fs.readFileSync(tsConfigFilePath).toString());
         // see https://ui.shadcn.com/docs/installation/manual
         // extracted 6/6/2024
@@ -45,7 +47,7 @@ export default class Astro extends Command {
             ...tsConfig['compilerOptions'],
             baseUrl: '.',
             paths: {
-                '@/*': ['./*'],
+                '@/*': ['./src/*'],
             },
         };
         this.log('write to ' + chalk.cyan(tsConfigFilePath));
@@ -61,6 +63,9 @@ export default class Astro extends Command {
             fs.mkdirSync(libUtilsPath, { recursive: true });
         }
         fs.writeFileSync(libUtilsFilePath, libUtils);
+        // file manip
+        this.log('replace contents of ' + chalk.greenBright(libUtilsFilePath));
+        replaceHeadContents(baseHeadPath);
         // remove any extra files
         this.log('remove unused ' + chalk.red(publicFontsDirPath));
         fs.rmSync(publicFontsDirPath, {

package/dist/data/astro/index.d.ts

@@ -1,5 +1,5 @@
-export declare const tailwindConfigMjs = "const { fontFamily } = require(\"tailwindcss/defaultTheme\")\n\n/** @type {import('tailwindcss').Config} */\nmodule.exports = {\n  darkMode: [\"class\"],\n  content: [\"./src/**/*.{ts,tsx,astro}\"],\n  theme: {\n    container: {\n      center: true,\n      padding: \"2rem\",\n      screens: {\n        \"2xl\": \"1400px\",\n      },\n    },\n    extend: {\n      colors: {\n        border: \"hsl(var(--border))\",\n        input: \"hsl(var(--input))\",\n        ring: \"hsl(var(--ring))\",\n        background: \"hsl(var(--background))\",\n        foreground: \"hsl(var(--foreground))\",\n        primary: {\n          DEFAULT: \"hsl(var(--primary))\",\n          foreground: \"hsl(var(--primary-foreground))\",\n        },\n        secondary: {\n          DEFAULT: \"hsl(var(--secondary))\",\n          foreground: \"hsl(var(--secondary-foreground))\",\n        },\n        destructive: {\n          DEFAULT: \"hsl(var(--destructive))\",\n          foreground: \"hsl(var(--destructive-foreground))\",\n        },\n        muted: {\n          DEFAULT: \"hsl(var(--muted))\",\n          foreground: \"hsl(var(--muted-foreground))\",\n        },\n        accent: {\n          DEFAULT: \"hsl(var(--accent))\",\n          foreground: \"hsl(var(--accent-foreground))\",\n        },\n        popover: {\n          DEFAULT: \"hsl(var(--popover))\",\n          foreground: \"hsl(var(--popover-foreground))\",\n        },\n        card: {\n          DEFAULT: \"hsl(var(--card))\",\n          foreground: \"hsl(var(--card-foreground))\",\n        },\n      },\n      borderRadius: {\n        lg: `var(--radius)`,\n        md: `calc(var(--radius) - 2px)`,\n        sm: \"calc(var(--radius) - 4px)\",\n      },\n      fontFamily: {\n        sans: [\"var(--font-sans)\", ...fontFamily.sans],\n      },\n      keyframes: {\n        \"accordion-down\": {\n          from: { height: \"0\" },\n          to: { height: \"var(--radix-accordion-content-height)\" },\n        },\n        \"accordion-up\": {\n          from: { height: \"var(--radix-accordion-content-height)\" },\n          to: { height: \"0\" },\n        },\n      },\n      animation: {\n        \"accordion-down\": \"accordion-down 0.2s ease-out\",\n        \"accordion-up\": \"accordion-up 0.2s ease-out\",\n      },\n    },\n  },\n  plugins: [require(\"tailwindcss-animate\")],\n}";
-export declare const globalsCSS = "@tailwind base;\n@tailwind components;\n@tailwind utilities;\n\n@layer base {\n  :root {\n    /* default font added */\n    --font-sans: ui-sans-serif;\n\n    --background: 0 0% 100%;\n    --foreground: 222.2 47.4% 11.2%;\n\n    --muted: 210 40% 96.1%;\n    --muted-foreground: 215.4 16.3% 46.9%;\n\n    --popover: 0 0% 100%;\n    --popover-foreground: 222.2 47.4% 11.2%;\n\n    --border: 214.3 31.8% 91.4%;\n    --input: 214.3 31.8% 91.4%;\n\n    --card: 0 0% 100%;\n    --card-foreground: 222.2 47.4% 11.2%;\n\n    --primary: 222.2 47.4% 11.2%;\n    --primary-foreground: 210 40% 98%;\n\n    --secondary: 210 40% 96.1%;\n    --secondary-foreground: 222.2 47.4% 11.2%;\n\n    --accent: 210 40% 96.1%;\n    --accent-foreground: 222.2 47.4% 11.2%;\n\n    --destructive: 0 100% 50%;\n    --destructive-foreground: 210 40% 98%;\n\n    --ring: 215 20.2% 65.1%;\n\n    --radius: 0.5rem;\n  }\n\n  .dark {\n    --background: 224 71% 4%;\n    --foreground: 213 31% 91%;\n\n    --muted: 223 47% 11%;\n    --muted-foreground: 215.4 16.3% 56.9%;\n\n    --accent: 216 34% 17%;\n    --accent-foreground: 210 40% 98%;\n\n    --popover: 224 71% 4%;\n    --popover-foreground: 215 20.2% 65.1%;\n\n    --border: 216 34% 17%;\n    --input: 216 34% 17%;\n\n    --card: 224 71% 4%;\n    --card-foreground: 213 31% 91%;\n\n    --primary: 210 40% 98%;\n    --primary-foreground: 222.2 47.4% 1.2%;\n\n    --secondary: 222.2 47.4% 11.2%;\n    --secondary-foreground: 210 40% 98%;\n\n    --destructive: 0 63% 31%;\n    --destructive-foreground: 210 40% 98%;\n\n    --ring: 216 34% 17%;\n\n    --radius: 0.5rem;\n  }\n}\n\n@layer base {\n  * {\n    @apply border-border;\n  }\n  body {\n    @apply bg-background text-foreground;\n    font-feature-settings: \"rlig\" 1, \"calt\" 1;\n  }\n  /* custom from blog astro template */\n  main {\n    width: 720px;\n    max-width: calc(100% - 2em);\n    margin: auto;\n    padding: 3em 1em;\n  }\n  .prose p {\n\t  margin-bottom: 2em;\n  }\n}\n";
+export declare const tailwindConfigMjs = "const { fontFamily } = require(\"tailwindcss/defaultTheme\")\n\n/** @type {import('tailwindcss').Config} */\nmodule.exports = {\n  darkMode: [\"class\"],\n  content: [\"./src/**/*.{ts,tsx,astro}\"],\n  theme: {\n    container: {\n      center: true,\n      padding: \"2rem\",\n      screens: {\n        \"2xl\": \"1400px\",\n      },\n    },\n    extend: {\n      colors: {\n        border: \"hsl(var(--border))\",\n        input: \"hsl(var(--input))\",\n        ring: \"hsl(var(--ring))\",\n        background: \"hsl(var(--background))\",\n        foreground: \"hsl(var(--foreground))\",\n        primary: {\n          DEFAULT: \"hsl(var(--primary))\",\n          foreground: \"hsl(var(--primary-foreground))\",\n        },\n        secondary: {\n          DEFAULT: \"hsl(var(--secondary))\",\n          foreground: \"hsl(var(--secondary-foreground))\",\n        },\n        destructive: {\n          DEFAULT: \"hsl(var(--destructive))\",\n          foreground: \"hsl(var(--destructive-foreground))\",\n        },\n        muted: {\n          DEFAULT: \"hsl(var(--muted))\",\n          foreground: \"hsl(var(--muted-foreground))\",\n        },\n        accent: {\n          DEFAULT: \"hsl(var(--accent))\",\n          foreground: \"hsl(var(--accent-foreground))\",\n        },\n        popover: {\n          DEFAULT: \"hsl(var(--popover))\",\n          foreground: \"hsl(var(--popover-foreground))\",\n        },\n        card: {\n          DEFAULT: \"hsl(var(--card))\",\n          foreground: \"hsl(var(--card-foreground))\",\n        },\n      },\n      borderRadius: {\n        lg: `var(--radius)`,\n        md: `calc(var(--radius) - 2px)`,\n        sm: \"calc(var(--radius) - 4px)\",\n      },\n      fontFamily: {\n        sans: [\"var(--font-sans)\", ...fontFamily.sans],\n      },\n      keyframes: {\n        \"accordion-down\": {\n          from: { height: \"0\" },\n          to: { height: \"var(--radix-accordion-content-height)\" },\n        },\n        \"accordion-up\": {\n          from: { height: \"var(--radix-accordion-content-height)\" },\n          to: { height: \"0\" },\n        },\n      },\n      animation: {\n        \"accordion-down\": \"accordion-down 0.2s ease-out\",\n        \"accordion-up\": \"accordion-up 0.2s ease-out\",\n      },\n    },\n  },\n  plugins: [require(\"@tailwindcss/typography\"), require(\"tailwindcss-animate\")],\n}";
+export declare const globalsCSS = "@tailwind base;\n@tailwind components;\n@tailwind utilities;\n\n@layer base {\n  :root {\n    /* default font added */\n    --font-sans: ui-sans-serif;\n\n    --background: 0 0% 100%;\n    --foreground: 222.2 47.4% 11.2%;\n\n    --muted: 210 40% 96.1%;\n    --muted-foreground: 215.4 16.3% 46.9%;\n\n    --popover: 0 0% 100%;\n    --popover-foreground: 222.2 47.4% 11.2%;\n\n    --border: 214.3 31.8% 91.4%;\n    --input: 214.3 31.8% 91.4%;\n\n    --card: 0 0% 100%;\n    --card-foreground: 222.2 47.4% 11.2%;\n\n    --primary: 222.2 47.4% 11.2%;\n    --primary-foreground: 210 40% 98%;\n\n    --secondary: 210 40% 96.1%;\n    --secondary-foreground: 222.2 47.4% 11.2%;\n\n    --accent: 210 40% 96.1%;\n    --accent-foreground: 222.2 47.4% 11.2%;\n\n    --destructive: 0 100% 50%;\n    --destructive-foreground: 210 40% 98%;\n\n    --ring: 215 20.2% 65.1%;\n\n    --radius: 0.5rem;\n  }\n\n  .dark {\n    --background: 224 71% 4%;\n    --foreground: 213 31% 91%;\n\n    --muted: 223 47% 11%;\n    --muted-foreground: 215.4 16.3% 56.9%;\n\n    --accent: 216 34% 17%;\n    --accent-foreground: 210 40% 98%;\n\n    --popover: 224 71% 4%;\n    --popover-foreground: 215 20.2% 65.1%;\n\n    --border: 216 34% 17%;\n    --input: 216 34% 17%;\n\n    --card: 224 71% 4%;\n    --card-foreground: 213 31% 91%;\n\n    --primary: 210 40% 98%;\n    --primary-foreground: 222.2 47.4% 1.2%;\n\n    --secondary: 222.2 47.4% 11.2%;\n    --secondary-foreground: 210 40% 98%;\n\n    --destructive: 0 63% 31%;\n    --destructive-foreground: 210 40% 98%;\n\n    --ring: 216 34% 17%;\n\n    --radius: 0.5rem;\n  }\n}\n\n@layer base {\n  * {\n    @apply border-border;\n  }\n  body {\n    @apply bg-background text-foreground;\n    font-feature-settings: \"rlig\" 1, \"calt\" 1;\n  }\n  /* custom from blog astro template */\n  main {\n    width: 720px;\n    max-width: calc(100% - 2em);\n    margin: auto;\n    padding: 3em 1em;\n  }\n}\n";
 export declare const libUtils = "import { clsx, type ClassValue } from \"clsx\"\nimport { twMerge } from \"tailwind-merge\"\n\nexport function cn(...inputs: ClassValue[]) {\n  return twMerge(clsx(inputs))\n}\n";
 /**
  * from https://ui.shadcn.com/docs/components-json

package/dist/data/astro/index.js

@@ -75,7 +75,7 @@ module.exports = {
       },
     },
   },
-  plugins: [require("tailwindcss-animate")],
+  plugins: [require("@tailwindcss/typography"), require("tailwindcss-animate")],
 }`;
 export const globalsCSS = `@tailwind base;
 @tailwind components;
@@ -167,9 +167,6 @@ export const globalsCSS = `@tailwind base;
     margin: auto;
     padding: 3em 1em;
   }
-  .prose p {
-	  margin-bottom: 2em;
-  }
 }
 `;
 export const libUtils = `import { clsx, type ClassValue } from "clsx"

package/dist/data/astro/replace.d.ts

@@ -0,0 +1,2 @@
+/** Replace any head contents that we don't need like font preloads */
+export declare function replaceHeadContents(filePath: string): void;

package/dist/data/astro/replace.js

@@ -0,0 +1,8 @@
+import fs from 'node:fs';
+/** Replace any head contents that we don't need like font preloads */
+export function replaceHeadContents(filePath) {
+    const data = fs.readFileSync(filePath).toString();
+    const regex = /<link rel="preload" href="\/fonts\/atkinson-.*?\.woff" as="font" type="font\/woff" crossorigin \/>/g;
+    const result = data.replace(regex, '');
+    fs.writeFileSync(filePath, result);
+}

package/dist/scripts/astro.bat

@@ -23,8 +23,12 @@ if errorlevel 1 exit /b %errorlevel%
 pnpx astro add tailwind -y
 if errorlevel 1 exit /b %errorlevel%
 
-:: Install additional packages for shadcn-ui
-pnpm install tailwindcss-animate class-variance-authority clsx tailwind-merge lucide-react
+:: Install additional packages for shadcn-ui + icon libraries
+pnpm install tailwindcss-animate class-variance-authority clsx tailwind-merge lucide-react react-icons
+if errorlevel 1 exit /b %errorlevel%
+
+:: Install dev packages
+pnpm install -D @tailwindcss/typography
 if errorlevel 1 exit /b %errorlevel%
 
 endlocal

package/dist/scripts/astro.sh

@@ -5,4 +5,5 @@ pnpx astro add react -y
 pnpx astro add tailwind -y
 # shadcn-ui
 # https://ui.shadcn.com/docs/installation/manual
-pnpm install tailwindcss-animate class-variance-authority clsx tailwind-merge lucide-react
+pnpm install tailwindcss-animate class-variance-authority clsx tailwind-merge lucide-react react-icons
+pnpm install -D @tailwindcss/typography

package/oclif.manifest.json

@@ -101,5 +101,5 @@
       ]
     }
   },
-  "version": "0.1.8"
+  "version": "0.2.0-alpha.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@springmicro/cli",
   "description": "A new CLI generated with oclif",
-  "version": "0.1.8",
+  "version": "0.2.0-alpha.0",
   "author": "David Buckley",
   "private": false,
   "publishConfig": {
@@ -76,5 +76,5 @@
     "version": "oclif readme && git add README.md"
   },
   "types": "dist/index.d.ts",
-  "gitHead": "7f7d9ece4d987ffceb47b504a95b973544862086"
+  "gitHead": "99d420d7d0ad1b78e03e986fa190e89e793d43b3"
 }