Skip to content

Tailwind v4 #842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
georgewrmarshall wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Tailwind v4 #842

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe30ff2
chore: initial commit
georgewrmarshall Oct 16, 2025
2e42f52
chore: update
georgewrmarshall Oct 16, 2025
9ad47e6
chore: update
georgewrmarshall Oct 17, 2025
29435e3
chore: updates to tests
georgewrmarshall Oct 17, 2025
698afa6
chore: update
georgewrmarshall Oct 20, 2025
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
Next Next commit
chore: initial commit
  • Loading branch information
@georgewrmarshall
georgewrmarshall committed Oct 16, 2025
commit fe30ff216f9e83c0f24c4b6c6b4ac7771dd816a5
3 changes: 1 addition & 2 deletions apps/storybook-react/.storybook/preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import '../../../packages/design-tokens/dist/styles.css';
import '../tailwind.css';

import { Preview } from '@storybook/react';
Expand Down Expand Up @@ -38,7 +37,7 @@ function withColorScheme(Story: StoryFn, context: StoryContext) {
{...props}
style={{
padding: '1rem',
backgroundColor: 'var(--color-background-default)',
backgroundColor: 'var(--mm-color-background-default)',
}}
>
{children}
Expand Down
4 changes: 2 additions & 2 deletions apps/storybook-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,13 @@
"@types/react-dom": "^18.2.0",
"@vitejs/plugin-react": "^4.5.0",
"@vitest/coverage-v8": "^3.2.4",
"autoprefixer": "^10.0.0",
"axe-playwright": "^2.1.0",
"playwright": "^1.52.0",
"postcss": "^8.4.47",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"storybook": "^9.0.17",
"tailwindcss": "^3.0.0",
"typescript": "~5.2.2",
"vite": "^6.3.6",
"vitest": "^3.2.0"
Expand All @@ -51,6 +49,8 @@
}
},
"dependencies": {
"@tailwindcss/postcss": "^4.0.0",
"@tailwindcss/vite": "^4.0.0",
"@vitest/browser": "^3.2.0"
}
}
3 changes: 1 addition & 2 deletions apps/storybook-react/postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
'@tailwindcss/postcss': {},
},
};
28 changes: 0 additions & 28 deletions apps/storybook-react/tailwind.config.js
View file
Open in desktop

This file was deleted.

18 changes: 15 additions & 3 deletions apps/storybook-react/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import 'tailwindcss';
@import '../../packages/design-tokens/src/css/index.css';
@import '../../packages/design-system-tailwind-preset/src/theme.css';

/* Scan the design system component library for utility classes */
@source "../../packages/design-system-react";

@theme {
--color-*: initial;
--color-inherit: inherit;
--color-current: currentColor;
--color-transparent: transparent;
--color-black: #000000;
--color-white: #ffffff;
}

