generator-bitloops 0.3.31 → 0.3.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-bitloops",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "description": "Next.js with TypeScript, Tailwind, Storybook and Cypress generator by Bitloops",
   "license": "MIT",
   "author": "Bitloops S.A.",

package/setup/index.js

@@ -17,6 +17,8 @@ const PLATFORM_NEXT_FOLDER = 'platform-next';
 const PLATFORM_NEXT_SRC_FOLDER = `${PLATFORM_NEXT_FOLDER}/src`;
 const PLATFORM_VITE_FOLDER = 'platform-vite';
 const PLATFORM_VITE_SRC_FOLDER = `${PLATFORM_VITE_FOLDER}/src`;
+const LIB_TYPES_FOLDER = 'lib/types';
+const LIB_ROUTER_FOLDER = 'lib/router';
 
 function isKebabCase(str) {
   // Check if the string is empty
@@ -507,6 +509,36 @@ export default class extends Generator {
           );
         });
 
+        // Lib types files
+        const libTypesFiles = [
+          `${LIB_TYPES_FOLDER}/primitives.types.ts`,
+          `${LIB_TYPES_FOLDER}/image.types.ts`,
+          `${LIB_TYPES_FOLDER}/types.d.ts`,
+        ];
+
+        libTypesFiles.forEach((filePath) => {
+          deleteFileIfExists(this.destinationPath(filePath));
+          this.fs.copyTpl(
+            this.templatePath(filePath),
+            this.destinationPath(filePath),
+          );
+        });
+
+        // Lib router files
+        const libRouterFiles = [
+          `${LIB_ROUTER_FOLDER}/index.ts`,
+          `${LIB_ROUTER_FOLDER}/types.ts`,
+          `${LIB_ROUTER_FOLDER}/useRouter.ts`,
+        ];
+
+        libRouterFiles.forEach((filePath) => {
+          deleteFileIfExists(this.destinationPath(filePath));
+          this.fs.copyTpl(
+            this.templatePath(filePath),
+            this.destinationPath(filePath),
+          );
+        });
+
         this.log('Primitives installed!');
       }
     };
