Skip to content
Closed

Test #215

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .github/workflows/build-design-system.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Build Design System

on:
push:
paths:
- "packages/design-system/src/tokens/**" # Trigger only when files in the tokens folder change
pull_request:
paths:
- "packages/design-system/src/tokens/**"

jobs:
build-design-system:
runs-on: ubuntu-latest

steps:
# Step 1: Checkout the repository
- name: Checkout repository
uses: actions/checkout@v3

# Step 2: Set up Bun
- name: Setup Bun
uses: oven-sh/setup-bun@v1
with:
bun-version: latest

# Step 3: Navigate to the design-system package and install dependencies
- name: Install dependencies
working-directory: ./packages/design-system
run: bun install

# Step 4: Run the build script
- name: Run build script
working-directory: ./packages/design-system
run: bun run build
24 changes: 0 additions & 24 deletions .github/workflows/update-leaderboard.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/updateLeaderboard.js

This file was deleted.

5 changes: 4 additions & 1 deletion .hintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"extends": [
"development"
]
],
"hints": {
"typescript-config/consistent-casing": "off"
}
Comment on lines +5 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Re-enable typescript-config/consistent-casing with proper configuration

The codebase follows standard React/TypeScript naming conventions (PascalCase for components, camelCase for hooks/utilities). Instead of disabling the rule entirely, consider configuring it to allow these conventional patterns:

{
  "hints": {
    "typescript-config/consistent-casing": ["error", {
      "allowedCasing": ["camelCase", "PascalCase"]
    }]
  }
}
🔗 Analysis chain

Consider the implications of disabling typescript-config/consistent-casing.

Disabling the consistent-casing rule might lead to inconsistent naming conventions across your TypeScript files. Instead of completely disabling it, consider:

  1. Documenting why this rule needs to be disabled
  2. Using a more specific configuration to target only necessary cases

Let's verify the impact and current state of casing inconsistencies in the codebase:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for potential casing inconsistencies in TypeScript files
# that might have led to disabling this rule

# Look for files with mixed casing patterns
echo "Files with potential mixed casing patterns:"
rg -l '[A-Z][a-z]+[A-Z]' --type ts

# Look for similar filenames with different casing
echo -e "\nPotentially conflicting filenames:"
find . -name "*.ts" -o -name "*.tsx" | sort -f | uniq -Di

Length of output: 12640

Comment on lines 1 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Remove orphaned .hintrc configuration file

This .hintrc file appears to be an orphaned configuration as the project:

  • Has no hint-related dependencies installed
  • Uses ESLint for code quality checks instead
🔗 Analysis chain

Verify hint configuration compatibility.

The configuration appears structurally valid, but let's ensure it's compatible with your development setup.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the hint configuration and its dependencies

# Check if hint is installed and get its version
echo "Checking hint installation:"
npm list hint

# Verify if the 'development' configuration exists in dependencies
echo -e "\nChecking for 'development' configuration:"
npm list @hint/configuration-development

# Look for any hint-related errors in package-lock.json
echo -e "\nChecking for hint-related dependency issues:"
jq '.packages | with_entries(select(.key | contains("hint")))' package-lock.json

Length of output: 548


Script:

#!/bin/bash
# Check for hint-related configuration and dependencies

echo "Checking package.json for hint dependencies:"
if [ -f "package.json" ]; then
    jq '.dependencies, .devDependencies' package.json
else
    echo "package.json not found"
fi

echo -e "\nSearching for hint configuration files:"
fd -e hintrc -e .hintrc

echo -e "\nSearching for TypeScript configuration:"
fd tsconfig.json

Length of output: 692

}
2 changes: 1 addition & 1 deletion apps/core/app/auth/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "@repo/ui/globals.css";
import "@repo/ui/globals.scss";
import type { Metadata } from "next";