/* Geist */
@font-face {
Expand Down
6 changes: 5 additions & 1 deletion apps/storybook-react/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import react from '@vitejs/plugin-react';
import { defineConfig } from 'vite';
import tailwindcss from '@tailwindcss/vite';
import path from 'path';

export default defineConfig({
plugins: [react()],
plugins: [
react(),
tailwindcss()
],
resolve: {
alias: {
'@metamask/design-tokens': path.resolve(
Expand Down
6 changes: 4 additions & 2 deletions packages/design-system-tailwind-preset/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
"default": "./dist/index.cjs"
}
},
"./theme.css": "./theme.css",
"./package.json": "./package.json"
},
"main": "./dist/index.cjs",
"types": "./dist/index.d.cts",
"files": [
"dist/"
"dist/",
"theme.css"
],
"scripts": {
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
Expand All @@ -58,7 +60,7 @@
},
"peerDependencies": {
"@metamask/design-tokens": "^8.0.0",
"tailwindcss": "^3.0.0"
"tailwindcss": "^4.0.0"
},
"engines": {
"node": "^18.18 || >=20"
Expand Down
144 changes: 72 additions & 72 deletions packages/design-system-tailwind-preset/src/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,102 +1,102 @@
export const colors = {
background: {
default: 'var(--color-background-default)',
'default-hover': 'var(--color-background-default-hover)',
'default-pressed': 'var(--color-background-default-pressed)',
alternative: 'var(--color-background-alternative)',
'alternative-hover': 'var(--color-background-alternative-hover)',
'alternative-pressed': 'var(--color-background-alternative-pressed)',
section: 'var(--color-background-section)',
subsection: 'var(--color-background-subsection)',
muted: 'var(--color-background-muted)',
'muted-hover': 'var(--color-background-muted-hover)',
'muted-pressed': 'var(--color-background-muted-pressed)',
hover: 'var(--color-background-hover)',
pressed: 'var(--color-background-pressed)',
default: 'var(--mm-color-background-default)',
'default-hover': 'var(--mm-color-background-default-hover)',
'default-pressed': 'var(--mm-color-background-default-pressed)',
alternative: 'var(--mm-color-background-alternative)',
'alternative-hover': 'var(--mm-color-background-alternative-hover)',
'alternative-pressed': 'var(--mm-color-background-alternative-pressed)',
section: 'var(--mm-color-background-section)',
subsection: 'var(--mm-color-background-subsection)',
muted: 'var(--mm-color-background-muted)',
'muted-hover': 'var(--mm-color-background-muted-hover)',
'muted-pressed': 'var(--mm-color-background-muted-pressed)',
hover: 'var(--mm-color-background-hover)',
pressed: 'var(--mm-color-background-pressed)',
},
text: {
default: 'var(--color-text-default)',
alternative: 'var(--color-text-alternative)',
muted: 'var(--color-text-muted)',
default: 'var(--mm-color-text-default)',
alternative: 'var(--mm-color-text-alternative)',
muted: 'var(--mm-color-text-muted)',
},
border: {
default: 'var(--color-border-default)',
muted: 'var(--color-border-muted)',
default: 'var(--mm-color-border-default)',
muted: 'var(--mm-color-border-muted)',
},
icon: {
default: 'var(--color-icon-default)',
'default-hover': 'var(--color-icon-default-hover)',
'default-pressed': 'var(--color-icon-default-pressed)',
alternative: 'var(--color-icon-alternative)',
muted: 'var(--color-icon-muted)',
inverse: 'var(--color-icon-inverse)',
default: 'var(--mm-color-icon-default)',
'default-hover': 'var(--mm-color-icon-default-hover)',
'default-pressed': 'var(--mm-color-icon-default-pressed)',
alternative: 'var(--mm-color-icon-alternative)',
muted: 'var(--mm-color-icon-muted)',
inverse: 'var(--mm-color-icon-inverse)',
},
overlay: {
default: 'var(--color-overlay-default)',
alternative: 'var(--color-overlay-alternative)',
inverse: 'var(--color-overlay-inverse)',
default: 'var(--mm-color-overlay-default)',
alternative: 'var(--mm-color-overlay-alternative)',
inverse: 'var(--mm-color-overlay-inverse)',
},
primary: {
default: 'var(--color-primary-default)',
'default-hover': 'var(--color-primary-default-hover)',
'default-pressed': 'var(--color-primary-default-pressed)',
alternative: 'var(--color-primary-alternative)',
muted: 'var(--color-primary-muted)',
inverse: 'var(--color-primary-inverse)',
'muted-hover': 'var(--color-primary-muted-hover)',
'muted-pressed': 'var(--color-primary-muted-pressed)',
default: 'var(--mm-color-primary-default)',
'default-hover': 'var(--mm-color-primary-default-hover)',
'default-pressed': 'var(--mm-color-primary-default-pressed)',
alternative: 'var(--mm-color-primary-alternative)',
muted: 'var(--mm-color-primary-muted)',
inverse: 'var(--mm-color-primary-inverse)',
'muted-hover': 'var(--mm-color-primary-muted-hover)',
'muted-pressed': 'var(--mm-color-primary-muted-pressed)',
},
error: {
default: 'var(--color-error-default)',
'default-hover': 'var(--color-error-default-hover)',
'default-pressed': 'var(--color-error-default-pressed)',
alternative: 'var(--color-error-alternative)',
muted: 'var(--color-error-muted)',
inverse: 'var(--color-error-inverse)',
'muted-hover': 'var(--color-error-muted-hover)',
'muted-pressed': 'var(--color-error-muted-pressed)',
default: 'var(--mm-color-error-default)',
'default-hover': 'var(--mm-color-error-default-hover)',
'default-pressed': 'var(--mm-color-error-default-pressed)',
alternative: 'var(--mm-color-error-alternative)',
muted: 'var(--mm-color-error-muted)',
inverse: 'var(--mm-color-error-inverse)',
'muted-hover': 'var(--mm-color-error-muted-hover)',
'muted-pressed': 'var(--mm-color-error-muted-pressed)',
},
warning: {
default: 'var(--color-warning-default)',
'default-hover': 'var(--color-warning-default-hover)',
'default-pressed': 'var(--color-warning-default-pressed)',
muted: 'var(--color-warning-muted)',
inverse: 'var(--color-warning-inverse)',
'muted-hover': 'var(--color-warning-muted-hover)',
'muted-pressed': 'var(--color-warning-muted-pressed)',
default: 'var(--mm-color-warning-default)',
'default-hover': 'var(--mm-color-warning-default-hover)',
'default-pressed': 'var(--mm-color-warning-default-pressed)',
muted: 'var(--mm-color-warning-muted)',
inverse: 'var(--mm-color-warning-inverse)',
'muted-hover': 'var(--mm-color-warning-muted-hover)',
'muted-pressed': 'var(--mm-color-warning-muted-pressed)',
},
success: {
default: 'var(--color-success-default)',
'default-hover': 'var(--color-success-default-hover)',
'default-pressed': 'var(--color-success-default-pressed)',
muted: 'var(--color-success-muted)',
inverse: 'var(--color-success-inverse)',
'muted-hover': 'var(--color-success-muted-hover)',
'muted-pressed': 'var(--color-success-muted-pressed)',
default: 'var(--mm-color-success-default)',
'default-hover': 'var(--mm-color-success-default-hover)',
'default-pressed': 'var(--mm-color-success-default-pressed)',
muted: 'var(--mm-color-success-muted)',
inverse: 'var(--mm-color-success-inverse)',
'muted-hover': 'var(--mm-color-success-muted-hover)',
'muted-pressed': 'var(--mm-color-success-muted-pressed)',
},
info: {
default: 'var(--color-info-default)',
muted: 'var(--color-info-muted)',
inverse: 'var(--color-info-inverse)',
default: 'var(--mm-color-info-default)',
muted: 'var(--mm-color-info-muted)',
inverse: 'var(--mm-color-info-inverse)',
},
accent01: {
light: 'var(--color-accent01-light)',
normal: 'var(--color-accent01-normal)',
dark: 'var(--color-accent01-dark)',
light: 'var(--mm-color-accent01-light)',
normal: 'var(--mm-color-accent01-normal)',
dark: 'var(--mm-color-accent01-dark)',
},
accent02: {
light: 'var(--color-accent02-light)',
normal: 'var(--color-accent02-normal)',
dark: 'var(--color-accent02-dark)',
light: 'var(--mm-color-accent02-light)',
normal: 'var(--mm-color-accent02-normal)',
dark: 'var(--mm-color-accent02-dark)',
},
accent03: {
light: 'var(--color-accent03-light)',
normal: 'var(--color-accent03-normal)',
dark: 'var(--color-accent03-dark)',
light: 'var(--mm-color-accent03-light)',
normal: 'var(--mm-color-accent03-normal)',
dark: 'var(--mm-color-accent03-dark)',
},
accent04: {
light: 'var(--color-accent04-light)',
normal: 'var(--color-accent04-normal)',
dark: 'var(--color-accent04-dark)',
light: 'var(--mm-color-accent04-light)',
normal: 'var(--mm-color-accent04-normal)',
dark: 'var(--mm-color-accent04-dark)',
},
};
18 changes: 10 additions & 8 deletions packages/design-system-tailwind-preset/src/shadows.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import plugin from 'tailwindcss/plugin';
// Note: Using require for compatibility with current build system
// eslint-disable-next-line @typescript-eslint/no-require-imports
const plugin = require('tailwindcss/plugin');

/**
* We want to allow for the combination of shadow size and color utilities.
Expand All @@ -12,16 +14,16 @@ import plugin from 'tailwindcss/plugin';
*/

export const shadows = {
xs: 'var(--shadow-size-xs) var(--shadow-color, var(--color-shadow-default))',
sm: 'var(--shadow-size-sm) var(--shadow-color, var(--color-shadow-default))',
md: 'var(--shadow-size-md) var(--shadow-color, var(--color-shadow-default))',
lg: 'var(--shadow-size-lg) var(--shadow-color, var(--color-shadow-default))',
xs: 'var(--shadow-size-xs) var(--shadow-color, var(--mm-color-shadow-default))',
sm: 'var(--shadow-size-sm) var(--shadow-color, var(--mm-color-shadow-default))',
md: 'var(--shadow-size-md) var(--shadow-color, var(--mm-color-shadow-default))',
lg: 'var(--shadow-size-lg) var(--shadow-color, var(--mm-color-shadow-default))',
};

export const shadowColors = {
default: 'var(--color-shadow-default)',
primary: 'var(--color-shadow-primary)',
error: 'var(--color-shadow-error)',
default: 'var(--mm-color-shadow-default)',
primary: 'var(--mm-color-shadow-primary)',
error: 'var(--mm-color-shadow-error)',
};

/**
Expand Down
Loading