@@ -517,10 +549,7 @@ export default class extends Generator {
         this.log('Making Storybook changes...');
 
         // Copy .storybook template files
-        const storybookFiles = [
-          `${STORYBOOK_FOLDER}/main.ts`,
-          `${STORYBOOK_FOLDER}/vitest.setup.ts`,
-        ];
+        const storybookFiles = [`${STORYBOOK_FOLDER}/main.ts`];
 
         // Delete .storybook/preview.ts if it exists (generated by storybook init)
         deleteFileIfExists(

package/setup/templates/.storybook/main.ts

@@ -23,7 +23,7 @@ const config: StorybookConfig = {
     if (config.resolve) {
       config.resolve.alias = {
         ...config.resolve.alias,
-        '@/primitives': path.resolve(__dirname, '../platform-vite/src'),
+        '@primitives': path.resolve(__dirname, '../platform-vite/src'),
       };
     }
     return config;

package/setup/templates/lib/router/index.ts

@@ -0,0 +1,2 @@
+export * from "./types";
+export { useRouter } from "./useRouter";

package/setup/templates/lib/router/types.ts

@@ -0,0 +1,5 @@
+export interface Router {
+  push: (url: string) => void;
+  replace: (url: string) => void;
+  back: () => void;
+}

package/setup/templates/lib/router/useRouter.ts

@@ -0,0 +1,18 @@
+import type { Router } from './types';
+
+// This will be implemented by platform-specific code
+// The implementation will be injected at build time
+let routerImplementation: (() => Router) | null = null;
+
+export function setRouterImplementation(implementation: () => Router) {
+  routerImplementation = implementation;
+}
+
+export function useRouter(): Router {
+  if (!routerImplementation) {
+    throw new Error(
+      'Router implementation not set. Make sure to call setRouterImplementation in your platform setup.'
+    );
+  }
+  return routerImplementation();
+}

package/setup/templates/lib/types/image.types.ts

@@ -0,0 +1,5 @@
+export interface ImageProperties {
+  src: string;
+  width: number;
+  height: number;
+}

package/setup/templates/lib/types/primitives.types.ts

@@ -0,0 +1,64 @@
+// shared types (export them from both adapters)
+export type ImgProps = {
+  src: string;
+  alt: string;
+  width?: number;
+  height?: number;
+  fill?: boolean;
+  sizes?: string;
+  priority?: boolean;
+  quality?: number;
+  className?: string;
+  style?: React.CSSProperties;
+  loading?: "eager" | "lazy";
+  decoding?: "auto" | "sync" | "async";
+  responsive?: { sources: Array<{ media: string; srcSet: string }> }; // optional <picture>
+};
+
+export type LinkProps = {
+  href: string;
+  children: React.ReactNode;
+  prefetch?: boolean;
+  replace?: boolean;
+  scroll?: boolean;
+  target?: React.HTMLAttributeAnchorTarget;
+  rel?: string;
+  className?: string;
+  style?: React.CSSProperties;
+  onClick?: React.MouseEventHandler<HTMLAnchorElement>;
+  "aria-label"?: string;
+};
+
+export type ButtonProps = {
+  children: React.ReactNode;
+  onClick?: () => void;
+  type?: "button" | "submit" | "reset";
+  disabled?: boolean;
+  className?: string;
+  style?: React.CSSProperties;
+  "aria-label"?: string;
+};
+
+export type MetaProps = {
+  title?: string;
+  description?: string;
+  lang?: string;
+  openGraph?: {
+    title?: string;
+    description?: string;
+    image?: string;
+    url?: string;
+    type?: string;
+  };
+  twitter?: {
+    card?: string;
+    title?: string;
+    description?: string;
+    image?: string;
+  };
+  icons?: { icon?: string; apple?: string };
+};
+
+export type FontSpec =
+  | { kind: "next"; fonts: Array<{ variable: string; loader: () => unknown }> } // Next native loaders
+  | { kind: "css"; hrefs: string[]; className?: string };

package/setup/templates/lib/types/types.d.ts

@@ -0,0 +1,4 @@
+declare module "*.svg" {
+  const content: string;
+  export default content;
+}

package/setup/templates/tsconfig.json

@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
     "target": "ES2022",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -20,17 +24,42 @@
     ],
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"],
-      "@/components/*": ["src/components/*"],
-      "@/assets/*": ["src/assets/*"],
-      "@/primitives": ["platform-next/src"],
-      "@/primitives/*": ["platform-next/src/*"],
-      "@/hooks/*": ["src/hooks/*"],
-      "@/lib/*": ["src/lib/*"],
-      "@/types/*": ["src/types/*"],
-      "@/utils/*": ["src/utils/*"]
+      "@/*": [
+        "src/*"
+      ],
+      "@/components/*": [
+        "src/components/*"
+      ],
+      "@/assets/*": [
+        "src/assets/*"
+      ],
+      "@primitives": [
+        "platform-next/src"
+      ],
+      "@primitives/*": [
+        "platform-next/src/*"
+      ],
+      "@/hooks/*": [
+        "src/hooks/*"
+      ],
+      "@/lib/*": [
+        "src/lib/*"
+      ],
+      "@/types/*": [
+        "src/types/*"
+      ],
+      "@/utils/*": [
+        "src/utils/*"
+      ]
     }
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
-}
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}

package/setup/templates/.storybook/vitest.setup.ts

@@ -1,7 +0,0 @@
-import * as a11yAddonAnnotations from "@storybook/addon-a11y/preview";
-import { setProjectAnnotations } from '@storybook/nextjs-vite';
-import * as projectAnnotations from './preview';
-
-// This is an important step to apply the right configuration when testing your stories.
-// More info at: https://storybook.js.org/docs/api/portable-stories/portable-stories-vitest#setprojectannotations
-setProjectAnnotations([a11yAddonAnnotations, projectAnnotations]);