export const metadata: Metadata = {
Expand Down
2 changes: 1 addition & 1 deletion apps/core/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "@repo/ui/globals.css";
import "@repo/ui/globals.scss";
import { cn } from "@repo/ui/lib/utils";
import type { Metadata } from "next";
import { ThemeProvider } from "next-themes";
Expand Down
Binary file modified bun.lockb
Binary file not shown.
15 changes: 15 additions & 0 deletions packages/design-system/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "@repo/design-system",
"version": "1.0.0",
"scripts": {
"build": "bun run src/scripts/build.ts"
},
"exports": {
"./styles": "./src/styles/main.scss",
"./tailwind": "./src/tailwind/config.ts"
},
"devDependencies": {
"@repo/typescript-config": "*",
"style-dictionary": "^4.3.2"
}
}
79 changes: 79 additions & 0 deletions packages/design-system/src/scripts/build-colors-style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import * as fs from "fs";
import * as path from "path";

// Paths for token files
const tokensDir = path.join(__dirname, "../tokens");
const stylesDir = path.join(__dirname, "../styles/base");
const resolveTokenReference = (value: string): string => {
return value.replace(/{(.+?)}/g, (_, match) => `var(--${match.replace(".", "-")})`);
};

// Generate SCSS content for a given theme
const generateScssContent = (
theme: "dark" | "light",
tokens: Record<string, any>,
): string => {
const lines: string[] = [];

const selector = theme === "dark" ? ":root" : ".light";

// Add the @use directive
lines.push(`@use "_palette.scss" as *;\n`);

// Start the layer and class
lines.push(`@layer base {`);
lines.push(` ${selector} {`);

// Process each token in the "color" group
const colorTokens = tokens.color;
for (const key in colorTokens) {
const value = colorTokens[key].$value;

// Convert token reference (e.g., {zinc.200}) to CSS variable (e.g., var(--zinc.200))
const resolvedValue = resolveTokenReference(value);
lines.push(` --${key}: ${resolvedValue};`);
}

// Close the class and layer
lines.push(` }`);
lines.push(`}`);

return lines.join("\n");
};

// Function to build and write SCSS for a given theme
export const buildColorsScss = (theme: "dark" | "light"): void => {
// Define the input and output file paths
const partFileName = theme === "dark" ? "Default" : "Light";
const inputFilePath = path.join(
tokensDir,
`token_Color_${partFileName}.json`,
);
const outputFilePath = path.join(stylesDir, `_colors-${theme}.scss`);

// Ensure the input file exists
if (!fs.existsSync(inputFilePath)) {
console.error(`Token file not found: ${inputFilePath}`);
return;
}

// Read and parse the JSON file
const rawData = fs.readFileSync(inputFilePath, "utf-8");
const tokens = JSON.parse(rawData);

// Generate SCSS content
const scssContent = generateScssContent(theme, tokens);

// Ensure the output directory exists
if (!fs.existsSync(stylesDir)) {
fs.mkdirSync(stylesDir, { recursive: true });
}

// Write the SCSS content to the file
fs.writeFileSync(outputFilePath, scssContent, "utf-8");
console.log(`SCSS file created for ${theme} theme at: ${outputFilePath}`);
};

// Reusable calls for light and dark themes
buildColorsScss("light");
buildColorsScss("dark");
61 changes: 61 additions & 0 deletions packages/design-system/src/scripts/build-colors-tailwind.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import * as fs from "fs";
import * as path from "path";

// Paths for token files
const tokensDir = path.join(__dirname, "../tokens");
const outputDir = path.join(__dirname, "../tailwind");

// Utility to resolve token references to match the key directly
const resolveTokenReference = (key: string): string => {
return `hsl(var(--${key}))`;
};

// Generate TypeScript content for colors
const generateColorsTsContent = (tokens: Record<string, any>): string => {
const colorTokens = tokens.color;
const lines: string[] = [];

// Add the TypeScript export header
lines.push(`export const colors = {`);

// Process each token and use the key for the variable name
for (const key in colorTokens) {
lines.push(` "${key}": "${resolveTokenReference(key)}",`);
}

// Close the object
lines.push(`};`);

return lines.join("\n");
};

// Function to build and write colors.ts
export const buildColorsTailwind = (): void => {
const inputFilePath = path.join(tokensDir, `token_Color_Light.json`);
const outputFilePath = path.join(outputDir, `colors.ts`);

// Ensure the input file exists
if (!fs.existsSync(inputFilePath)) {
console.error(`Token file not found: ${inputFilePath}`);
return;
}

// Read and parse the JSON file
const rawData = fs.readFileSync(inputFilePath, "utf-8");
const tokens = JSON.parse(rawData);

// Generate TypeScript content
const tsContent = generateColorsTsContent(tokens);

// Ensure the output directory exists
if (!fs.existsSync(outputDir)) {
fs.mkdirSync(outputDir, { recursive: true });
}

// Write the TypeScript content to the file
fs.writeFileSync(outputFilePath, tsContent, "utf-8");
console.log(`colors.ts file created at: ${outputFilePath}`);
};

// Build colors.ts
buildColorsTailwind();
40 changes: 40 additions & 0 deletions packages/design-system/src/scripts/build-config-tailwind.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import * as fs from "fs";
import * as path from "path";

// Paths for the output file
const outputDir = path.join(__dirname, "../tailwind");
const outputFilePath = path.join(outputDir, "config.ts");

// Content for the tailwindConfig.ts file
const generateTailwindConfigContent = (): string => {
return `
import { colors } from "./colors";
import { palette } from "./palette";

export const tailwindConfig = {
theme: {
extend: {
colors: { ...colors, ...palette },
},
},
};
`.trim();
};

// Function to create the tailwindConfig.ts file
export const buildTailwindConfig = (): void => {
// Generate the content
const configContent = generateTailwindConfigContent();

// Ensure the output directory exists
if (!fs.existsSync(outputDir)) {
fs.mkdirSync(outputDir, { recursive: true });
}

// Write the content to the file
fs.writeFileSync(outputFilePath, configContent, "utf-8");
console.log(`tailwindConfig.ts file created at: ${outputFilePath}`);
};

// Run the script
buildTailwindConfig();
32 changes: 32 additions & 0 deletions packages/design-system/src/scripts/build-main-style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import * as fs from "fs";
import * as path from "path";

// Paths for the output file
const outputDir = path.join(__dirname, "../styles");
const outputFilePath = path.join(outputDir, "main.scss");

// Content for the main.scss file
const generateMainScssContent = (): string => {
return `
@use "./base/_colors-dark.scss" as *;
@use "./base/_colors-light.scss" as *;
`.trim();
};

// Function to create the main.scss file
export const buildMainScss = (): void => {
// Generate the content
const scssContent = generateMainScssContent();

// Ensure the output directory exists
if (!fs.existsSync(outputDir)) {
fs.mkdirSync(outputDir, { recursive: true });
}

// Write the content to the file
fs.writeFileSync(outputFilePath, scssContent, "utf-8");
console.log(`main.scss file created at: ${outputFilePath}`);
Comment on lines +27 to +28
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add error handling for file operations.

File operations should include proper error handling to provide meaningful error messages.

-  fs.writeFileSync(outputFilePath, scssContent, "utf-8");
-  console.log(`main.scss file created at: ${outputFilePath}`);
+  try {
+    fs.writeFileSync(outputFilePath, scssContent, "utf-8");
+    console.log(`✅ main.scss file created at: ${outputFilePath}`);
+  } catch (error) {
+    console.error(`❌ Failed to write main.scss file: ${error.message}`);
+    throw error;
+  }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
fs.writeFileSync(outputFilePath, scssContent, "utf-8");
console.log(`main.scss file created at: ${outputFilePath}`);
try {
fs.writeFileSync(outputFilePath, scssContent, "utf-8");
console.log(`✅ main.scss file created at: ${outputFilePath}`);
} catch (error) {
console.error(`❌ Failed to write main.scss file: ${error.message}`);
throw error;
}

};

// Run the script
buildMainScss();
54 changes: 54 additions & 0 deletions packages/design-system/src/scripts/build-palette-style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import * as fs from 'fs';
import * as path from 'path';
import { hexToHsl } from './utills.js';

// Paths for input and output files
const inputFilePath = path.join(__dirname, '../tokens/token_Palette_Primitive.json');
const outputFilePath = path.join(__dirname, '../styles/base/_palette.scss');

// Generate SCSS content with groups separated by an empty line
const generateScssContent = (tokens: Record<string, any>): string => {
const lines: string[] = [];

for (const group in tokens) {
const groupTokens = tokens[group];
for (const key in groupTokens) {
const value = groupTokens[key];
if (value.$type === 'color') {
lines.push(` --${group}-${key}: ${hexToHsl(value.$value)};`);
}
}
lines.push(''); // Add an empty line after each group
}

return `
@layer base {
:root {
${lines.join('\n')}
}
}
`.trim();
};
Comment on lines +10 to +31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add type safety and improve error handling.

The token structure needs proper type definitions, and the function should handle potential type mismatches.

+interface ColorToken {
+    $type: 'color';
+    $value: string;
+}
+
+interface TokenGroup {
+    [key: string]: ColorToken;
+}
+
+interface TokenPalette {
+    [group: string]: TokenGroup;
+}
+
-const generateScssContent = (tokens: Record<string, any>): string => {
+const generateScssContent = (tokens: TokenPalette): string => {
   const lines: string[] = [];

   for (const group in tokens) {
     const groupTokens = tokens[group];
     for (const key in groupTokens) {
       const value = groupTokens[key];
-      if (value.$type === 'color') {
+      if (value.$type === 'color' && typeof value.$value === 'string') {
         lines.push(`  --${group}-${key}: ${hexToHsl(value.$value)};`);
+      } else {
+        console.warn(`Skipping invalid token: ${group}-${key}`);
       }
     }
     lines.push(''); // Add an empty line after each group
   }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const generateScssContent = (tokens: Record<string, any>): string => {
const lines: string[] = [];
for (const group in tokens) {
const groupTokens = tokens[group];
for (const key in groupTokens) {
const value = groupTokens[key];
if (value.$type === 'color') {
lines.push(` --${group}-${key}: ${hexToHsl(value.$value)};`);
}
}
lines.push(''); // Add an empty line after each group
}
return `
@layer base {
:root {
${lines.join('\n')}
}
}
`.trim();
};
interface ColorToken {
$type: 'color';
$value: string;
}
interface TokenGroup {
[key: string]: ColorToken;
}
interface TokenPalette {
[group: string]: TokenGroup;
}
const generateScssContent = (tokens: TokenPalette): string => {
const lines: string[] = [];
for (const group in tokens) {
const groupTokens = tokens[group];
for (const key in groupTokens) {
const value = groupTokens[key];
if (value.$type === 'color' && typeof value.$value === 'string') {
lines.push(` --${group}-${key}: ${hexToHsl(value.$value)};`);
} else {
console.warn(`Skipping invalid token: ${group}-${key}`);
}
}
lines.push(''); // Add an empty line after each group
}
return `
@layer base {
:root {
${lines.join('\n')}
}
}
`.trim();
};


// Function to build and write SCSS content
export const buildPaletteScss = (): void => {
// Read and parse the JSON file
const rawData = fs.readFileSync(inputFilePath, 'utf-8');
const tokens = JSON.parse(rawData);

// Generate SCSS content
const scssContent = generateScssContent(tokens);

// Ensure the output directory exists
const outputDir = path.dirname(outputFilePath);
if (!fs.existsSync(outputDir)) {
fs.mkdirSync(outputDir, { recursive: true });
}

// Write the SCSS content to the file
fs.writeFileSync(outputFilePath, scssContent, 'utf-8');
console.log(`SCSS file created at: ${outputFilePath}`);
};
Comment on lines +34 to +51
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add comprehensive error handling.

File operations and JSON parsing need proper error handling to provide meaningful error messages.

 export const buildPaletteScss = (): void => {
-  // Read and parse the JSON file
-  const rawData = fs.readFileSync(inputFilePath, 'utf-8');
-  const tokens = JSON.parse(rawData);
+  try {
+    // Read and parse the JSON file
+    if (!fs.existsSync(inputFilePath)) {
+      throw new Error(`Input file not found: ${inputFilePath}`);
+    }
+
+    const rawData = fs.readFileSync(inputFilePath, 'utf-8');
+    let tokens: TokenPalette;
+    
+    try {
+      tokens = JSON.parse(rawData);
+    } catch (e) {
+      throw new Error(`Invalid JSON in input file: ${e.message}`);
+    }

-  // Generate SCSS content
-  const scssContent = generateScssContent(tokens);
+    // Generate SCSS content
+    const scssContent = generateScssContent(tokens);

-  // Ensure the output directory exists
-  const outputDir = path.dirname(outputFilePath);
-  if (!fs.existsSync(outputDir)) {
-    fs.mkdirSync(outputDir, { recursive: true });
-  }
+    // Ensure the output directory exists
+    const outputDir = path.dirname(outputFilePath);
+    if (!fs.existsSync(outputDir)) {
+      fs.mkdirSync(outputDir, { recursive: true });
+    }

-  // Write the SCSS content to the file
-  fs.writeFileSync(outputFilePath, scssContent, 'utf-8');
-  console.log(`SCSS file created at: ${outputFilePath}`);
+    // Write the SCSS content to the file
+    fs.writeFileSync(outputFilePath, scssContent, 'utf-8');
+    console.log(`SCSS file created at: ${outputFilePath}`);
+  } catch (error) {
+    console.error('Failed to build palette SCSS:', error.message);
+    process.exit(1);
+  }
 };
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
export const buildPaletteScss = (): void => {
// Read and parse the JSON file
const rawData = fs.readFileSync(inputFilePath, 'utf-8');
const tokens = JSON.parse(rawData);
// Generate SCSS content
const scssContent = generateScssContent(tokens);
// Ensure the output directory exists
const outputDir = path.dirname(outputFilePath);
if (!fs.existsSync(outputDir)) {
fs.mkdirSync(outputDir, { recursive: true });
}
// Write the SCSS content to the file
fs.writeFileSync(outputFilePath, scssContent, 'utf-8');
console.log(`SCSS file created at: ${outputFilePath}`);
};
export const buildPaletteScss = (): void => {
try {
// Read and parse the JSON file
if (!fs.existsSync(inputFilePath)) {
throw new Error(`Input file not found: ${inputFilePath}`);
}
const rawData = fs.readFileSync(inputFilePath, 'utf-8');
let tokens: TokenPalette;
try {
tokens = JSON.parse(rawData);
} catch (e) {
throw new Error(`Invalid JSON in input file: ${e.message}`);
}
// Generate SCSS content
const scssContent = generateScssContent(tokens);
// Ensure the output directory exists
const outputDir = path.dirname(outputFilePath);
if (!fs.existsSync(outputDir)) {
fs.mkdirSync(outputDir, { recursive: true });
}
// Write the SCSS content to the file
fs.writeFileSync(outputFilePath, scssContent, 'utf-8');
console.log(`SCSS file created at: ${outputFilePath}`);
} catch (error) {
console.error('Failed to build palette SCSS:', error.message);
process.exit(1);
}
};


// Run the script
buildPaletteScss();
Loading
Loading